From 4ca3dc6823cedcebedbf326eef2baa44f0358f4b Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Tue, 2 Jul 2024 17:58:10 +0000 Subject: [PATCH] feat: Stop accepting trace headers in DD for edge/stage LMS This is another attempt at diagnosis, suggested by DD engineers. --- playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) 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 f1cf7f99320..7c9f400e516 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 @@ -43,6 +43,14 @@ export DD_TRACE_HEADER_TAGS=traceparent:traceparent_header,tracestate:tracestate # 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 }}"