From db1382e7a699d73771c71a02ee2da4173b122c31 Mon Sep 17 00:00:00 2001 From: Chris Pappas Date: Wed, 22 May 2024 16:27:25 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20REV-4051=20|=20allow=20edx=5F?= =?UTF-8?q?django=5Fservice=20to=20be=20provided=20with=20specifi=E2=80=A6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ea34ada6bcaf2526b7779f0f5d03b863c8bc29b5. --- playbooks/roles/common_vars/defaults/main.yml | 1 - playbooks/roles/edx_django_service/defaults/main.yml | 1 - playbooks/roles/edx_django_service/tasks/main.yml | 2 +- .../roles/edx_django_service/templates/edx/app/app/app.sh.j2 | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/common_vars/defaults/main.yml b/playbooks/roles/common_vars/defaults/main.yml index 423248a6388..b81f99637ea 100644 --- a/playbooks/roles/common_vars/defaults/main.yml +++ b/playbooks/roles/common_vars/defaults/main.yml @@ -102,7 +102,6 @@ COMMON_MONGO_READ_ONLY_PASS: !!null COMMON_ENABLE_DATADOG: False # Enable APM monitoring with Datadog (metrics, traces, and logs) COMMON_ENABLE_DATADOG_APP: False -COMMON_ENABLE_DATADOG_APP_SERVICES: [] COMMON_ENABLE_NGINXTRA: False COMMON_ENABLE_SPLUNKFORWARDER: False COMMON_ENABLE_NEWRELIC: False diff --git a/playbooks/roles/edx_django_service/defaults/main.yml b/playbooks/roles/edx_django_service/defaults/main.yml index ada2bde200e..e0a1da0f162 100644 --- a/playbooks/roles/edx_django_service/defaults/main.yml +++ b/playbooks/roles/edx_django_service/defaults/main.yml @@ -104,7 +104,6 @@ edx_django_service_basic_auth_exempted_paths: '{{ edx_django_service_basic_auth_ edx_django_service_newrelic_appname: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ edx_django_service_name }}' edx_django_service_enable_newrelic_distributed_tracing: false edx_django_datadog_service: 'edx-{{ edx_django_service_name }}' -edx_django_service_datadog_enable: '{{ COMMON_ENABLE_DATADOG and (COMMON_ENABLE_DATADOG_APP or edx_django_service_name in COMMON_ENABLE_DATADOG_APP_SERVICES }}' edx_django_service_repos: - PROTOCOL: '{{ edx_django_service_git_protocol }}' diff --git a/playbooks/roles/edx_django_service/tasks/main.yml b/playbooks/roles/edx_django_service/tasks/main.yml index 18c3cfd1925..14004b11dcc 100644 --- a/playbooks/roles/edx_django_service/tasks/main.yml +++ b/playbooks/roles/edx_django_service/tasks/main.yml @@ -213,7 +213,7 @@ - install:app-requirements - name: "Install Datadog APM requirements" - when: edx_django_service_datadog_enable + when: COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP pip: name: - ddtrace diff --git a/playbooks/roles/edx_django_service/templates/edx/app/app/app.sh.j2 b/playbooks/roles/edx_django_service/templates/edx/app/app/app.sh.j2 index 96a36b6ab6a..de341a63c0d 100644 --- a/playbooks/roles/edx_django_service/templates/edx/app/app/app.sh.j2 +++ b/playbooks/roles/edx_django_service/templates/edx/app/app/app.sh.j2 @@ -20,7 +20,7 @@ fi export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}" {% endif -%} -{% if edx_django_service_datadog_enable %} +{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %} {% set executable = edx_django_service_venv_bin + '/ddtrace-run ' + executable %} export DD_TAGS="service:{{ edx_django_datadog_service }} version:{{ app_version }}" export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true