Skip to content

Commit fd4e683

Browse files
fix(AAP): reverting usage of json helper function from libddwaf [backport 3.16]
1 parent cbc429c commit fd4e683

File tree

289 files changed

+20887
-2629
lines changed

Some content is hidden

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

289 files changed

+20887
-2629
lines changed

.github/CODEOWNERS

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ ddtrace/opentelemetry/ @DataDog/apm-sdk-capabilities
204204
ddtrace/internal/opentelemetry @DataDog/apm-sdk-capabilities-python
205205
ddtrace/opentracer/ @DataDog/apm-sdk-capabilities-python
206206
ddtrace/propagation/ @DataDog/apm-sdk-capabilities-python
207+
ddtrace/settings/_opentelemetry.py @DataDog/apm-sdk-capabilities-python
207208

208209
ddtrace/internal/sampling.py @DataDog/apm-sdk-capabilities-python
209210
ddtrace/internal/tracemethods.py @DataDog/apm-sdk-capabilities-python
@@ -223,8 +224,26 @@ tests/tracer/ @DataDog/apm-sdk-capabilities
223224
tests/tracer/test_ci.py @DataDog/ci-app-libraries
224225

225226
# Serverless
226-
tests/internal/test_serverless.py @DataDog/apm-core-python @DataDog/apm-serverless
227-
tests/contrib/aws_lambda @DataDog/apm-serverless
227+
ddtrace/contrib/internal/aws_lambda @DataDog/apm-serverless
228+
ddtrace/contrib/internal/azure_eventhubs @DataDog/serverless @DataDog/apm-serverless
229+
ddtrace/contrib/internal/azure_functions @DataDog/serverless @DataDog/apm-serverless
230+
ddtrace/contrib/internal/azure_servicebus @DataDog/serverless @DataDog/apm-serverless
231+
ddtrace/ext/aws.py @DataDog/apm-serverless @DataDog/apm-idm-python
232+
ddtrace/ext/azure_eventhubs.py @DataDog/serverless @DataDog/apm-serverless
233+
ddtrace/ext/azure_servicebus.py @DataDog/serverless @DataDog/apm-serverless
234+
tests/contrib/aws_lambda @DataDog/apm-serverless
235+
tests/contrib/azure_eventhubs @DataDog/serverless @DataDog/apm-serverless
236+
tests/contrib/azure_functions @DataDog/serverless @DataDog/apm-serverless
237+
tests/contrib/azure_functions_eventhubs @DataDog/serverless @DataDog/apm-serverless
238+
tests/contrib/azure_functions_servicebus @DataDog/serverless @DataDog/apm-serverless
239+
tests/contrib/azure_servicebus @DataDog/serverless @DataDog/apm-serverless
240+
tests/internal/test_serverless.py @DataDog/apm-core-python @DataDog/apm-serverless
241+
tests/snapshots/tests.contrib.aws_lambda.*. @DataDog/apm-serverless
242+
tests/snapshots/tests.contrib.azure_eventhubs.* @DataDog/serverless @DataDog/apm-serverless
243+
tests/snapshots/tests.contrib.azure_functions.* @DataDog/serverless @DataDog/apm-serverless
244+
tests/snapshots/tests.contrib.azure_functions_eventhubs.* @DataDog/serverless @DataDog/apm-serverless
245+
tests/snapshots/tests.contrib.azure_functions_servicebus.* @DataDog/serverless @DataDog/apm-serverless
246+
tests/snapshots/tests.contrib.azure_servicebus.* @DataDog/serverless @DataDog/apm-serverless
228247

229248
# Data Streams Monitoring
230249
ddtrace/internal/datastreams @DataDog/data-streams-monitoring

