Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix django.cache service tags for Inferred Services config #131

Merged
merged 2 commits into from
Dec 12, 2024
Merged

fix: Fix django.cache service tags for Inferred Services config #131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d51f5c2
fix: Fix django.cache service tags for Inferred Services config
timmc-edx Dec 12, 2024
3341440
fixup! Link to public issue instead
timmc-edx Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
View file
Open in desktop
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://help.datadoghq.com/hc/en-us/requests/1958899
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
View file
Open in desktop
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://help.datadoghq.com/hc/en-us/requests/1958899
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
View file
Open in desktop
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://help.datadoghq.com/hc/en-us/requests/1958899
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
Loading