Skip to content

Commit 6fd4d9a

Browse files
committed
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).
1 parent 18c8163 commit 6fd4d9a

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ export DD_PROFILING_TIMELINE_ENABLED=true
4040

4141
{% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %}
4242
export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true
43-
# Temporary: Override django.cache span service tag to match IDA name.
44-
# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
45-
# but it's not working due to a missing `schematize_service_name` call.
46-
# See https://github.com/edx/edx-arch-experiments/issues/737
47-
export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-cms
4843
{% endif -%}
4944

5045
export PORT="{{ edxapp_cms_gunicorn_port }}"

playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ export DD_PROFILING_TIMELINE_ENABLED=true
4040

4141
{% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %}
4242
export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true
43-
# Temporary: Override django.cache span service tag to match IDA name.
44-
# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
45-
# but it's not working due to a missing `schematize_service_name` call.
46-
# See https://github.com/edx/edx-arch-experiments/issues/737
47-
export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-lms
4843
{% endif -%}
4944

5045
export PORT="{{ edxapp_lms_gunicorn_port }}"

playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ export DD_PROFILING_ENABLED=true
3838

3939
{% if EDXAPP_DATADOG_INFERRED_SERVICES_ENABLE %}
4040
export DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED=true
41-
# Temporary: Override django.cache span service tag to match IDA name.
42-
# This *should* be done by DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED
43-
# but it's not working due to a missing `schematize_service_name` call.
44-
# See https://github.com/edx/edx-arch-experiments/issues/737
45-
export DD_DJANGO_CACHE_SERVICE_NAME=edx-edxapp-${SERVICE_VARIANT}-workers
4641
{% endif -%}
4742

4843
# We exec so that celery is the child of supervisor and can be managed properly

0 commit comments

Comments
 (0)