.github/workflows/requirements-locks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Check requirements lockfiles
1313
runs-on: ubuntu-latest
1414
container:
15-
image: ghcr.io/datadog/dd-trace-py/testrunner:280be7679757b720503a284a69da36995b6ef48d@sha256:68865857c710d5703ddf9190ff33eb1ea47974e8332d04e2e115ef3b52513def
15+
image: ghcr.io/datadog/dd-trace-py/testrunner:adc7896c0901c0589e45776d9e409c3d1b15cd51@sha256:5fa1b0062e20c753cd5da590df3841b74b9ead5b4531a7ec9f5cacd2b95386e3
1616
options: "--user 0"
1717
steps:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -25,7 +25,7 @@ jobs:
2525
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2626

2727
- name: Set python interpreters
28-
run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13 3.14.0rc1
28+
run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13 3.14
2929

3030
- name: Install Dependencies
3131
run: pip install --upgrade pip && pip install riot==0.20.1 && pip install toml==0.10.2

.github/workflows/system-tests.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
TEST_LIBRARY: python
3636
WEBLOG_VARIANT: ${{ matrix.weblog-variant }}
3737
CMAKE_BUILD_PARALLEL_LEVEL: 12
38-
SYSTEM_TESTS_AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }}
39-
SYSTEM_TESTS_AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }}
4038
steps:
4139
- name: Install Dependencies
4240
run: sudo apt-get install -y patchelf
@@ -47,7 +45,7 @@ jobs:
4745
persist-credentials: false
4846
repository: 'DataDog/system-tests'
4947
# Automatically managed, use scripts/update-system-tests-version to update
50-
ref: '6be22a6418b86c3be4920790dfa121149aed2903'
48+
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
5149

5250
- name: Download wheels to binaries directory
5351
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -84,8 +82,6 @@ jobs:
8482
TEST_LIBRARY: python
8583
WEBLOG_VARIANT: ${{ matrix.weblog-variant }}
8684
CMAKE_BUILD_PARALLEL_LEVEL: 12
87-
SYSTEM_TESTS_AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }}
88-
SYSTEM_TESTS_AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }}
8985
steps:
9086

9187
- name: Checkout system tests
@@ -94,7 +90,7 @@ jobs:
9490
persist-credentials: false
9591
repository: 'DataDog/system-tests'
9692
# Automatically managed, use scripts/update-system-tests-version to update
97-
ref: '6be22a6418b86c3be4920790dfa121149aed2903'
93+
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
9894

9995
- name: Build runner
10096
uses: ./.github/actions/install_runner
@@ -279,7 +275,7 @@ jobs:
279275
persist-credentials: false
280276
repository: 'DataDog/system-tests'
281277
# Automatically managed, use scripts/update-system-tests-version to update
282-
ref: '6be22a6418b86c3be4920790dfa121149aed2903'
278+
ref: 'd5152ebefb021a4273f8d189d798c5e302986f7b'
283279
- name: Download wheels to binaries directory
284280
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
285281
with:

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variables:
1414
DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
1515
# CI_DEBUG_SERVICES: "true"
1616
# Automatically managed, use scripts/update-system-tests-version to update
17-
SYSTEM_TESTS_REF: "6be22a6418b86c3be4920790dfa121149aed2903"
17+
SYSTEM_TESTS_REF: "d5152ebefb021a4273f8d189d798c5e302986f7b"
1818

1919
default:
2020
interruptible: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ experiments:
10671067
- max_rss_usage < 34.00 MB
10681068
- name: span-start-finish-traceid128
10691069
thresholds:
1070-
- execution_time < 55.00 ms
1070+
- execution_time < 56.00 ms
10711071
- max_rss_usage < 34.00 MB
10721072
- name: span-start-traceid128
10731073
thresholds:

.gitlab/one-pipeline.locked.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/a0486057161f85a77e39ad2aa60ac66bb52414696d9b3dd87177df1057b11295/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/019c5ba11c2018bf17e06c74d6d8bc784f77bd7bf16d474d628609de91dbca29/one-pipeline.yml

