Merge branch 'main' into dubloom/process-tags-collection

Author: dubloom

.github/CODEOWNERS

@@ -41,7 +41,7 @@ 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
@@ -95,7 +95,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 +114,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
@@ -131,7 +131,7 @@ 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 +207,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

.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/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/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: '38b9edcd63a1158f1a51e0430770052341b9cfdb'
+          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: '38b9edcd63a1158f1a51e0430770052341b9cfdb'
+          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: '38b9edcd63a1158f1a51e0430770052341b9cfdb'
+          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: "38b9edcd63a1158f1a51e0430770052341b9cfdb"
+  SYSTEM_TESTS_REF: "6d02d86d456377cca26e10adb80249d0ee5108fb"
 
 default:
   interruptible: true

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

@@ -802,7 +802,7 @@ experiments:
               - max_rss_usage < 47.50 MB
           - name: otelspan-add-tags
             thresholds:
-              - execution_time < 314.00 ms
+              - execution_time < 321.00 ms
               - max_rss_usage < 47.50 MB
           - name: otelspan-get-context
             thresholds:

.gitlab/benchmarks/microbenchmarks.yml

@@ -7,7 +7,7 @@ stages:
 variables:
   BENCHMARKING_IMAGE_REGISTRY: 486234852809.dkr.ecr.us-east-1.amazonaws.com
   MICROBENCHMARKS_CI_IMAGE: $BENCHMARKING_IMAGE_REGISTRY/ci/benchmarking-platform:dd-trace-py
-  PACKAGE_IMAGE: registry.ddbuild.io/images/mirror/pypa/manylinux2014_x86_64:2024-08-12-7fde9b1
+  PACKAGE_IMAGE: registry.ddbuild.io/images/mirror/pypa/manylinux2014_x86_64:2025-04-12-5990e2d
   GITHUB_CLI_IMAGE: registry.ddbuild.io/images/dd-octo-sts-ci-base:2025.06-1
   BENCHMARKING_BRANCH: dd-trace-py
 

.gitlab/package.yml

@@ -59,8 +59,6 @@ download_dependency_wheels:
     PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
   parallel:
     matrix: # The image tags that are mirrored are in: https://github.com/DataDog/images/blob/master/mirror.yaml
-      - PYTHON_IMAGE_TAG: "3.8"
-        PYTHON_VERSION: "3.8"
       - PYTHON_IMAGE_TAG: "3.9.13"
         PYTHON_VERSION: "3.9"
       - PYTHON_IMAGE_TAG: "3.10.13"

.gitlab/templates/build-base-venvs.yml

@@ -4,7 +4,7 @@ build_base_venvs:
   needs: []
   parallel:
     matrix:
-      - PYTHON_VERSION: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+      - PYTHON_VERSION: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
   variables:
     CMAKE_BUILD_PARALLEL_LEVEL: '12'
     PIP_VERBOSE: '0'