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.

Sign up for GitHub

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

fix: Add missing export for Datadog debug vars #42

Merged
merged 1 commit into from
Jun 18, 2024
+6 −6
Merged

fix: Add missing export for Datadog debug vars #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ export DD_TRACE_PYMONGO_ENABLED=false
# 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
DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id
export DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,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
DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
{% endif -%}

export PORT="{{ edxapp_cms_gunicorn_port }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ export DD_TRACE_PYMONGO_ENABLED=false
# 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
DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id
export DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,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
DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
{% endif -%}

export PORT="{{ edxapp_lms_gunicorn_port }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ export DD_TRACE_PYMONGO_ENABLED=false
# 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
DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,x-datadog-trace-id:x-datadog-trace-id,x-datadog-parent-id:x-datadog-parent-id
export DD_TRACE_HEADER_TAGS=tracecontext:tracecontext,tracestate:tracestate,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
DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
{% endif -%}


Expand Down
Loading