Merge branch 'master' of https://github.com/edx/configuration into re…

…vert-136-revert-124-bilalqamar95/node-version-update
edx · Jan 14, 2025 · b97f59e · b97f59e
2 parents 0aba728 + afedbde
commit b97f59e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/playbook-test.yml b/.github/workflows/playbook-test.yml
@@ -9,11 +9,11 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/syntax-test.yml b/.github/workflows/syntax-test.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/cms.sh.j2
@@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
 # Suppress middleware spans because there are about 100 for each request.
 # Remove (or set to true) for debugging.
 export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
+
+{% if COMMON_ENVIRONMENT == "stage" %}
+# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
+# has an effect on the remaining orphaned spans.
+# https://github.com/edx/edx-arch-experiments/issues/822
+export DD_CELERY_DISTRIBUTED_TRACING=true
+{% endif %}
+
 {% endif -%}
 
 # We want to be able to toggle this on separately from DD in general.
@@ -54,4 +62,4 @@ source {{ edxapp_app_dir }}/edxapp_env
 exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi --log-file {{ edxapp_gunicorn_log_dir[1] }}/edx.log
 {% else %}
 exec {{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
-{% endif %}
+{% endif %}
diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/lms.sh.j2
@@ -22,6 +22,13 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
 # Remove (or set to true) for debugging.
 export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
 
+{% if COMMON_ENVIRONMENT == "stage" %}
+# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
+# has an effect on the remaining orphaned spans.
+# https://github.com/edx/edx-arch-experiments/issues/822
+export DD_CELERY_DISTRIBUTED_TRACING=true
+{% endif %}
+
 {% endif -%}
 
 # We want to be able to toggle this on separately from DD in general.

diff --git a/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2 b/playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2
@@ -21,6 +21,14 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
 # Suppress middleware spans because there are about 100 for each request.
 # Remove (or set to true) for debugging.
 export DD_DJANGO_INSTRUMENT_MIDDLEWARE=false
+
+{% if COMMON_ENVIRONMENT == "stage" %}
+# Temporary 2025-01-09: Enable Celery distributed tracing to see if it
+# has an effect on the remaining orphaned spans.
+# https://github.com/edx/edx-arch-experiments/issues/822
+export DD_CELERY_DISTRIBUTED_TRACING=true
+{% endif %}
+
 {% endif -%}
 
 # We want to be able to toggle this on separately from DD in general.