From 6fd4d9a4337f2302b028066789ac06a5eea314fb Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Tue, 21 Jan 2025 15:57:16 +0000 Subject: [PATCH] feat: Remove workaround for django.cache Datadog service tag in edxapp This should no longer be necessary as of Datadog 2.19.1 (tested in devstack). --- playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 | 5 ----- playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 | 5 ----- playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 | 5 ----- 3 files changed, 15 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 5a1728fc5be..d34bab1cbba 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 @@ -40,11 +40,6 @@ export DD_PROFILING_TIMELINE_ENABLED=true {% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %} export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true -# Temporary: Override django.cache span service tag to match IDA name. -# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED -# but it's not working due to a missing `schematize_service_name` call. -# See https://github.com/edx/edx-arch-experiments/issues/737 -export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-cms {% 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 90ab215988b..424fa82aa0f 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 @@ -40,11 +40,6 @@ export DD_PROFILING_TIMELINE_ENABLED=true {% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %} export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true -# Temporary: Override django.cache span service tag to match IDA name. -# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED -# but it's not working due to a missing `schematize_service_name` call. -# See https://github.com/edx/edx-arch-experiments/issues/737 -export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-lms {% 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 954735a1b8a..818e5278f9b 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 @@ -38,11 +38,6 @@ export DD_PROFILING_ENABLED=true {% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %} export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true -# Temporary: Override django.cache span service tag to match IDA name. -# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED -# but it's not working due to a missing `schematize_service_name` call. -# See https://github.com/edx/edx-arch-experiments/issues/737 -export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-${SERVICE_VARIANT}-workers {% endif -%} # We exec so that celery is the child of supervisor and can be managed properly