Skip to content

temp: Enable Celery distributed tracing in stage edxapp #153

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

Merged
merged 1 commit into from
Jan 10, 2025
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
10 changes: 9 additions & 1 deletion playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
# Suppress middleware spans because there are about 100 for each request.
# Remove (or set to true) for debugging.
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false

{% if COMMON_ENVIRONMENT == "stage" %}
# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
# has an effect on the remaining orphaned spans.
# https://github.com/edx/edx-arch-experiments/issues/822
export DD_CELERY_DISTRIBUTED_TRACING=true
{% endif %}

{% endif -%}

# We want to be able to toggle this on separately from DD in general.
Expand Down Expand Up @@ -54,4 +62,4 @@ source {{ edxapp_app_dir }}/edxapp_env
exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi --log-file {{ edxapp_gunicorn_log_dir[1] }}/edx.log
{% else %}
exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
{% endif %}
{% endif %}
7 changes: 7 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 @@ -22,6 +22,13 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
# Remove (or set to true) for debugging.
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false

{% if COMMON_ENVIRONMENT == "stage" %}
# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
# has an effect on the remaining orphaned spans.
# https://github.com/edx/edx-arch-experiments/issues/822
export DD_CELERY_DISTRIBUTED_TRACING=true
{% endif %}

{% endif -%}

# We want to be able to toggle this on separately from DD in general.
Expand Down
8 changes: 8 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 @@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
# Suppress middleware spans because there are about 100 for each request.
# Remove (or set to true) for debugging.
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false

{% if COMMON_ENVIRONMENT == "stage" %}
# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
# has an effect on the remaining orphaned spans.
# https://github.com/edx/edx-arch-experiments/issues/822
export DD_CELERY_DISTRIBUTED_TRACING=true
{% endif %}

{% endif -%}

# We want to be able to toggle this on separately from DD in general.
Expand Down
Loading