revert: temp: Debugging headers for Datadog tracing (#65)

No longer needed for edx/edx-arch-experiments#692
edx · Aug 20, 2024 · 0aeb26b · 0aeb26b
1 parent e47f946
commit 0aeb26b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
@@ -32,11 +32,6 @@ export DD_LOGS_INJECTION=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:/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
@@ -33,25 +33,13 @@ export DD_LOGS_INJECTION=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:/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,
 # at least visually.)
 # See https:/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:/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
@@ -28,11 +28,6 @@ export DD_LOGS_INJECTION=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:/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,