Merge remote-tracking branch 'origin/main' into munir/remove-tornado-stuff

Author: mabdinur

.claude/CLAUDE.md

@@ -23,7 +23,7 @@ This project has custom skills that provide specialized workflows. **Always chec
 **Use whenever:** Formatting code, validating style/types/security, or before committing changes.
 
 **Purpose:** Runs targeted linting and code quality checks using `hatch run lint:*`:
-- Formats code with Black and Ruff auto-fixes
+- Formats code with `ruff check` and `ruff format`
 - Validates style, types, and security
 - Checks spelling and documentation
 - Validates test infrastructure (suitespec, riotfile, etc.)

.claude/skills/lint/SKILL.md

@@ -48,7 +48,7 @@ hatch run lint:typing -- path/to/file.py
 ### Code Formatting
 
 #### `fmt` - Format code (recommended for most edits)
-Formats and validates code style using Black and Ruff.
+Formats and validates code style using Ruff.
 
 **Usage:**
 ```bash
@@ -63,7 +63,7 @@ hatch run lint:fmt -- ddtrace/contrib/flask/
 ```
 
 **What it does:**
-1. Runs Black formatter
+1. Runs the Ruff formatter
 2. Runs Ruff with --fix to auto-fix issues
 3. Re-validates with style checks
 
@@ -94,20 +94,21 @@ hatch run lint:style -- ddtrace/
 ```
 
 **What it validates:**
-- Black formatting
+- Ruff formatting
 - Ruff linting rules
 - Cython linting
 - C code formatting
 - CMake formatting
 
 **When to use:** To verify style compliance before committing without auto-fixes.
 
-#### `black_check` - Check Black formatting
-Validates Python code formatting with Black (no auto-fix).
+#### `format_check` - Check formatting
+
+Validates Python code formatting with `ruff format` (no auto-fix).
 
 **Usage:**
 ```bash
