From 54fd8e7206ed09ff2cf4e682a0830e92de0e63cc Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Thu, 20 Jun 2024 14:50:08 -0400 Subject: [PATCH] temp: Try removing NR license key for edge LMS to see if DD is affected (#45) temp: Try removing NR license key for stage/edge LMS to see if DD is affected --- .../roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 | 11 +++++++++++ 1 file changed, 11 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 dfa5a2d96ad..9a074ef7540 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 @@ -17,7 +17,18 @@ if command -v ec2metadata >/dev/null 2>&1; then HOSTNAME=$(hostname) export NEW_RELIC_PROCESS_HOST_DISPLAY_NAME="$HOSTNAME-$INSTANCEID" fi + + +{% if COMMON_ENVIRONMENT == "stage" or COMMON_DEPLOYMENT == "edge" %} +# Another attempt at a temporary workaround for trace concatenation in Datadog. +# (Maybe this will keep NR trace instrumentation in place, but not cost us anything, +# because no data will be shipped to NR.) +# See https://github.com/edx/edx-arch-experiments/issues/692 +export NEW_RELIC_LICENSE_KEY="xxx" +{% else %} export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}" +{% endif %} + {% endif -%} {% if EDXAPP_DATADOG_ENABLE %}