feat: add plumbing for ecomworker prod DD to be turned on

edx · May 23, 2024 · b540883 · b540883
1 parent ea52958
commit b540883
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/playbooks/roles/ecomworker/defaults/main.yml b/playbooks/roles/ecomworker/defaults/main.yml
@@ -28,6 +28,9 @@ ECOMMERCE_WORKER_REPOS:
 ECOMMERCE_WORKER_NEWRELIC_APPNAME: '{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }}-{{ ecommerce_worker_service_name }}'
 ECOMMERCE_WORKER_ENABLE_NEWRELIC_DISTRIBUTED_TRACING: false
 
+# Datadog
+ECOMMERCE_WORKER_DATADOG_ENABLE: "{{COMMON_ENABLE_DATADOG and COMMON_ECOMMERCE_WORKER_DATADOG_ENABLE}}"
+
 # CELERY
 ECOMMERCE_WORKER_BROKER_USERNAME: ''
 ECOMMERCE_WORKER_BROKER_PASSWORD: 'celery'

diff --git a/playbooks/roles/ecomworker/tasks/main.yml b/playbooks/roles/ecomworker/tasks/main.yml
@@ -22,7 +22,7 @@
     - install:app-requirements
 
 - name: "Install Datadog APM requirements"
-  when: COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP
+  when: ECOMMERCE_WORKER_DATADOG_ENABLE
   pip:
     name:
       - ddtrace

diff --git a/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2 b/playbooks/roles/ecomworker/templates/edx/app/ecomworker/ecomworker.sh.j2
@@ -14,7 +14,7 @@ export NEW_RELIC_APP_NAME='{{ ECOMMERCE_WORKER_NEWRELIC_APPNAME }}'
 export NEW_RELIC_LICENSE_KEY='{{ NEWRELIC_LICENSE_KEY }}'
 {% endif -%}
 
-{% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}
+{% if ECOMMERCE_WORKER_DATADOG_ENABLE %}
 {% set executable = ecommerce_worker_venv_bin + '/ddtrace-run ' + executable %}
 export DD_TAGS="service:edx-{{ ecommerce_worker_service_name }} version:{{ app_version }}"
 export DD_DJANGO_USE_HANDLER_RESOURCE_FORMAT=true