Skip to content

Commit ac3a7ba

Browse files
authored
Merge branch '4.0-breaking-changes' into taegyunkim/remove-stack-v2-enabled
2 parents 5c2c826 + 4f39174 commit ac3a7ba

File tree

265 files changed

+5887
-5791
lines changed

Some content is hidden

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

265 files changed

+5887
-5791
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ tests/appsec/ @DataDog/asm-python
126126
tests/contrib/subprocess @DataDog/asm-python
127127
tests/snapshots/tests*appsec*.json @DataDog/asm-python
128128
tests/contrib/*/test*appsec*.py @DataDog/asm-python
129+
tests/contrib/*/test*iast*.py @DataDog/asm-python
129130
scripts/iast/* @DataDog/asm-python
130131

131132
# Profiling

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
with:
5050
python-version: "3.13"
5151

52+
- name: Setup Python 3.14
53+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
54+
with:
55+
python-version: "3.14"
56+
5257
- name: Set up QEMU
5358
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
5459

@@ -82,6 +87,8 @@ jobs:
8287
pip install riot==0.20.1
8388
pip install PyYAML
8489
pip install ddtrace
90+
# Install latest pip-tools from main branch for Python 3.14 compatibility
91+
pip install --upgrade git+https://github.com/jazzband/pip-tools.git@934b46a8795554f994b984ac743957f8458a29d6
8592
8693
- name: Run regenerate-riot-latest
8794
run: scripts/regenerate-riot-latest.sh

.github/workflows/profiling-native.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
matrix:
2222
os: [ubuntu-24.04]
2323
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
24+
memcpy-mode: ["default", "fast"]
2425
sanitizer: ["safety", "thread", "valgrind"]
2526

2627
steps:
@@ -49,4 +50,10 @@ jobs:
4950
# DEV: We currently have tests in dd_wrapper and stack_v2, setting
5051
# stack_v2 here will also run tests in dd_wrapper. Revisit this when
5152
# that changes.
53+
if [ "${{matrix.memcpy-mode}}" == "fast" ]; then
54+
export ECHION_USE_FAST_COPY_MEMORY=1
55+
else
56+
export ECHION_USE_FAST_COPY_MEMORY=0
57+
fi
58+
5259
./ddtrace/internal/datadog/profiling/build_standalone.sh --${{matrix.sanitizer}} RelWithDebInfo stack_v2_test

.github/workflows/requirements-locks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
run: pyenv global 3.10 3.8 3.9 3.11 3.12 3.13 3.14
2929

3030
- name: Install Dependencies
31-
run: pip install --upgrade pip && pip install riot==0.20.1 && pip install toml==0.10.2
31+
# Keep pip at <25.3 until https://github.com/jazzband/pip-tools/issues/2252 is resolved
32+
run: pip install --upgrade "pip<25.3" && pip install riot==0.20.1 && pip install toml==0.10.2
3233

3334
- name: Generate riot locks
3435
run: scripts/compile-and-prune-test-requirements

.github/workflows/system-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
persist-credentials: false
4646
repository: 'DataDog/system-tests'
4747
# Automatically managed, use scripts/update-system-tests-version to update
48-
ref: '173e1e83468e28274bc4631f1ee2afc4c2620c4e'
48+
ref: 'f980721788378102f7ae7caef156a53b20feb093'
4949

5050
- name: Download wheels to binaries directory
5151
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -90,7 +90,7 @@ jobs:
9090
persist-credentials: false
9191
repository: 'DataDog/system-tests'
9292
# Automatically managed, use scripts/update-system-tests-version to update
93-
ref: '173e1e83468e28274bc4631f1ee2afc4c2620c4e'
93+
ref: 'f980721788378102f7ae7caef156a53b20feb093'
9494

9595
- name: Build runner
9696
uses: ./.github/actions/install_runner
@@ -275,7 +275,7 @@ jobs:
275275
persist-credentials: false
276276
repository: 'DataDog/system-tests'
277277
# Automatically managed, use scripts/update-system-tests-version to update
278-
ref: '173e1e83468e28274bc4631f1ee2afc4c2620c4e'
278+
ref: 'f980721788378102f7ae7caef156a53b20feb093'
279279
- name: Download wheels to binaries directory
280280
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
281281
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: "173e1e83468e28274bc4631f1ee2afc4c2620c4e"
17+
SYSTEM_TESTS_REF: "f980721788378102f7ae7caef156a53b20feb093"
1818

1919
default:
2020
interruptible: true

.gitlab/package.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ publish-wheels-to-s3:
8585
tags: ["arch:amd64"]
8686
image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
8787
stage: package
88-
rules:
89-
- when: always
9088
needs:
9189
- job: download_ddtrace_artifacts
9290
artifacts: true

.readthedocs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ build:
77
commands:
88
- cargo install --force --root /home/docs/.asdf --git https://github.com/DataDog/libdatadog --bin dedup_headers tools
99
- git fetch --unshallow || true
10-
- curl -L https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-x86_64-unknown-linux-gnu.tar.gz | tar zx
11-
- install -t $HOME/.asdf/bin hatch
12-
- hatch -q
13-
- hatch -v run docs:sphinx-build -W -b html docs docs/_build/html
10+
- pip install riot
11+
- riot -v run --pass-env build_docs
1412
- mv docs/_build $READTHEDOCS_OUTPUT

.riot/requirements/10ba61c.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

.riot/requirements/8d9a826.txt renamed to .riot/requirements/10ded6c.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate .riot/requirements/8d9a826.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/10ded6c.in
66
#
7-
attrs==25.3.0
8-
coverage[toml]==7.8.2
7+
attrs==25.4.0
8+
coverage[toml]==7.11.0
99
exceptiongroup==1.3.0
10-
gevent==25.5.1
11-
greenlet==3.2.2
10+
gevent==25.9.1
11+
greenlet==3.2.4
1212
gunicorn[gevent]==23.0.0
1313
hypothesis==6.45.0
14-
iniconfig==2.1.0
15-
lz4==4.4.4
14+
iniconfig==2.3.0
1615
mock==5.2.0
1716
opentracing==2.4.0
1817
packaging==25.0
1918
pluggy==1.6.0
2019
py-cpuinfo==8.0.0
21-
pygments==2.19.1
22-
pytest==8.4.0
20+
pygments==2.19.2
21+
pytest==8.4.2
2322
pytest-asyncio==0.21.1
24-
pytest-benchmark==5.1.0
25-
pytest-cov==6.1.1
26-
pytest-mock==3.14.1
27-
pytest-randomly==3.16.0
23+
pytest-benchmark==5.2.1
24+
pytest-cov==7.0.0
25+
pytest-mock==3.15.1
26+
pytest-randomly==4.0.1
2827
sortedcontainers==2.4.0
29-
tomli==2.2.1
30-
typing-extensions==4.14.0
31-
uwsgi==2.0.30
32-
zope-event==5.0
33-
zope-interface==7.2
28+
tomli==2.3.0
29+
typing-extensions==4.15.0
30+
uwsgi==2.0.31
31+
zope-event==6.0
32+
zope-interface==8.0.1
33+
zstandard==0.25.0
3434

3535
# The following packages are considered to be unsafe in a requirements file:
3636
setuptools==80.9.0

0 commit comments

Comments
 (0)