feat: REV-4051 | allow edx_django_service to be provided with specifi…

…c app names to run datadog on
edx · May 20, 2024 · 1a14b6f · 1a14b6f
1 parent ee5d9a3
commit 1a14b6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/playbooks/roles/common_vars/defaults/main.yml b/playbooks/roles/common_vars/defaults/main.yml
@@ -102,6 +102,7 @@ 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_SPECIFIC_DATADOG_APPS: []
 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
@@ -104,6 +104,7 @@ 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_specifically_enabled_datadog_apps: '{{ COMMON_ENABLE_SPECIFIC_DATADOG_APPS }}'
 
 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
@@ -213,7 +213,7 @@
     - install:app-requirements
 
 - name: "Install Datadog APM requirements"
-  when: COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP
+  when: COMMON_ENABLE_DATADOG and ( COMMON_ENABLE_DATADOG_APP or {{ edx_django_service_name }} in edx_specifically_enabled_datadog_apps )
   pip:
     name:
       - ddtrace