Skip to content

Commit 3e89a79

Browse files
rachelyangdograchelyangdog
authored
Merge branch 'main' into rachel.yang/cursor-rules
2 parents 8c34ade + c32754d commit 3e89a79

File tree

93 files changed

+2816
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2816
-963
lines changed

‎.coveragerc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ disable_warnings = couldnt-parse
88
[paths]
99
source =
1010
./
11-
/home/circleci/project/
1211
/root/project/
12+
/home/bits/project

‎.github/CODEOWNERS

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ riotfile.py @DataDog/apm-python
2121
.riot/requirements/ @DataDog/apm-python
2222
CHANGELOG.md @DataDog/apm-python
2323
README.md @DataDog/apm-python
24+
ddtrace/internal/telemetry/ @DataDog/apm-python
2425
tests/telemetry @DataDog/apm-python
2526

2627
# Guild
@@ -53,12 +54,11 @@ tests/opentracer @DataDog/apm-core-python
5354
tests/tracer @DataDog/apm-core-python
5455

5556
# Test Visibility and related
56-
ddtrace/contrib/asynctest @DataDog/ci-app-libraries
57-
ddtrace/contrib/coverage @DataDog/ci-app-libraries
58-
ddtrace/contrib/pytest @DataDog/ci-app-libraries
59-
ddtrace/contrib/pytest_bdd @DataDog/ci-app-libraries
60-
ddtrace/contrib/pytest_benchmark @DataDog/ci-app-libraries
61-
ddtrace/contrib/unittest @DataDog/ci-app-libraries
57+
ddtrace/contrib/internal/coverage @DataDog/ci-app-libraries
58+
ddtrace/contrib/internal/pytest @DataDog/ci-app-libraries
59+
ddtrace/contrib/internal/pytest_bdd @DataDog/ci-app-libraries
60+
ddtrace/contrib/internal/pytest_benchmark @DataDog/ci-app-libraries
61+
ddtrace/contrib/internal/unittest @DataDog/ci-app-libraries
6262
ddtrace/contrib/internal/pytest @DataDog/ci-app-libraries
6363
ddtrace/contrib/internal/pytest_bdd @DataDog/ci-app-libraries
6464
ddtrace/contrib/internal/pytest_benchmark @DataDog/ci-app-libraries
@@ -84,11 +84,9 @@ tests/tracer/test_ci.py @DataDog/ci-app-libraries
8484
ddtrace/ext/git.py @DataDog/ci-app-libraries @DataDog/apm-core-python
8585
scripts/ci_visibility/* @DataDog/ci-app-libraries
8686
# Test Visibility owns the freezegun integration because it's the team most affected by it
87-
ddtrace/contrib/freezegun @DataDog/ci-app-libraries
8887
ddtrace/contrib/internal/freezegun @DataDog/ci-app-libraries
8988
tests/contrib/freezegun @DataDog/ci-app-libraries
9089
# Test Visibility: Selenium integration
91-
ddtrace/contrib/selenium @DataDog/ci-app-libraries
9290
ddtrace/internal/selenium @DataDog/ci-app-libraries
9391
tests/contrib/selenium @DataDog/ci-app-libraries
9492
tests/snapshots/test_selenium_* @DataDog/ci-app-libraries
@@ -115,11 +113,10 @@ benchmarks/bm/iast_fixtures* @DataDog/asm-python
115113
benchmarks/base/aspects_benchmarks_generate.py @DataDog/asm-python
116114
ddtrace/appsec/ @DataDog/asm-python
117115
ddtrace/settings/asm.py @DataDog/asm-python
118-
ddtrace/contrib/subprocess/ @DataDog/asm-python
119116
ddtrace/contrib/internal/subprocess/ @DataDog/asm-python
120-
ddtrace/contrib/flask_login/ @DataDog/asm-python
121-
ddtrace/contrib/webbrowser @DataDog/asm-python
122-
ddtrace/contrib/urllib @DataDog/asm-python
117+
ddtrace/contrib/internal/flask_login/ @DataDog/asm-python
118+
ddtrace/contrib/internal/webbrowser @DataDog/asm-python
119+
ddtrace/contrib/internal/urllib @DataDog/asm-python
123120
ddtrace/internal/_exceptions.py @DataDog/asm-python
124121
ddtrace/internal/appsec/ @DataDog/asm-python
125122
ddtrace/internal/iast/ @DataDog/asm-python
@@ -200,13 +197,11 @@ ddtrace/opentelemetry/ @DataDog/apm-sdk-api-python
200197
ddtrace/internal/opentelemetry @DataDog/apm-sdk-api-python
201198
ddtrace/opentracer/ @DataDog/apm-sdk-api-python
202199
ddtrace/propagation/ @DataDog/apm-sdk-api-python
203-
ddtrace/filters.py @DataDog/apm-sdk-api-python
204-
ddtrace/provider.py @DataDog/apm-sdk-api-python
205-
ddtrace/pin.py @DataDog/apm-sdk-api-python
206-
ddtrace/sampler.py @DataDog/apm-sdk-api-python
207-
ddtrace/sampling_rule.py @DataDog/apm-sdk-api-python
200+
208201
ddtrace/internal/sampling.py @DataDog/apm-sdk-api-python
209202
ddtrace/internal/tracemethods.py @DataDog/apm-sdk-api-python
203+
ddtrace/internal/metrics.py @DataDog/apm-sdk-api-python
204+
ddtrace/internal/rate_limiter.py @DataDog/apm-sdk-api-python
210205
ddtrace/runtime/ @DataDog/apm-sdk-api-python
211206
ddtrace/internal/runtime/ @DataDog/apm-sdk-api-python
212207
ddtrace/settings/_otel_remapper.py @DataDog/apm-sdk-api-python

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject: repo:DataDog/dd-trace-py:pull_request
4+
5+
claim_pattern:
6+
event_name: pull_request_target
7+
ref: refs/heads/main
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/backport\.yml@refs/heads/main
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write
14+

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject: repo:DataDog/dd-trace-py:ref:refs/heads/main
4+
5+
claim_pattern:
6+
event_name: (workflow_dispatch|schedule)
7+
ref: refs/heads/main
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/generate-package-versions\.yml@refs/heads/main
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write
14+

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject: repo:DataDog/dd-trace-py:ref:refs/heads/main
4+
5+
claim_pattern:
6+
event_name: workflow_dispatch
7+
ref: refs/heads/main
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-py/\.github/workflows/generate-supported-versions\.yml@refs/heads/main
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write

‎.github/workflows/backport.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
permissions:
1313
contents: write
14-
pull-requests: write
14+
id-token: write
1515
# Only react to merged PRs for security reasons.
1616
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
1717
if: >
@@ -24,9 +24,15 @@ jobs:
2424
)
2525
)
2626
steps:
27+
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
28+
id: octo-sts
29+
with:
30+
scope: DataDog/dd-trace-py
31+
policy: self.backport.create-pr
32+
2733
- uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
2834
with:
29-
github_token: ${{ secrets.GITHUB_TOKEN }}
35+
github_token: ${{ steps.octo-sts.outputs.token }}
3036
body_template: "Backport <%= mergeCommitSha %> from #<%= number %> to <%= base %>.\n\n<%= body %>"
3137
label_pattern: "^backport (?<base>([0-9]+\\.[0-9]+))$"
3238
# Include the original labels from the merged PR (minus any matching label_pattern)

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
actions: read
1414
contents: write
15-
pull-requests: write
15+
id-token: write
1616

1717
steps:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -95,11 +95,17 @@ jobs:
9595
NEW_LATEST=$(python scripts/get_latest_version.py ${{ env.VENV_NAME }})
9696
echo "NEW_LATEST=$NEW_LATEST" >> $GITHUB_ENV
9797
98+
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
99+
id: octo-sts
100+
with:
101+
scope: DataDog/dd-trace-py
102+
policy: self.generate-package-versions.create-pr
103+
98104
- name: Create Pull Request
99105
id: pr
100106
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
101107
with:
102-
token: ${{ secrets.GITHUB_TOKEN }}
108+
token: ${{ steps.octo-sts.outputs.token }}
103109
branch: "upgrade-latest-${{ env.VENV_NAME }}-version"
104110
commit-message: "Update package version"
105111
delete-branch: true

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
actions: read
1212
contents: write
13-
pull-requests: write
13+
id-token: write
1414

1515
steps:
1616
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -77,11 +77,17 @@ jobs:
7777

7878
- run: git diff
7979

80+
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
81+
id: octo-sts
82+
with:
83+
scope: DataDog/dd-trace-py
84+
policy: self.generate-supported-versions.create-pr
85+
8086
- name: Create Pull Request
8187
id: pr
8288
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
8389
with:
84-
token: ${{ secrets.GITHUB_TOKEN }}
90+
token: ${{ steps.octo-sts.outputs.token }}
8591
branch: "update-supported-versions"
8692
commit-message: "Update supported versions table"
8793
delete-branch: true

‎.github/workflows/requirements-locks.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ jobs:
1111
validate:
1212
name: Check requirements lockfiles
1313
runs-on: ubuntu-latest
14-
container: ghcr.io/datadog/dd-trace-py/testrunner:bca6869fffd715ea9a731f7b606807fa1b75cb71@sha256:9e3f53fa98ffc4b838b959d74d969aa2c384c4cbee7a3047a03d501be5f58760
14+
container:
15+
image: ghcr.io/datadog/dd-trace-py/testrunner:ae4c189ebf8e539f39905f21c7918cc19de69d13@sha256:9476c426c677d39a58c170ed3167e4d630ed4f067a8a2be2fb96d843795d2ac2
16+
options: "--user 0"
1517
steps:
1618
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1719
with:

‎.github/workflows/system-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
persist-credentials: false
4343
repository: 'DataDog/system-tests'
4444
# Automatically managed, use scripts/update-system-tests-version to update
45-
ref: '5e959ecd8479ae77bbf9888304a0bdc3eeaaef7e'
45+
ref: '91b8489594010d8f4647d37380c44d448849cdc7'
4646

4747
- name: Checkout dd-trace-py
4848
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -96,7 +96,7 @@ jobs:
9696
persist-credentials: false
9797
repository: 'DataDog/system-tests'
9898
# Automatically managed, use scripts/update-system-tests-version to update
99-
ref: '5e959ecd8479ae77bbf9888304a0bdc3eeaaef7e'
99+
ref: '91b8489594010d8f4647d37380c44d448849cdc7'
100100

101101
- name: Build runner
102102
uses: ./.github/actions/install_runner
@@ -277,7 +277,7 @@ jobs:
277277
persist-credentials: false
278278
repository: 'DataDog/system-tests'
279279
# Automatically managed, use scripts/update-system-tests-version to update
280-
ref: '5e959ecd8479ae77bbf9888304a0bdc3eeaaef7e'
280+
ref: '91b8489594010d8f4647d37380c44d448849cdc7'
281281
- name: Checkout dd-trace-py
282282
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
283283
with:

0 commit comments

Comments
 (0)