Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Enable Data streaming and APM profiling edxapp, forums and django service #27

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
# other trace-related configs that are documented seem to help, but
# from testing DD_TRACE_LOG_STREAM_HANDLER=false seems to help.
export DD_TRACE_LOG_STREAM_HANDLER=false
export DD_PROFILING_ENABLED=true
export DD_DATA_STREAMS_ENABLED=true
{% endif -%}

export EDX_REST_API_CLIENT_NAME="{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ edx_django_service_name }}"
Expand Down
2 changes: 2 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
export DD_TRACE_LOG_STREAM_HANDLER=false
# Datadog's instrumentation breaks pymongo: https://github.com/edx/edx-arch-experiments/issues/580
export DD_TRACE_PYMONGO_ENABLED=false
export DD_PROFILING_ENABLED=true
export DD_DATA_STREAMS_ENABLED=true
{% endif -%}

export PORT="{{ edxapp_cms_gunicorn_port }}"
Expand Down
2 changes: 2 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true
export DD_TRACE_LOG_STREAM_HANDLER=false
# Datadog's instrumentation breaks pymongo: https://github.com/edx/edx-arch-experiments/issues/580
export DD_TRACE_PYMONGO_ENABLED=false
export DD_PROFILING_ENABLED=true
export DD_DATA_STREAMS_ENABLED=true
{% endif -%}

export PORT="{{ edxapp_lms_gunicorn_port }}"
Expand Down
2 changes: 2 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true
export DD_TRACE_LOG_STREAM_HANDLER=false
# Datadog's instrumentation breaks pymongo: https://github.com/edx/edx-arch-experiments/issues/580
export DD_TRACE_PYMONGO_ENABLED=false
export DD_PROFILING_ENABLED=true
export DD_DATA_STREAMS_ENABLED=true
{% endif -%}


Expand Down
2 changes: 2 additions & 0 deletions playbooks/roles/forum/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ forum_base_env: &forum_base_env
DD_TAGS: "{{ FORUM_DD_TAGS }}"
DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT: "true"
DD_TRACE_LOG_STREAM_HANDLER: "false"
DD_PROFILING_ENABLED: "true"
DD_DATA_STREAMS_ENABLED: "true"

forum_env:
<<: *forum_base_env
Expand Down
Loading