Merge branch 'main' into jblz/patch-1

Author: emmettbutler

.github/workflows/all-green.yml

@@ -1,30 +1,32 @@
 name: All Green
 on:
   pull_request:
-  push:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   all-green:
+    name: all-green  # do not change this name, see https://github.com/DataDog/ensure-ci-success/blob/main/docs/limitations.md
     runs-on: ubuntu-latest
     permissions:
       checks: read
       contents: read
     steps:
-      - uses: wechuli/allcheckspassed@e22f45a4f25f4cf821d1273705ac233355400db1
+      - uses: DataDog/ensure-ci-success@727e7fe39ae2e1ce7ea336ec85a7369ab0731754 # v2.1.1
         with:
-          delay: 10  # wait for this delay before starting
-          polling_interval: 1 # after a failure, how long do it wait before checking again
-          retries: 60  # how many retries before stopping 
-          checks_exclude: 'Bootstrap import analysis,require-checklist,Validate changelog'
+          initial-delay-seconds: 10  # wait for this delay before starting
+          polling-interval-seconds: 1 # after a failure, how long do it wait before checking again
+          max-retries: 60  # how many retries before stopping
+          ignored-name-patterns: |
+            Bootstrap import analysis
+            require-checklist
+            Validate changelog
+            devflow/*
 
 # Why some checks are excluded?
 #
 # - Bootstrap import analysis: TO BE ADDED (Success rate of 88% as of 2025-04-17)
 # - require-checklist: this job is triggered by a change on PR description, and already explcititly required
-# - Validate changelog: this job is triggered by a change on labels, and already explcititly required
+# - Validate changelog: this job is triggered by a change on labels, and already explcititly required

.github/workflows/build_python_3.yml

@@ -33,7 +33,7 @@ jobs:
           MATRIX_INCLUDE=$(
             {
               cibuildwheel --print-build-identifiers --platform linux --arch x86_64,i686 | jq -cR '{only: ., os: "ubuntu-latest"}' \
-              && cibuildwheel --print-build-identifiers --platform linux --arch aarch64  | jq -cR '{only: ., os: "arm-4core-linux"}' \
+              && cibuildwheel --print-build-identifiers --platform linux --arch aarch64  | jq -cR '{only: ., os: "arm-4core-linux-ubuntu24.04"}' \
               && cibuildwheel --print-build-identifiers --platform windows --arch AMD64,x86 | grep -v 313 | jq -cR '{only: ., os: "windows-latest"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch x86_64 | jq -cR '{only: ., os: "macos-13"}' \
               && cibuildwheel --print-build-identifiers --platform macos --arch arm64 | jq -cR '{only: ., os: "macos-latest"}'
@@ -59,33 +59,20 @@ jobs:
           fetch-depth: 0
 
       - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
-        if: matrix.os != 'arm-4core-linux'
+        if: matrix.os != 'arm-4core-linux-ubuntu24.04'
         name: Install Python
         with:
           python-version: '3.8'
 
-      - name: Install docker and pipx
-        if: matrix.os == 'arm-4core-linux'
-        # The ARM64 Ubuntu has less things installed by default
-        # We need docker, pip and venv for cibuildwheel
-        # acl allows us to use docker in the same session
-        run: |
-          curl -fsSL https://get.docker.com -o get-docker.sh
-          sudo sh get-docker.sh
-          sudo usermod -a -G docker $USER
-          sudo apt install -y acl python3.10-venv python3-pip
-          sudo setfacl --modify user:runner:rw /var/run/docker.sock
-          python3 -m pip install pipx
-
       - name: Set up QEMU
-        if: runner.os == 'Linux' && matrix.os != 'arm-4core-linux'
+        if: runner.os == 'Linux' && matrix.os != 'arm-4core-linux-ubuntu24.04'
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
         with:
           platforms: all
 
       - name: Build wheels arm64
-        if: always() && matrix.os == 'arm-4core-linux'
-        run: /home/runner/.local/bin/pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
+        if: always() && matrix.os == 'arm-4core-linux-ubuntu24.04'
+        run: pipx run cibuildwheel==2.22.0 --only ${{ matrix.only }}
         env:
           CIBW_SKIP: ${{ inputs.cibw_skip }}
           CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
@@ -119,7 +106,7 @@ jobs:
           # CIBW_BUILD_VERBOSITY_MACOS: 3
 
       - name: Build wheels
-        if: always() && matrix.os != 'arm-4core-linux'
+        if: always() && matrix.os != 'arm-4core-linux-ubuntu24.04'
         uses: pypa/cibuildwheel@d04cacbc9866d432033b1d09142936e6a0e2121a # v2.23.2
         with:
           only: ${{ matrix.only }}

.gitlab-ci.yml

@@ -10,6 +10,7 @@ variables:
   REPO_NOTIFICATION_CHANNEL: "#apm-python-release"
   RELEASE_ALLOW_TEST_FAILURES: false
   RELEASE_ALLOW_BENCHMARK_FAILURES: false
+  DD_DISABLE_VPA: true
   # CI_DEBUG_SERVICES: "true"
 
 default:
@@ -29,7 +30,7 @@ workflow:
     - when: always
 
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/one-pipeline.yml
+  - local: ".gitlab/one-pipeline.locked.yml"
   - local: ".gitlab/services.yml" # Include early so others can use the definitions
   - local: ".gitlab/package.yml"
   - local: ".gitlab/release.yml"

.gitlab/benchmarks/microbenchmarks.yml

@@ -152,6 +152,8 @@ microbenchmarks:
         # Flaky timeouts on starting up
         # - "appsec_iast_django_startup"
         - "appsec_iast_propagation"
+        - "errortracking_django_simple"
+        - "errortracking_flask_sqli"
         # Flaky. Timeout errors
         # - "encoder"
         - "http_propagation_extract"
@@ -161,7 +163,6 @@ microbenchmarks:
         - "packages_update_imported_dependencies"
         - "telemetry_add_metric"
         - "startup"
-        - "ddtrace_run"
 
 "microbenchmarks flaky":
   extends: .benchmarks
@@ -177,6 +178,7 @@ benchmarks-pr-comment:
   tags: ["arch:amd64"]
   stage: report
   when: always
+  allow_failure: true
   script: |
     export REPORTS_DIR="$(pwd)/reports/" && (mkdir "${REPORTS_DIR}" || :)
     if [[ -n "$CI_JOB_TOKEN" ]];
@@ -187,9 +189,10 @@ benchmarks-pr-comment:
     export PATH="$PATH:/platform/steps"
 
     (for i in {1..2}; do upload-results-to-benchmarking-api.sh && break; done) || :
-    post-pr-comment.sh || :
-  except:
-    - main
+    if [ "$CI_COMMIT_REF_NAME" != "main" ];
+    then
+      post-pr-comment.sh || :
+    fi
   variables:
     UPSTREAM_PROJECT_ID: $CI_PROJECT_ID # The ID of the current project. This ID is unique across all projects on the GitLab instance.
     UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME # "dd-trace-py"

.gitlab/one-pipeline.locked.yml

@@ -0,0 +1,4 @@
+# DO NOT EDIT THIS FILE MANUALLY
+# This file is auto-generated by automation.
+include:
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/05e116339b9780a138a474d0348e97debfca97f27bbc4ca489cf4e4c90d9cc94/one-pipeline.yml

.gitlab/services.yml

@@ -15,7 +15,7 @@
     name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.21.0
     alias: testagent
     variables:
-      LOG_LEVEL: INFO
+      LOG_LEVEL: ERROR
       SNAPSHOT_DIR: ${CI_PROJECT_DIR}/tests/snapshots
       SNAPSHOT_CI: 1
       PORT: 9126

.gitlab/tests.yml

@@ -85,6 +85,8 @@ include:
       done
       ./scripts/check-diff ".riot/requirements/" \
         "Changes detected after running riot. Consider deleting changed files, running scripts/compile-and-prune-test-requirements and committing the result."
+      ./scripts/check-diff "ddtrace/contrib/integration_registry/registry.yaml" \
+        "Registry YAML file (ddtrace/contrib/integration_registry/registry.yaml) was modified. Please run: scripts/integration_registry/update_and_format_registry.py and commit the changes."
 
 
 .test_base_riot_snapshot:

.riot/requirements/1024326.txt

@@ -0,0 +1,44 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/1024326.in
+#
+attrs==25.3.0
+certifi==2025.4.26
+cffi==1.17.1
+charset-normalizer==3.4.2
+coverage[toml]==7.8.0
+cryptography==44.0.3
+exceptiongroup==1.3.0
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+jinja2==3.1.6
+linkify-it-py==2.0.3
+markdown-it-py[linkify,plugins]==3.0.0
+markupsafe==3.0.2
+mdit-py-plugins==0.4.2
+mdurl==0.1.2
+memray==1.17.2
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+platformdirs==4.3.8
+pluggy==1.5.0
+psycopg2-binary==2.9.10
+pycparser==2.22
+pycryptodome==3.22.0
+pygments==2.19.1
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-memray==1.7.0
+pytest-mock==3.14.0
+requests==2.32.3
+rich==14.0.0
+sortedcontainers==2.4.0
+textual==3.2.0
+tomli==2.2.1
+typing-extensions==4.13.2
+uc-micro-py==1.0.3
+urllib3==2.4.0

.riot/requirements/2b3511f.txt renamed to .riot/requirements/103234b.txt

@@ -2,29 +2,29 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --no-annotate .riot/requirements/2b3511f.in
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/103234b.in
 #
-attrs==23.2.0
-coverage[toml]==7.6.0
+attrs==25.3.0
+coverage[toml]==7.8.0
 django==2.2.28
 django-configurations==2.3.2
 djangorestframework==3.12.4
 exceptiongroup==1.2.2
 hypothesis==6.45.0
-importlib-metadata==8.0.0
-iniconfig==2.0.0
-mock==5.1.0
+importlib-metadata==8.6.1
+iniconfig==2.1.0
+mock==5.2.0
 opentracing==2.4.0
-packaging==24.1
+packaging==24.2
 pluggy==1.5.0
-pytest==8.2.2
-pytest-cov==5.0.0
+pytest==8.3.5
+pytest-cov==6.1.1
 pytest-django[testing]==3.10.0
 pytest-mock==3.14.0
-pytest-randomly==3.15.0
-pytz==2024.1
-six==1.16.0
+pytest-randomly==3.16.0
+pytz==2025.2
+six==1.17.0
 sortedcontainers==2.4.0
-sqlparse==0.5.1
-tomli==2.0.1
-zipp==3.19.2
+sqlparse==0.5.3
+tomli==2.2.1
+zipp==3.21.0

.riot/requirements/1069d84.txt

@@ -0,0 +1,34 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1069d84.in
+#
+astunparse==1.6.3
+attrs==25.3.0
+blinker==1.9.0
+certifi==2025.4.26
+charset-normalizer==3.4.2
+click==8.1.8
+coverage[toml]==7.8.0
+flask==3.1.0
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+itsdangerous==2.2.0
+jinja2==3.1.6
+markupsafe==3.0.2
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+pluggy==1.5.0
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-mock==3.14.0
+requests==2.32.3
+six==1.17.0
+sortedcontainers==2.4.0
+urllib3==2.4.0
+virtualenv-clone==0.5.7
+werkzeug==3.1.3
+wheel==0.45.1

.riot/requirements/10802a6.txt

@@ -0,0 +1,34 @@
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    pip-compile --no-annotate .riot/requirements/10802a6.in
+#
+astunparse==1.6.3
+attrs==25.3.0
+blinker==1.9.0
+certifi==2025.4.26
+charset-normalizer==3.4.2
+click==8.1.8
+coverage[toml]==7.8.0
+flask==3.1.0
+hypothesis==6.45.0
+idna==3.10
+iniconfig==2.1.0
+itsdangerous==2.2.0
+jinja2==3.1.6
+markupsafe==3.0.2
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+pluggy==1.5.0
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-mock==3.14.0
+requests==2.32.3
+six==1.17.0
+sortedcontainers==2.4.0
+urllib3==2.4.0
+virtualenv-clone==0.5.7
+werkzeug==3.1.3
+wheel==0.45.1

.riot/requirements/10853b3.txt

@@ -0,0 +1,29 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/10853b3.in
+#
+attrs==25.3.0
+certifi==2025.1.31
+charset-normalizer==3.4.1
+coverage[toml]==7.8.0
+exceptiongroup==1.2.2
+hypothesis==6.45.0
+idna==3.10
+importlib-metadata==8.6.1
+iniconfig==2.1.0
+mock==5.2.0
+opensearch-py[requests]==1.1.0
+opentracing==2.4.0
+packaging==24.2
+pluggy==1.5.0
+pytest==8.3.5
+pytest-cov==6.1.1
+pytest-mock==3.14.0
+pytest-randomly==3.16.0
+requests==2.32.3
+sortedcontainers==2.4.0
+tomli==2.2.1
+urllib3==1.26.20
+zipp==3.21.0