Skip to content

Commit 531211d

Browse files
committed
temp: Enable Celery distributed tracing in stage edxapp
Datadog Support suggested that we try enabling this to see if it changes anything about the orphaned spans on the edxapp workers (unexpected top-level spans that are not `operation_name:celery.run`, but instead are other spans that have lost their parent association). Just going to enable this on stage so we don't mess with traces in prod, for now. See edx/edx-arch-experiments#822
1 parent ad70187 commit 531211d

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
2121
# Suppress middleware spans because there are about 100 for each request.
2222
# Remove (or set to true) for debugging.
2323
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
24+
25+
{% if COMMON_ENVIRONMENT == "stage" %}
26+
# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
27+
# has an effect on the remaining orphaned spans.
28+
# https://github.com/edx/edx-arch-experiments/issues/822
29+
export DD_CELERY_DISTRIBUTED_TRACING=true
30+
{% endif %}
31+
2432
{% endif -%}
2533

2634
# We want to be able to toggle this on separately from DD in general.
@@ -54,4 +62,4 @@ source {{ edxapp_app_dir }}/edxapp_env
5462
exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi --log-file {{ edxapp_gunicorn_log_dir[1] }}/edx.log
5563
{% else %}
5664
exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
57-
{% endif %}
65+
{% endif %}

playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
2222
# Remove (or set to true) for debugging.
2323
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
2424

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

2734
# We want to be able to toggle this on separately from DD in general.

playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
2121
# Suppress middleware spans because there are about 100 for each request.
2222
# Remove (or set to true) for debugging.
2323
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
24+
25+
{% if COMMON_ENVIRONMENT == "stage" %}
26+
# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
27+
# has an effect on the remaining orphaned spans.
28+
# https://github.com/edx/edx-arch-experiments/issues/822
29+
export DD_CELERY_DISTRIBUTED_TRACING=true
30+
{% endif %}
31+
2432
{% endif -%}
2533

2634
# We want to be able to toggle this on separately from DD in general.

0 commit comments

Comments
 (0)