.gitlab/services.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,13 @@
123123
alias: moto
124124
variables:
125125
MOTO_PORT: 3000
126-
azurite:
127-
name: registry.ddbuild.io/images/mirror/azure-storage/azurite:3.34.0
128-
alias: azurite
126+
azureeventhubsemulator:
127+
name: registry.ddbuild.io/images/mirror/azure-messaging/eventhubs-emulator:2.1.0
128+
alias: azureeventhubsemulator
129+
variables:
130+
ACCEPT_EULA: "Y"
131+
BLOB_SERVER: azurite
132+
METADATA_SERVER: azurite
129133
azureservicebusemulator:
130134
name: registry.ddbuild.io/images/mirror/azure-messaging/servicebus-emulator:1.1.2
131135
alias: azureservicebusemulator
@@ -139,3 +143,6 @@
139143
variables:
140144
ACCEPT_EULA: "Y"
141145
MSSQL_SA_PASSWORD: "Localtestpass1!"
146+
azurite:
147+
name: registry.ddbuild.io/images/mirror/azure-storage/azurite:3.34.0
148+
alias: azurite

.gitlab/templates/cached-testrunner.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
EXT_CACHE_VENV: '${{CI_PROJECT_DIR}}/.cache/ext_cache_venv${{PYTHON_VERSION}}'
66
before_script: |
77
ulimit -c unlimited
8-
pyenv global 3.12 3.8 3.9 3.10 3.11 3.13 3.14.0rc1
8+
pyenv global 3.12 3.8 3.9 3.10 3.11 3.13 3.14
99
export _CI_DD_AGENT_URL=http://${{HOST_IP}}:8126/
1010
set -e -o pipefail
1111
if [ ! -d $EXT_CACHE_VENV ]; then
@@ -24,12 +24,12 @@
2424
deactivate
2525
cache:
2626
# Share pip between jobs of the same Python version
27-
- key: v2-build_base_venvs-${{PYTHON_VERSION}}-cache-{current_month}
27+
- key: v4-build_base_venvs-${{PYTHON_VERSION}}-cache-{current_month}
2828
paths:
2929
- .cache
30-
- key: v2-build_base_venvs-${{PYTHON_VERSION}}-ext-{current_month}
30+
- key: v4-build_base_venvs-${{PYTHON_VERSION}}-ext-{current_month}
3131
paths:
3232
- .ext_cache
33-
- key: v2-build_base_venvs-${{PYTHON_VERSION}}-download-cache-{current_month}
33+
- key: v4-build_base_venvs-${{PYTHON_VERSION}}-download-cache-{current_month}
3434
paths:
3535
- .download_cache

.gitlab/testrunner.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
TESTRUNNER_IMAGE: registry.ddbuild.io/dd-trace-py:v73166438-4077fc2-testrunner-2025.08.08@sha256:456e32d2fdc19569fb34d705d1ccf193c179cc5364d1f93e60f825d189647c3d
2+
TESTRUNNER_IMAGE: registry.ddbuild.io/dd-trace-py:v78900213-daaf5b5-testrunner@sha256:bf80b40852537c0eca2d8ace5ffeffa7b916bc4c412bf4a3fce2f9f8d72e7a20
33

44
.testrunner:
55
image:
@@ -12,7 +12,7 @@ variables:
1212
before_script:
1313
- ulimit -c unlimited
1414
- git config --global --add safe.directory ${CI_PROJECT_DIR}
15-
- pyenv global 3.12 3.8 3.9 3.10 3.11 3.13 3.14.0rc1
15+
- pyenv global 3.12 3.8 3.9 3.10 3.11 3.13 3.14
1616
- export _CI_DD_AGENT_URL=http://${HOST_IP}:8126/
1717
retry: 2
1818
artifacts:

