Merge branch 'main' into erikayasuda/macrobm-slo-docs

Author: erikayasuda

.coveragerc

@@ -8,5 +8,5 @@ disable_warnings = couldnt-parse
 [paths]
 source =
     ./
-    /home/circleci/project/
     /root/project/
+    /home/bits/project

.github/CODEOWNERS

@@ -21,6 +21,7 @@ riotfile.py                         @DataDog/apm-python
 .riot/requirements/                 @DataDog/apm-python
 CHANGELOG.md                        @DataDog/apm-python
 README.md                           @DataDog/apm-python
+ddtrace/internal/telemetry/         @DataDog/apm-python
 tests/telemetry                     @DataDog/apm-python
 
 # Guild
@@ -53,12 +54,11 @@ tests/opentracer                    @DataDog/apm-core-python
 tests/tracer                        @DataDog/apm-core-python
 
 # Test Visibility and related
-ddtrace/contrib/asynctest                             @DataDog/ci-app-libraries
-ddtrace/contrib/coverage                              @DataDog/ci-app-libraries
-ddtrace/contrib/pytest                                @DataDog/ci-app-libraries
-ddtrace/contrib/pytest_bdd                            @DataDog/ci-app-libraries
-ddtrace/contrib/pytest_benchmark                      @DataDog/ci-app-libraries
-ddtrace/contrib/unittest                              @DataDog/ci-app-libraries
+ddtrace/contrib/internal/coverage                     @DataDog/ci-app-libraries
+ddtrace/contrib/internal/pytest                       @DataDog/ci-app-libraries
+ddtrace/contrib/internal/pytest_bdd                   @DataDog/ci-app-libraries
+ddtrace/contrib/internal/pytest_benchmark             @DataDog/ci-app-libraries
+ddtrace/contrib/internal/unittest                     @DataDog/ci-app-libraries
 ddtrace/contrib/internal/pytest                       @DataDog/ci-app-libraries
 ddtrace/contrib/internal/pytest_bdd                   @DataDog/ci-app-libraries
 ddtrace/contrib/internal/pytest_benchmark             @DataDog/ci-app-libraries
