From 8e2c6977461bff9cf691c9dc2e782ccd5a4a7f25 Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Fri, 10 May 2024 15:06:39 -0400 Subject: [PATCH] fix: args shenanagins --- playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 748f5a17318..a105d03dae1 100644 --- a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 +++ b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 @@ -19,7 +19,7 @@ fi {% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %} {% set executable = edxapp_venv_bin + '/ddtrace-run ' + executable %} -export DD_TAGS=$(dd_tags) +export DD_TAGS="$1" export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true # Copied from edx_django_service playbook for consistency; Datadog # trace debug logging issue doesn't actually affect edxapp for some @@ -27,6 +27,7 @@ export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true export DD_TRACE_LOG_STREAM_HANDLER=false # Datadog's instrumentation breaks pymongo: https://github.com/edx/edx-arch-experiments/issues/580 export DD_TRACE_PYMONGO_ENABLED=false +shift {% endif -%} # We exec so that celery is the child of supervisor and can be managed properly