Skip to content

Commit

Permalink
fix: Fix django.cache service tags for Inferred Services config (#131)
Browse files Browse the repository at this point in the history
This is intended as a temporary workaround until Datadog can put in a
proper fix.
  • Loading branch information
timmc-edx authored Dec 12, 2024
1 parent f0a451d commit edf846c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
5 changes: 5 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ 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 }}"
Expand Down
5 changes: 5 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ 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 }}"
Expand Down
5 changes: 5 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ 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
Expand Down

0 comments on commit edf846c

Please sign in to comment.