From 5aa037820d75f7eed633df38147e9779f8b0e113 Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Tue, 18 Jun 2024 13:49:12 -0400 Subject: [PATCH] fix: Add missing `export` for Datadog debug vars (#42) Fixes PR https://github.com/edx/configuration/pull/41 See https://github.com/edx/edx-arch-experiments/issues/692 --- playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 | 4 ++-- playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 | 4 ++-- playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 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 index 70db1c8f00c..405146ef6b2 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 @@ -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 }}" 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 ea14090e009..dfa5a2d96ad 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 @@ -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 }}" 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 bbb3db02ad7..03189430fc6 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 @@ -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 -%}