Merge branch 'main' into vianney/enable-native-writer-by-default

Author: emmettbutler

.github/CODEOWNERS

@@ -41,12 +41,16 @@ ddtrace/internal/_file_queue.py     @DataDog/python-guild
 ddtrace/internal/_unpatched.py      @DataDog/python-guild
 ddtrace/internal/compat.py          @DataDog/python-guild  @DataDog/apm-core-python
 ddtrace/internal/endpoints.py       @DataDog/python-guild  @DataDog/asm-python
-ddtrace/settings/config.py          @DataDog/python-guild  @DataDog/apm-sdk-capabilities-python
+ddtrace/internal/settings/_config.py          @DataDog/python-guild  @DataDog/apm-sdk-capabilities-python
 docs/                               @DataDog/python-guild
 tests/utils.py                      @DataDog/python-guild
 tests/suitespec.yml                 @DataDog/python-guild  @DataDog/apm-core-python
+tests/contrib/suitespec.yml         @DataDog/python-guild
+tests/contrib/flask/app.py         @DataDog/python-guild
+tests/contrib/django/django1_app/urls.py @DataDog/python-guild
 tests/suitespec.py                  @DataDog/python-guild  @DataDog/apm-core-python
 scripts/bump_ddtrace.py             @DataDog/python-guild
+tests/smoke_test.py                 @DataDog/python-guild
 
 # Core / Language Platform
 tests/internal                      @DataDog/apm-core-python
@@ -95,7 +99,7 @@ tests/snapshots/test_selenium_*                       @DataDog/ci-app-libraries
 
 # Debugger
 ddtrace/debugging/                  @DataDog/debugger-python
-ddtrace/settings/dynamic_instrumentation.py     @DataDog/debugger-python
+ddtrace/internal/settings/dynamic_instrumentation.py     @DataDog/debugger-python
 ddtrace/internal/injection.py       @DataDog/debugger-python @DataDog/apm-core-python
 ddtrace/internal/wrapping.py        @DataDog/debugger-python @DataDog/apm-core-python
 ddtrace/internal/module.py          @DataDog/debugger-python @DataDog/apm-core-python
@@ -114,7 +118,7 @@ benchmarks/bm/iast_utils*           @DataDog/asm-python
 benchmarks/bm/iast_fixtures*        @DataDog/asm-python
 benchmarks/base/aspects_benchmarks_generate.py @DataDog/asm-python
 ddtrace/appsec/                     @DataDog/asm-python
-ddtrace/settings/asm.py             @DataDog/asm-python
+ddtrace/internal/settings/asm.py             @DataDog/asm-python
 ddtrace/contrib/internal/subprocess/         @DataDog/asm-python
 ddtrace/contrib/internal/flask_login/        @DataDog/asm-python
 ddtrace/contrib/internal/webbrowser          @DataDog/asm-python
@@ -125,13 +129,12 @@ ddtrace/internal/iast/              @DataDog/asm-python
 tests/appsec/                       @DataDog/asm-python
 tests/contrib/subprocess            @DataDog/asm-python
 tests/snapshots/tests*appsec*.json  @DataDog/asm-python
-tests/contrib/*/test*appsec*.py     @DataDog/asm-python
-tests/contrib/*/test*iast*.py  @DataDog/asm-python
 scripts/iast/*                      @DataDog/asm-python
 
+
 # Profiling
 ddtrace/profiling                   @DataDog/profiling-python
-ddtrace/settings/profiling.py       @DataDog/profiling-python
+ddtrace/internal/settings/profiling.py       @DataDog/profiling-python
 ddtrace/internal/datadog/profiling  @DataDog/profiling-python
 tests/profiling                     @DataDog/profiling-python
 tests/profiling_v2                  @DataDog/profiling-python
@@ -207,15 +210,15 @@ ddtrace/opentracer/                                @DataDog/apm-sdk-capabilities
 ddtrace/propagation/                               @DataDog/apm-sdk-capabilities-python
 ddtrace/openfeature/                              @DataDog/asm-python @DataDog/apm-core-python
 tests/openfeature/                                @DataDog/asm-python @DataDog/apm-core-python
-ddtrace/settings/_opentelemetry.py                 @DataDog/apm-sdk-capabilities-python
+ddtrace/internal/settings/_opentelemetry.py                 @DataDog/apm-sdk-capabilities-python
 
 ddtrace/internal/sampling.py                       @DataDog/apm-sdk-capabilities-python
 ddtrace/internal/tracemethods.py                   @DataDog/apm-sdk-capabilities-python
 ddtrace/internal/metrics.py                        @DataDog/apm-sdk-capabilities-python
 ddtrace/internal/rate_limiter.py                   @DataDog/apm-sdk-capabilities-python
 ddtrace/runtime/                                   @DataDog/apm-sdk-capabilities-python
 ddtrace/internal/runtime/                          @DataDog/apm-sdk-capabilities-python
-ddtrace/settings/_otel_remapper.py                 @DataDog/apm-sdk-capabilities-python
+ddtrace/internal/settings/_otel_remapper.py                 @DataDog/apm-sdk-capabilities-python
 tests/integration/test_priority_sampling.py        @DataDog/apm-sdk-capabilities-python
 tests/integration/test_propagation.py              @DataDog/apm-sdk-capabilities-python
 tests/runtime/                                     @DataDog/apm-sdk-capabilities-python
@@ -240,7 +243,7 @@ tests/contrib/azure_functions                               @DataDog/serverless
 tests/contrib/azure_functions_eventhubs                     @DataDog/serverless @DataDog/apm-serverless
 tests/contrib/azure_functions_servicebus                    @DataDog/serverless @DataDog/apm-serverless
 tests/contrib/azure_servicebus                              @DataDog/serverless @DataDog/apm-serverless
-tests/internal/test_serverless.py                           @DataDog/apm-core-python @DataDog/apm-serverless
+tests/internal/test_serverless.py                           @DataDog/apm-core-python @DataDog/apm-serverless @DataDog/asm-python
 tests/snapshots/tests.contrib.aws_lambda.*.                 @DataDog/apm-serverless
 tests/snapshots/tests.contrib.azure_eventhubs.*             @DataDog/serverless @DataDog/apm-serverless
 tests/snapshots/tests.contrib.azure_functions.*             @DataDog/serverless @DataDog/apm-serverless
@@ -251,3 +254,8 @@ tests/snapshots/tests.contrib.azure_servicebus.*            @DataDog/serverless
 # Data Streams Monitoring
 ddtrace/internal/datastreams        @DataDog/data-streams-monitoring
 tests/datastreams                   @DataDog/data-streams-monitoring
+
+# ASM (order matters)
+tests/**/*appsec*               @DataDog/asm-python
+tests/**/*iast*                 @DataDog/asm-python
+tests/tracer/test_propagation.py        @DataDog/apm-sdk-capabilities-python @DataDog/asm-python