@@ -84,11 +84,9 @@ tests/tracer/test_ci.py                               @DataDog/ci-app-libraries
 ddtrace/ext/git.py                                    @DataDog/ci-app-libraries @DataDog/apm-core-python
 scripts/ci_visibility/*                               @DataDog/ci-app-libraries
 # Test Visibility owns the freezegun integration because it's the team most affected by it
-ddtrace/contrib/freezegun                             @DataDog/ci-app-libraries
 ddtrace/contrib/internal/freezegun                    @DataDog/ci-app-libraries
 tests/contrib/freezegun                               @DataDog/ci-app-libraries
 # Test Visibility: Selenium integration
-ddtrace/contrib/selenium                              @DataDog/ci-app-libraries
 ddtrace/internal/selenium                             @DataDog/ci-app-libraries
 tests/contrib/selenium                                @DataDog/ci-app-libraries
 tests/snapshots/test_selenium_*                       @DataDog/ci-app-libraries
@@ -115,11 +113,10 @@ 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/contrib/subprocess/         @DataDog/asm-python
 ddtrace/contrib/internal/subprocess/         @DataDog/asm-python
-ddtrace/contrib/flask_login/        @DataDog/asm-python
-ddtrace/contrib/webbrowser          @DataDog/asm-python
-ddtrace/contrib/urllib              @DataDog/asm-python
+ddtrace/contrib/internal/flask_login/        @DataDog/asm-python
+ddtrace/contrib/internal/webbrowser          @DataDog/asm-python
+ddtrace/contrib/internal/urllib              @DataDog/asm-python
 ddtrace/internal/_exceptions.py     @DataDog/asm-python
 ddtrace/internal/appsec/            @DataDog/asm-python
 ddtrace/internal/iast/              @DataDog/asm-python
@@ -153,6 +150,7 @@ ddtrace/contrib/internal/crewai                               @DataDog/ml-observ
 ddtrace/contrib/internal/openai_agents                        @DataDog/ml-observability
 ddtrace/contrib/internal/litellm                              @DataDog/ml-observability
 ddtrace/contrib/internal/pydantic_ai                          @DataDog/ml-observability
+ddtrace/contrib/internal/ray                                  @DataDog/ml-observability
 ddtrace/contrib/internal/mcp                                  @DataDog/ml-observability
 tests/llmobs                                                  @DataDog/ml-observability
 tests/contrib/openai                                          @DataDog/ml-observability
@@ -172,6 +170,7 @@ tests/contrib/crewai                                          @DataDog/ml-observ
 tests/contrib/openai_agents                                   @DataDog/ml-observability
 tests/contrib/litellm                                         @DataDog/ml-observability
 tests/contrib/pydantic_ai                                     @DataDog/ml-observability
+tests/contrib/ray                                             @DataDog/ml-observability
 tests/contrib/mcp                                             @DataDog/ml-observability
 .gitlab/tests/llmobs.yml                                      @DataDog/ml-observability
 # MLObs snapshot tests
@@ -198,13 +197,11 @@ ddtrace/opentelemetry/                             @DataDog/apm-sdk-api-python
 ddtrace/internal/opentelemetry                     @DataDog/apm-sdk-api-python
 ddtrace/opentracer/                                @DataDog/apm-sdk-api-python
 ddtrace/propagation/                               @DataDog/apm-sdk-api-python
-ddtrace/filters.py                                 @DataDog/apm-sdk-api-python
-ddtrace/provider.py                                @DataDog/apm-sdk-api-python
-ddtrace/pin.py                                     @DataDog/apm-sdk-api-python
-ddtrace/sampler.py                                 @DataDog/apm-sdk-api-python
-ddtrace/sampling_rule.py                           @DataDog/apm-sdk-api-python
+
 ddtrace/internal/sampling.py                       @DataDog/apm-sdk-api-python
 ddtrace/internal/tracemethods.py                   @DataDog/apm-sdk-api-python
+ddtrace/internal/metrics.py                        @DataDog/apm-sdk-api-python
+ddtrace/internal/rate_limiter.py                   @DataDog/apm-sdk-api-python
 ddtrace/runtime/                                   @DataDog/apm-sdk-api-python
 ddtrace/internal/runtime/                          @DataDog/apm-sdk-api-python
 ddtrace/settings/_otel_remapper.py                 @DataDog/apm-sdk-api-python

.github/chainguard/self.backport.create-pr.sts.yaml

@@ -0,0 +1,14 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-py:pull_request
+
+claim_pattern:
+  event_name: pull_request_target
+  ref: refs/heads/main
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/backport\.yml@refs/heads/main
+
+permissions:
+  contents: write
+  pull_requests: write
+

.github/chainguard/self.generate-package-versions.create-pr.sts.yaml

@@ -0,0 +1,14 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-py:ref:refs/heads/main
+
+claim_pattern:
+  event_name: (workflow_dispatch|schedule)
+  ref: refs/heads/main
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/generate-package-versions\.yml@refs/heads/main
+
+permissions:
+  contents: write
+  pull_requests: write
+

.github/chainguard/self.generate-supported-versions.create-pr.sts.yaml

@@ -0,0 +1,13 @@
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/dd-trace-py:ref:refs/heads/main
+
+claim_pattern:
+  event_name: workflow_dispatch
+  ref: refs/heads/main
+  ref_protected: "true"
+  job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/generate-supported-versions\.yml@refs/heads/main
+
+permissions:
+  contents: write
+  pull_requests: write 

.github/workflows/backport.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      pull-requests: write
+      id-token: write
     # Only react to merged PRs for security reasons.
     # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
     if: >
@@ -24,9 +24,15 @@ jobs:
         )
       )
     steps:
+      - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
+        id: octo-sts
+        with:
+          scope: DataDog/dd-trace-py
+          policy: self.backport.create-pr
+
       - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ steps.octo-sts.outputs.token }}
           body_template: "Backport <%= mergeCommitSha %> from #<%= number %> to <%= base %>.\n\n<%= body %>"
           label_pattern: "^backport (?<base>([0-9]+\\.[0-9]+))$"
           # Include the original labels from the merged PR (minus any matching label_pattern)

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

@@ -12,7 +12,7 @@ jobs:
     permissions:
       actions: read
       contents: write
-      pull-requests: write
+      id-token: write
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -95,11 +95,17 @@ jobs:
           NEW_LATEST=$(python scripts/get_latest_version.py ${{ env.VENV_NAME }})
           echo "NEW_LATEST=$NEW_LATEST" >> $GITHUB_ENV
 
+      - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
+        id: octo-sts
+        with:
+          scope: DataDog/dd-trace-py
+          policy: self.generate-package-versions.create-pr
+
       - name: Create Pull Request
         id: pr
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ steps.octo-sts.outputs.token }}
           branch: "upgrade-latest-${{ env.VENV_NAME }}-version"
           commit-message: "Update package version"
           delete-branch: true

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

@@ -10,7 +10,7 @@ jobs:
     permissions:
       actions: read
       contents: write
-      pull-requests: write
+      id-token: write
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -77,11 +77,17 @@ jobs:
 
       - run: git diff
 
+      - uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
+        id: octo-sts
+        with:
+          scope: DataDog/dd-trace-py
+          policy: self.generate-supported-versions.create-pr
+
       - name: Create Pull Request
         id: pr
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ steps.octo-sts.outputs.token }}
           branch: "update-supported-versions"
           commit-message: "Update supported versions table"
           delete-branch: true

.github/workflows/requirements-locks.yml

@@ -11,7 +11,9 @@ jobs:
   validate:
     name: Check requirements lockfiles
     runs-on: ubuntu-latest
-    container: ghcr.io/datadog/dd-trace-py/testrunner:bca6869fffd715ea9a731f7b606807fa1b75cb71@sha256:9e3f53fa98ffc4b838b959d74d969aa2c384c4cbee7a3047a03d501be5f58760
+    container:
+      image: ghcr.io/datadog/dd-trace-py/testrunner:ae4c189ebf8e539f39905f21c7918cc19de69d13@sha256:9476c426c677d39a58c170ed3167e4d630ed4f067a8a2be2fb96d843795d2ac2
+      options: "--user 0"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:

.github/workflows/system-tests.yml

@@ -42,7 +42,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '5b6c0261d7b1cb178dcbb0688636f975e494e8db'
+          ref: '91b8489594010d8f4647d37380c44d448849cdc7'
 
       - name: Checkout dd-trace-py
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -96,7 +96,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '5b6c0261d7b1cb178dcbb0688636f975e494e8db'
+          ref: '91b8489594010d8f4647d37380c44d448849cdc7'
 
       - name: Build runner
         uses: ./.github/actions/install_runner
@@ -277,7 +277,7 @@ jobs:
           persist-credentials: false
           repository: 'DataDog/system-tests'
           # Automatically managed, use scripts/update-system-tests-version to update
-          ref: '5b6c0261d7b1cb178dcbb0688636f975e494e8db'
+          ref: '91b8489594010d8f4647d37380c44d448849cdc7'
       - name: Checkout dd-trace-py
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with: