Skip to content

Commit 0838971

Browse files
authored
Merge branch 'main' into taegyunkim/consolidate-gevent-task-metadata
2 parents 27ca66b + 10eaf32 commit 0838971

File tree

75 files changed

+2883
-433
lines changed

Some content is hidden

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

75 files changed

+2883
-433
lines changed

.cursor/rules/appsec.mdc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Automatic discovery and cataloging of your APIs:
292292
| `DD_API_SECURITY_PARSE_RESPONSE_BODY` | `true` | Capture response body schemas |
293293
| `DD_API_SECURITY_ENDPOINT_COLLECTION_ENABLED` | `true` | Enable endpoint collection |
294294
| `DD_API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT` | `5000` | Max endpoints to track |
295-
| `DD_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE` | `0.5` | Rate for downstream request analysis |
295+
| `DD_API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE` | `0.5` | Rate for downstream request analysis |
296296
| `DD_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS` | `1` | Max downstream requests analyzed per request |
297297

298298
### FastAPI Example

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ tests/openfeature/ @DataDog/feature-flagging-and-experime
224224
# API SDK
225225
ddtrace/trace/ @DataDog/apm-sdk-capabilities-python
226226
ddtrace/_trace/ @DataDog/apm-sdk-capabilities-python
227+
ddtrace/_trace/span.py @DataDog/apm-sdk-capabilities-python @DataDog/apm-core-python
227228
# File commonly updated for integrations, widen ownership to help with PR review
228229
ddtrace/_trace/trace_handlers.py @DataDog/apm-sdk-capabilities-python @DataDog/apm-core-python @DataDog/apm-idm-python
229230
ddtrace/opentelemetry/ @DataDog/apm-sdk-capabilities-python
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: 'Setup CI Dependencies'
2+
description: 'Install locked CI dependencies with caching'
3+
inputs:
4+
python-version:
5+
description: 'Python version (optional, uses current if not specified)'
6+
required: false
7+
default: ''
8+
outputs:
9+
cache-hit:
10+
description: 'Whether the cache was hit'
11+
value: ${{ steps.cache.outputs.cache-hit }}
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Setup Python (if version specified)
16+
if: inputs.python-version != ''
17+
uses: actions/setup-python@v5
18+
with:
19+
python-version: ${{ inputs.python-version }}
20+
21+
- name: Get pip cache directory
22+
id: pip-cache
23+
shell: bash
24+
run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
25+
26+
- name: Cache pip dependencies
27+
id: cache
28+
uses: actions/cache@v4
29+
with:
30+
path: ${{ steps.pip-cache.outputs.dir }}
31+
key: ${{ runner.os }}-pip-${{ hashFiles('ci/requirements/ci.txt') }}
32+
restore-keys: |
33+
${{ runner.os }}-pip-
34+
35+
- name: Install CI dependencies
36+
shell: bash
37+
run: pip install -r ci/requirements/ci.txt

.github/workflows/build_python_3.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ jobs:
2222
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
persist-credentials: false
25-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
25+
- uses: ./.github/actions/setup-ci-deps
2626
with:
2727
python-version: "3.13"
28-
- run: pip install cibuildwheel==3.1.4
2928
- id: set-matrix
3029
env:
3130
CIBW_BUILD: ${{ inputs.cibw_build }}

.github/workflows/changelog.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ jobs:
2828
if: github.event_name == 'pull_request'
2929
run: scripts/check-releasenotes
3030

31-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
32-
name: Install Python
31+
- uses: ./.github/actions/setup-ci-deps
3332
with:
3433
python-version: '3.13'
3534

36-
- name: Install Dependencies
37-
run: pip install reno docutils
38-
3935
- name: Lint changelog notes
4036
run: reno lint
4137

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,7 @@ jobs:
6969
sudo apt-get update
7070
sudo apt-get install -y libmariadb-dev
7171
72-
- name: Install Python dependencies
73-
run: |
74-
python -m pip install --upgrade "pip<25.3"
75-
pip install packaging
76-
pip install requests
77-
pip install pip-tools==7.5.2
78-
pip install riot==0.20.1
79-
pip install hatch==1.14.2
80-
pip install PyYAML
81-
pip install ddtrace
72+
- uses: ./.github/actions/setup-ci-deps
8273

8374
- name: Run regenerate-riot-latest
8475
run: scripts/regenerate-riot-latest.sh

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,7 @@ jobs:
5353
sudo apt-get update
5454
sudo apt-get install -y libmariadb-dev
5555
56-
- name: Install Python dependencies
57-
run: |
58-
python -m pip install --upgrade pip
59-
pip install packaging
60-
pip install requests
61-
pip install riot==0.20.1
62-
pip install wrapt==1.16.0
56+
- uses: ./.github/actions/setup-ci-deps
6357

6458
- name: Install ddtrace
6559
run: |

.github/workflows/pytorch_gpu_tests.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,13 @@ jobs:
2525
persist-credentials: false
2626
fetch-depth: 0
2727

28-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
29-
name: Install Python
28+
- uses: ./.github/actions/setup-ci-deps
3029
with:
3130
python-version: '3.12'
3231

3332
- uses: actions-rust-lang/setup-rust-toolchain@1780873c7b576612439a134613cc4cc74ce5538c # v1.15.2
3433
- name: Install latest stable toolchain and rustfmt
3534
run: rustup update stable && rustup default stable && rustup component add rustfmt clippy
3635

37-
- name: Install hatch
38-
run: pip install hatch==1.12.0
39-
40-
- name: Install PyTorch
41-
run: pip install torch
42-
4336
- name: Run tests
4437
run: hatch run profiling_pytorch:test

.github/workflows/report-skipped-flaky.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,10 @@ jobs:
2424
with:
2525
ref: ${{ inputs.branch }}
2626

27-
- name: Set up Python
28-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
27+
- uses: ./.github/actions/setup-ci-deps
2928
with:
3029
python-version: '3.11'
3130

32-
- name: Install codeowners
33-
run: |
34-
pip install codeowners
35-
3631
- name: Run flaky tests report script
3732
run: python scripts/report_skipped_flaky.py
3833

.github/workflows/system-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
persist-credentials: false
8181
repository: 'DataDog/system-tests'
8282
# Automatically managed, use scripts/update-system-tests-version to update
83-
ref: '7e245eb5813f8dde45f9f25a708739ab5209ffd3'
83+
ref: '0382c548169eae1b20cf218d9f29ba067ded8a39'
8484

8585
- name: Download wheels to binaries directory
8686
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
@@ -133,7 +133,7 @@ jobs:
133133
persist-credentials: false
134134
repository: 'DataDog/system-tests'
135135
# Automatically managed, use scripts/update-system-tests-version to update
136-
ref: '7e245eb5813f8dde45f9f25a708739ab5209ffd3'
136+
ref: '0382c548169eae1b20cf218d9f29ba067ded8a39'
137137

138138
- name: Build runner
139139
uses: ./.github/actions/install_runner
@@ -338,7 +338,7 @@ jobs:
338338
persist-credentials: false
339339
repository: 'DataDog/system-tests'
340340
# Automatically managed, use scripts/update-system-tests-version to update
341-
ref: '7e245eb5813f8dde45f9f25a708739ab5209ffd3'
341+
ref: '0382c548169eae1b20cf218d9f29ba067ded8a39'
342342
- name: Download wheels to binaries directory
343343
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
344344
with:

0 commit comments

Comments
 (0)