Merge branch 'main' into munir/deprecate-using-pin-with-multiple-tracers

DataDog · Jan 16, 2025 · 911bd62 · 911bd62
2 parents 6600bfc + 0275a5e
commit 911bd62
Show file tree

Hide file tree

Showing 358 changed files with 4,085 additions and 1,742 deletions.
diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml
@@ -404,12 +404,12 @@ jobs:
           paths:
             - "."
 
-  appsec_integrations:
+  appsec_integrations_pygoat:
     <<: *machine_executor
     parallelism: 13
     steps:
       - run_test:
-          pattern: 'appsec_integrations'
+          pattern: 'appsec_integrations_pygoat'
           snapshot: true
           run_agent_checks: false
           docker_services: "pygoat"

diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -47,6 +47,7 @@ jobs:
           - weblog-variant: fastapi
           # runs django-poc for 3.12
           - weblog-variant: python3.12
+          - weblog-variant: django-py3.13
       fail-fast: false
     env:
       TEST_LIBRARY: python
@@ -96,7 +97,7 @@ jobs:
     needs: [system-tests-build-agent, system-tests-build-weblog]
     strategy:
       matrix:
-        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12]
+        weblog-variant: [flask-poc, uwsgi-poc , django-poc, fastapi, python3.12, django-py3.13]
         scenario: [remote-config, appsec, appsec-1, other, debugger-1, debugger-2]
 
       fail-fast: false

diff --git a/.riot/requirements/1147cef.txt b/.riot/requirements/1147cef.txt
diff --git a/.riot/requirements/1221a04.txt b/.riot/requirements/1221a04.txt
diff --git a/.riot/requirements/131666a.txt b/.riot/requirements/131666a.txt
diff --git a/.riot/requirements/16ed652.txt b/.riot/requirements/16ed652.txt
diff --git a/.riot/requirements/173e759.txt b/.riot/requirements/173e759.txt
diff --git a/.riot/requirements/17b5eda.txt b/.riot/requirements/17b5eda.txt
diff --git a/.riot/requirements/1a1ddb4.txt b/.riot/requirements/1a1ddb4.txt