feat: Allow per-service Datadog APM enable for edxapp (#8)

This will allow us to enable Datadog for edxapp independently of other services during the migration. It also pushes the knowledge of the two common switches into the defaults layer so that only one variable needs to be consulted. Similar work for other services would follow. I've also switched to a topic-first rather than an `ENABLE`-first naming convention since it tends to sort and group better. This supports edx/edx-arch-experiments#632
edx · May 14, 2024 · 4942912 · 4942912
1 parent 01d773f
commit 4942912
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/playbooks/roles/edxapp/defaults/main.yml b/playbooks/roles/edxapp/defaults/main.yml
@@ -635,6 +635,7 @@ EDXAPP_NEWRELIC_WORKERS_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT
 EDXAPP_LMS_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
 EDXAPP_CMS_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
 EDXAPP_WORKERS_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
+EDXAPP_DATADOG_ENABLE: "{{COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP}}"
 
 EDXAPP_ORA2_FILE_PREFIX: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}/ora2'
 EDXAPP_FILE_UPLOAD_STORAGE_BUCKET_NAME: '{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}'

diff --git a/playbooks/roles/edxapp/tasks/deploy.yml b/playbooks/roles/edxapp/tasks/deploy.yml
@@ -217,7 +217,7 @@
     - install:app-requirements
 
 - name: "Install Datadog APM requirements"
-  when: COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP
+  when: EDXAPP_DATADOG_ENABLE
   pip:
     name:
       - ddtrace

diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
@@ -20,7 +20,7 @@ fi
 export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
 {% endif -%}
 
-{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}
+{% if EDXAPP_DATADOG_ENABLE %}
 {% set executable = edxapp_venv_bin + '/ddtrace-run ' + executable %}
 export DD_TAGS="service:edx-edxapp-cms"
 export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true

diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
@@ -20,7 +20,7 @@ fi
 export NEW_RELIC_LICENSE_KEY="{{ NEWRELIC_LICENSE_KEY }}"
 {% endif -%}
 
-{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}
+{% if EDXAPP_DATADOG_ENABLE %}
 {% set executable = edxapp_venv_bin + '/ddtrace-run ' + executable %}
 export DD_TAGS="service:edx-edxapp-lms"
 export DD_DJANGO_USE_LEGACY_RESOURCE_FORMAT=true