.github/workflows/build_deploy.yml

@@ -69,8 +69,8 @@ jobs:
     needs: [ "compute_version" ]
     uses: ./.github/workflows/build_python_3.yml
     with:
-      cibw_build: 'cp38* cp39* cp310* cp311* cp312* cp313* cp314*'
-      cibw_skip: 'cp38-win_arm64 cp39-win_arm64 cp310-win_arm64 cp314t*'
+      cibw_build: 'cp39* cp310* cp311* cp312* cp313* cp314*'
+      cibw_skip: 'cp39-win_arm64 cp310-win_arm64 cp314t*'
       library_version: ${{ needs.compute_version.outputs.library_version }}
 
   build_sdist:

.github/workflows/build_python_3.yml

@@ -94,9 +94,6 @@ jobs:
       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
-          if command -v yum &> /dev/null; then
-            yum install -y libatomic.i686
-          fi
           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 }}

.github/workflows/django-overhead-profile.yml

@@ -13,18 +13,10 @@ on:
 jobs:
   django-overhead-profile:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - suffix: "-v1"
-            stack_v2: "0"
-          - suffix: "-v2"
-            stack_v2: "1"
     env:
       PREFIX: ${{ github.workspace }}/prefix
       DD_CODE_ORIGIN_FOR_SPANS_ENABLED: "1"
       DD_PROFILING_ENABLED: "1"
-      DD_PROFILING_STACK_V2_ENABLED: ${{ matrix.stack_v2 }}
       DD_PROFILING_OUTPUT_PPROF: ${{ github.workspace }}/prefix/artifacts/ddtrace_profile
       DD_EXCEPTION_REPLAY_ENABLED: "1"
     defaults:
@@ -50,5 +42,5 @@ jobs:
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: django-overhead-profile${{ matrix.suffix }}
+          name: django-overhead-profile
           path: ${{ github.workspace }}/prefix/artifacts

.github/workflows/generate-package-versions.yml

@@ -81,14 +81,14 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade "pip<25.3"
           pip install packaging
           pip install requests
           pip install riot==0.20.1
           pip install PyYAML
           pip install ddtrace
           # Install latest pip-tools from main branch for Python 3.14 compatibility
-          pip install --upgrade git+https://github.com/jazzband/pip-tools.git@934b46a8795554f994b984ac743957f8458a29d6
+          pip install --upgrade git+https://github.com/jazzband/pip-tools.git@1c2692b7f45a94d93e3f4bb252da3fd711ad08a9 # v7.5.1
 
       - name: Run regenerate-riot-latest
         run: scripts/regenerate-riot-latest.sh

.github/workflows/profiling-native.yml

@@ -21,6 +21,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        memcpy-mode: ["default", "fast"]
         sanitizer: ["safety", "thread", "valgrind"]
 
     steps:
@@ -49,4 +50,10 @@ jobs:
           # DEV: We currently have tests in dd_wrapper and stack_v2, setting
           # stack_v2 here will also run tests in dd_wrapper. Revisit this when
           # that changes.
+          if [ "${{matrix.memcpy-mode}}" == "fast" ]; then
+            export ECHION_USE_FAST_COPY_MEMORY=1
+          else
+            export ECHION_USE_FAST_COPY_MEMORY=0
+          fi
+
           ./ddtrace/internal/datadog/profiling/build_standalone.sh --${{matrix.sanitizer}} RelWithDebInfo stack_v2_test

.github/workflows/requirements-locks.yml

@@ -28,7 +28,8 @@ jobs:
         run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13 3.14
 
       - name: Install Dependencies
-        run: pip install --upgrade pip && pip install riot==0.20.1 && pip install toml==0.10.2
+        # Keep pip at <25.3 until https://github.com/jazzband/pip-tools/issues/2252 is resolved
+        run: pip install --upgrade "pip<25.3" && pip install riot==0.20.1 && pip install toml==0.10.2
 
       - name: Generate riot locks
         run: scripts/compile-and-prune-test-requirements

.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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
+          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
 
       - 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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
+          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
 
       - 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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
+          ref: '6d02d86d456377cca26e10adb80249d0ee5108fb'
       - name: Download wheels to binaries directory
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:

.github/workflows/unit_tests.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         # Keep this in sync with hatch.toml
-        python-version: ["3.8", "3.10", "3.12", "3.14"]
+        python-version: ["3.10", "3.12", "3.14"]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.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: "58dc99266c404d0e04868a5817c61fad360cc4cb"
+  SYSTEM_TESTS_REF: "6d02d86d456377cca26e10adb80249d0ee5108fb"
 
 default:
   interruptible: true