-hatch run lint:black_check -- ddtrace/tracer.py
+hatch run lint:format_check -- ddtrace/tracer.py
 ```
 
 **When to use:** Quick check of Python formatting before committing.

.github/workflows/build_deploy.yml

@@ -111,17 +111,6 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-
-      - name: Enable sccache
-        uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad  # 0.0.9
-
-      - name: Add addtional GHA cache-related env vars
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
-            core.exportVariable('ACTIONS_RUNTIME_URL', process.env['ACTIONS_RUNTIME_URL'])
-
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: source-dist
@@ -139,10 +128,6 @@ jobs:
       - name: Install source package
         env:
           CMAKE_BUILD_PARALLEL_LEVEL: 12
-          CARGO_BUILD_JOBS: 12
-          SCCACHE_GHA_ENABLED: true
-          SCCACHE_CACHE_SIZE: 1G
-          DD_USE_SCCACHE: 1
         run: pip install dist/*.tar.gz
 
       - name: Test the source package

.github/workflows/build_python_3.yml

@@ -83,26 +83,52 @@ jobs:
       fail-fast: false
       matrix:
         include: ${{ fromJson(needs.build-wheels-matrix.outputs.include) }}
+    env:
+      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE: ${{ needs.compute_version.outputs.library_version }}
+      CIBW_SKIP: ${{ inputs.cibw_skip }}
+      CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
+      CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+      CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
+      CIBW_MUSLLINUX_I686_IMAGE: ghcr.io/datadog/dd-trace-py/pypa_musllinux_1_2_i686:latest
+      CIBW_BEFORE_ALL_WINDOWS: ${{ matrix.os == 'windows-latest' && 'rustup target add i686-pc-windows-msvc' || (matrix.os == 'windows-11-arm' && 'rustup target add aarch64-pc-windows-msvc') }}
+      CIBW_BEFORE_ALL_MACOS: rustup target add aarch64-apple-darwin
+      CIBW_BEFORE_ALL_LINUX: |
+        if [[ "$(uname -m)-$(uname -i)-$(uname -o | tr '[:upper:]' '[:lower:]')-$(ldd --version 2>&1 | head -n 1 | awk '{print $1}')" != "i686-unknown-linux-musl" ]]; then
+          curl -sSf https://sh.rustup.rs | sh -s -- -y;
+        fi
+      CIBW_ENVIRONMENT_LINUX: PATH=$HOME/.cargo/bin:$PATH CMAKE_BUILD_PARALLEL_LEVEL=24 CMAKE_ARGS="-DNATIVE_TESTING=OFF" SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
+      # SYSTEM_VERSION_COMPAT is a workaround for versioning issue, a.k.a.
+      # `platform.mac_ver()` reports incorrect MacOS version at 11.0
+      # See: https://stackoverflow.com/a/65402241
+      CIBW_ENVIRONMENT_MACOS: CMAKE_BUILD_PARALLEL_LEVEL=24 SYSTEM_VERSION_COMPAT=0 CMAKE_ARGS="-DNATIVE_TESTING=OFF" SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
+      CIBW_ENVIRONMENT_WINDOWS: SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
+      # cibuildwheel repair will copy anything's under /output directory from the
+      # build container to the host machine. This is a bit hacky way, but seems
+      # to be the only way getting debug symbols out from the container while
+      # we don't mess up with RECORD file.
+      CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
+        mkdir -p /output/debugwheelhouse &&
+        python scripts/extract_debug_symbols.py {wheel} --output-dir /output/debugwheelhouse &&
+        python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
+        mkdir ./tempwheelhouse &&
+        unzip -l {wheel} | grep '\.so' &&
+        auditwheel repair -w ./tempwheelhouse {wheel} &&
+        mv ./tempwheelhouse/*.whl {dest_dir} &&
+        rm -rf ./tempwheelhouse
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
+        mkdir -p ./debugwheelhouse &&
+        python scripts/extract_debug_symbols.py {wheel} --output-dir ./debugwheelhouse &&
+        python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
+        MACOSX_DEPLOYMENT_TARGET=12.7 delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
+      CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python scripts/zip_filter.py "{wheel}" "*.c" "*.cpp" "*.cc" "*.h" "*.hpp" "*.pyx" "*.md" && mv "{wheel}" "{dest_dir}"
+      CIBW_TEST_COMMAND: "python {project}/tests/smoke_test.py"
+
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
           fetch-depth: 0
 
-      - name: Enable sccache
-        if: runner.os != 'Windows'
-        uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad  # 0.0.9
-        with:
-          disable_annotations: true
-
-      - name: Add addtional GHA cache-related env vars
-        uses: actions/github-script@v7
-        if: runner.os != 'Windows'
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
-            core.exportVariable('ACTIONS_RUNTIME_URL', process.env['ACTIONS_RUNTIME_URL'])
-
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         name: Install Python
         with:
@@ -118,76 +144,7 @@ jobs:
         uses: pypa/cibuildwheel@c923d83ad9c1bc00211c5041d0c3f73294ff88f6 # v3.1.4
         with:
           only: ${{ matrix.only }}
-        env:
-          SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE: ${{ needs.compute_version.outputs.library_version }}
-          CIBW_SKIP: ${{ inputs.cibw_skip }}
-          CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
-          CIBW_MUSLLINUX_I686_IMAGE: ghcr.io/datadog/dd-trace-py/pypa_musllinux_1_2_i686:latest
-          CIBW_BEFORE_ALL_WINDOWS: ${{ matrix.os == 'windows-latest' && 'rustup target add i686-pc-windows-msvc' || (matrix.os == 'windows-11-arm' && 'rustup target add aarch64-pc-windows-msvc') }}
-          CIBW_BEFORE_ALL_MACOS: rustup target add aarch64-apple-darwin
-          CIBW_BEFORE_ALL_LINUX: |
-            if [[ "$(uname -m)-$(uname -i)-$(uname -o | tr '[:upper:]' '[:lower:]')-$(ldd --version 2>&1 | head -n 1 | awk '{print $1}')" != "i686-unknown-linux-musl" ]]; then
-              curl -sSf https://sh.rustup.rs | sh -s -- -y;
-            fi
-          CIBW_ENVIRONMENT_LINUX: >
-            PATH=$HOME/.cargo/bin:$PATH
-            CARGO_BUILD_JOBS=24
-            CMAKE_BUILD_PARALLEL_LEVEL=24
-            CMAKE_ARGS="-DNATIVE_TESTING=OFF"
-            SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
-            SCCACHE_GHA_ENABLED=true
-            SCCACHE_DIR=/host/${{ env.SCCACHE_DIR }}
-            SCCACHE_PATH=/host/${{ env.SCCACHE_PATH }}
-            SCCACHE_CACHE_SIZE=1G
-            ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }}
-            ACTIONS_RUNTIME_URL=${{ env.ACTIONS_RUNTIME_URL }}
-            ACTIONS_RESULTS_URL=${{ env.ACTIONS_RESULTS_URL }}
-            ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }}
-            ACTIONS_CACHE_SERVICE_V2=${{ env.ACTIONS_CACHE_SERVICE_V2 }}
-            DD_USE_SCCACHE=1
-          # SYSTEM_VERSION_COMPAT is a workaround for versioning issue, a.k.a.
-          # `platform.mac_ver()` reports incorrect MacOS version at 11.0
-          # See: https://stackoverflow.com/a/65402241
-          CIBW_ENVIRONMENT_MACOS: >
-            CMAKE_BUILD_PARALLEL_LEVEL=24
-            CARGO_BUILD_JOBS=24
-            SYSTEM_VERSION_COMPAT=0
-            CMAKE_ARGS="-DNATIVE_TESTING=OFF"
-            SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
-            SCCACHE_GHA_ENABLED=true
-            SCCACHE_CACHE_SIZE=1G
-            ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }}
-            ACTIONS_RUNTIME_URL=${{ env.ACTIONS_RUNTIME_URL }}
-            ACTIONS_RESULTS_URL=${{ env.ACTIONS_RESULTS_URL }}
-            ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }}
-            ACTIONS_CACHE_SERVICE_V2=${{ env.ACTIONS_CACHE_SERVICE_V2 }}
-            DD_USE_SCCACHE=1
-          CIBW_ENVIRONMENT_WINDOWS: >
-            SETUPTOOLS_SCM_PRETEND_VERSION_FOR_DDTRACE=${{ needs.compute_version.outputs.library_version }}
-          # cibuildwheel repair will copy anything's under /output directory from the
-          # build container to the host machine. This is a bit hacky way, but seems
-          # to be the only way getting debug symbols out from the container while
-          # we don't mess up with RECORD file.
-          CIBW_REPAIR_WHEEL_COMMAND_LINUX: |
-            mkdir -p /output/debugwheelhouse &&
-            python scripts/extract_debug_symbols.py {wheel} --output-dir /output/debugwheelhouse &&
-            python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
-            mkdir ./tempwheelhouse &&
-            unzip -l {wheel} | grep '\.so' &&
-            auditwheel repair -w ./tempwheelhouse {wheel} &&
-            mv ./tempwheelhouse/*.whl {dest_dir} &&
-            rm -rf ./tempwheelhouse
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
-            mkdir -p ./debugwheelhouse &&
-            python scripts/extract_debug_symbols.py {wheel} --output-dir ./debugwheelhouse &&
-            python scripts/zip_filter.py {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx \*.md &&
-            MACOSX_DEPLOYMENT_TARGET=12.7 delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: python scripts/zip_filter.py "{wheel}" "*.c" "*.cpp" "*.cc" "*.h" "*.hpp" "*.pyx" "*.md" && mv "{wheel}" "{dest_dir}"
-          CIBW_BEFORE_TEST_LINUX: /host/${{ env.SCCACHE_PATH }} --show-stats
-          CIBW_BEFORE_TEST_MACOS: ${{ env.SCCACHE_PATH }} --show-stats
-          CIBW_TEST_COMMAND: "python {project}/tests/smoke_test.py"
+
       - name: Validate wheel RECORD files
         shell: bash
         run: |

.github/workflows/system-tests.yml

@@ -45,7 +45,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
+          ref: '2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b'
 
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -90,7 +90,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
+          ref: '2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b'
 
       - name: Build runner
         uses: ./.github/actions/install_runner
@@ -275,7 +275,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
+          ref: '2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b'
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:

.gitlab-ci.yml

@@ -14,7 +14,7 @@ variables:
   DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
   # Automatically managed, use scripts/update-system-tests-version to update
-  SYSTEM_TESTS_REF: "6d02d86d456377cca26e10adb80249d0ee5108fb"
+  SYSTEM_TESTS_REF: "2eb26336ed43c2db1b7f90fff17ce4f5fc36a12b"
 
 default:
   interruptible: true

.gitlab/benchmarks/bp-runner.microbenchmarks.fail-on-breach.yml

@@ -1092,7 +1092,7 @@ experiments:
               - max_rss_usage < 35.50 MB
           - name: telemetryaddmetric-1-distribution-metrics-100-times
             thresholds:
-              - execution_time < 0.22 ms
+              - execution_time < 0.23 ms
               - max_rss_usage < 35.50 MB
           - name: telemetryaddmetric-1-gauge-metric-1-times
             thresholds:

.riot/requirements/13e0d21.txt

@@ -0,0 +1,23 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/13e0d21.in
+#
+aiokafka==0.9.0
+async-timeout==5.0.1
+attrs==25.4.0
+coverage[toml]==7.11.0
+hypothesis==6.45.0
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+pluggy==1.6.0
+pygments==2.19.2
+pytest==8.4.2
+pytest-asyncio==1.2.0
+pytest-cov==7.0.0
+pytest-mock==3.15.1
+pytest-randomly==4.0.1
+sortedcontainers==2.4.0

.riot/requirements/1c72bfb.txt

@@ -0,0 +1,24 @@
+#
+# This file is autogenerated by pip-compile with Python 3.13
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1c72bfb.in
+#
+aiokafka==0.12.0
+async-timeout==5.0.1
+attrs==25.4.0
+coverage[toml]==7.11.0
+hypothesis==6.45.0
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+pluggy==1.6.0
+pygments==2.19.2
+pytest==8.4.2
+pytest-asyncio==1.2.0
+pytest-cov==7.0.0
+pytest-mock==3.15.1
+pytest-randomly==4.0.1
+sortedcontainers==2.4.0
+typing-extensions==4.15.0

.riot/requirements/1ded764.txt

@@ -0,0 +1,23 @@
+#
+# This file is autogenerated by pip-compile with Python 3.14
+# by the following command:
+#
+#    pip-compile --allow-unsafe --no-annotate .riot/requirements/1ded764.in
+#
+aiokafka==0.9.0
+async-timeout==5.0.1
+attrs==25.4.0
+coverage[toml]==7.11.0
+hypothesis==6.45.0
+iniconfig==2.3.0
+mock==5.2.0
+opentracing==2.4.0
+packaging==25.0
+pluggy==1.6.0
+pygments==2.19.2
+pytest==8.4.2
+pytest-asyncio==1.2.0
+pytest-cov==7.0.0
+pytest-mock==3.15.1
+pytest-randomly==4.0.1
+sortedcontainers==2.4.0