.riot/requirements/1991185.txt renamed to .riot/requirements/100a87a.txt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,65 +2,65 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/1991185.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/100a87a.in
66
#
7-
ag-ui-protocol==0.1.8
7+
ag-ui-protocol==0.1.9
88
aiohappyeyeballs==2.6.1
9-
aiohttp==3.12.15
9+
aiohttp==3.13.0
1010
aiosignal==1.4.0
1111
annotated-types==0.7.0
12-
anthropic==0.68.0
13-
anyio==4.10.0
12+
anthropic==0.69.0
13+
anyio==4.11.0
1414
argcomplete==3.6.2
1515
async-timeout==5.0.1
16-
attrs==25.3.0
16+
attrs==25.4.0
1717
backports-asyncio-runner==1.2.0
18-
boto3==1.40.33
19-
botocore==1.40.33
20-
cachetools==5.5.2
21-
certifi==2025.8.3
18+
boto3==1.40.48
19+
botocore==1.40.48
20+
cachetools==6.2.0
21+
certifi==2025.10.5
2222
charset-normalizer==3.4.3
2323
cohere==5.18.0
2424
colorama==0.4.6
25-
coverage[toml]==7.10.6
25+
coverage[toml]==7.10.7
2626
distro==1.9.0
2727
docstring-parser==0.17.0
2828
eval-type-backport==0.2.2
2929
exceptiongroup==1.3.0
3030
fastavro==1.12.0
3131
filelock==3.19.1
32-
frozenlist==1.7.0
32+
frozenlist==1.8.0
3333
fsspec==2025.9.0
34-
google-auth==2.40.3
35-
google-genai==1.38.0
34+
google-auth==2.41.1
35+
google-genai==1.42.0
3636
griffe==1.14.0
37-
groq==0.31.1
37+
groq==0.32.0
3838
h11==0.16.0
3939
hf-xet==1.1.10
4040
httpcore==1.0.9
4141
httpx==0.28.1
4242
httpx-sse==0.4.0
43-
huggingface-hub[inference]==0.35.0
43+
huggingface-hub[inference]==0.35.3
4444
hypothesis==6.45.0
4545
idna==3.10
4646
importlib-metadata==8.7.0
4747
iniconfig==2.1.0
4848
invoke==2.2.0
4949
jiter==0.11.0
5050
jmespath==1.0.1
51-
logfire-api==4.7.0
51+
logfire-api==4.12.0
5252
markdown-it-py==3.0.0
5353
mdurl==0.1.2
54-
mistralai==1.9.10
54+
mistralai==1.9.11
5555
mock==5.2.0
56-
multidict==6.6.4
57-
openai==1.108.0
56+
multidict==6.7.0
57+
openai==2.2.0
5858
opentelemetry-api==1.37.0
5959
opentracing==2.4.0
6060
packaging==25.0
6161
pluggy==1.6.0
6262
prompt-toolkit==3.0.52
63-
propcache==0.3.2
63+
propcache==0.4.1
6464
pyasn1==0.6.1
6565
pyasn1-modules==0.4.2
6666
pydantic==2.12.0a1
@@ -75,27 +75,27 @@ pytest-asyncio==1.2.0
7575
pytest-cov==7.0.0
7676
pytest-mock==3.15.1
7777
python-dateutil==2.9.0.post0
78-
pyyaml==6.0.2
78+
pyyaml==6.0.3
7979
requests==2.32.5
80-
rich==14.1.0
80+
rich==14.2.0
8181
rsa==4.9.1
8282
s3transfer==0.14.0
8383
six==1.17.0
8484
sniffio==1.3.1
8585
sortedcontainers==2.4.0
8686
starlette==0.48.0
8787
tenacity==9.1.2
88-
tokenizers==0.22.0
89-
tomli==2.2.1
88+
tokenizers==0.22.1
89+
tomli==2.3.0
9090
tqdm==4.67.1
9191
types-requests==2.31.0.6
9292
types-urllib3==1.26.25.14
9393
typing-extensions==4.15.0
94-
typing-inspection==0.4.1
94+
typing-inspection==0.4.2
9595
urllib3==1.26.20
9696
vcrpy==7.0.0
97-
wcwidth==0.2.13
97+
wcwidth==0.2.14
9898
websockets==15.0.1
9999
wrapt==1.17.3
100-
yarl==1.20.1
100+
yarl==1.22.0
101101
zipp==3.23.0

0 commit comments

Comments
 (0)