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

revert: temp: Debugging headers for Datadog tracing #65

Merged
merged 1 commit into from
Aug 20, 2024
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
5 changes: 0 additions & 5 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 0 additions & 12 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,13 @@ 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,
# at least visually.)
# 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 }}"
Expand Down
5 changes: 0 additions & 5 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading