diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 index 4c6d9822e5b..783f13ea8d5 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 @@ -29,11 +29,6 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true # reason. export DD_TRACE_LOG_STREAM_HANDLER=false -# Temporary: Include span tags representing a variety of tracing HTTP headers. -# This might help us (or DD support) identify an interaction with incoming trace -# headers that causes trace concatenation in edxapp. -# See https://github.com/edx/edx-arch-experiments/issues/692 -export DD_TRACE_HEADER_TAGS=traceparent:traceparent_header,tracestate:tracestate_header,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id # Temporary: We currently have a span (or several) for each Django middleware, # and Datadog Support has implied that it will be easier to debug our tracing # issues if we don't record those middleware. (They make up the bulk of traces, diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 index 053bf22923c..1f3e16245cf 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 @@ -30,11 +30,6 @@ export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true # reason. export DD_TRACE_LOG_STREAM_HANDLER=false -# Temporary: Include span tags representing a variety of tracing HTTP headers. -# This might help us (or DD support) identify an interaction with incoming trace -# headers that causes trace concatenation in edxapp. -# See https://github.com/edx/edx-arch-experiments/issues/692 -export DD_TRACE_HEADER_TAGS=traceparent:traceparent_header,tracestate:tracestate_header,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id # Temporary: We currently have a span (or several) for each Django middleware, # and Datadog Support has implied that it will be easier to debug our tracing # issues if we don't record those middleware. (They make up the bulk of traces, @@ -42,13 +37,6 @@ export DD_TRACE_HEADER_TAGS=traceparent:traceparent_header,tracestate:tracestate # See https://github.com/edx/edx-arch-experiments/issues/692 export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false -{% if COMMON_ENVIRONMENT == "stage" or COMMON_DEPLOYMENT == "edge" %} -# Temporary 2024-07-02: See if trace concatenation persists in Datadog -# when it doesn't attempt to extract any headers. -# See https://github.com/edx/edx-arch-experiments/issues/692 -export DD_TRACE_PROPAGATION_STYLE_EXTRACT=none -{% endif %} - {% endif -%} export PORT="{{ edxapp_lms_gunicorn_port }}" diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 index ab2d85c9115..5f0afdf626c 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 @@ -25,11 +25,6 @@ export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true # reason. export DD_TRACE_LOG_STREAM_HANDLER=false -# Temporary: Include span tags representing a variety of tracing HTTP headers. -# This might help us (or DD support) identify an interaction with incoming trace -# headers that causes trace concatenation in edxapp. -# See https://github.com/edx/edx-arch-experiments/issues/692 -export DD_TRACE_HEADER_TAGS=traceparent:traceparent_header,tracestate:tracestate_header,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id # Temporary: We currently have a span (or several) for each Django middleware, # and Datadog Support has implied that it will be easier to debug our tracing # issues if we don't record those middleware. (They make up the bulk of traces,