Skip to content

Commit ee2ecfc

Browse files
committed
Merge main@origin into HEAD
2 parents 0370f44 + d86c66f commit ee2ecfc

File tree

232 files changed

+5560
-2982
lines changed

Some content is hidden

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

232 files changed

+5560
-2982
lines changed

.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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
48+
ref: '279a4f17c9392157cdc106e627c2b57c2233899b'
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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
93+
ref: '279a4f17c9392157cdc106e627c2b57c2233899b'
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: '58dc99266c404d0e04868a5817c61fad360cc4cb'
278+
ref: '279a4f17c9392157cdc106e627c2b57c2233899b'
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: "58dc99266c404d0e04868a5817c61fad360cc4cb"
17+
SYSTEM_TESTS_REF: "279a4f17c9392157cdc106e627c2b57c2233899b"
1818

1919
default:
2020
interruptible: true

.gitlab/benchmarks/serverless.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ benchmark-serverless:
66
trigger:
77
project: DataDog/serverless-tools
88
strategy: depend
9-
needs: []
9+
needs:
10+
- job: publish-wheels-to-s3
1011
rules:
1112
- if: $RELEASE_ALLOW_BENCHMARK_FAILURES == "true"
1213
allow_failure: true

.gitlab/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ publish-wheels-to-s3:
130130
generate_index_html() {
131131
local outfile="$1"
132132
{
133-
echo "<html><body>"
133+
echo "<!DOCTYPE html><html lang=\"en\"><body>"
134134
for w in "${WHEELS[@]}"; do
135135
fname="$(basename "$w")"
136136
enc_fname="${fname//+/%2B}"

.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/1021fa1.txt

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

.riot/requirements/1ee2a7f.txt renamed to .riot/requirements/108bb1d.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.8
33
# by the following command:
44
#
5-
# pip-compile --allow-unsafe --no-annotate --resolver=backtracking .riot/requirements/1ee2a7f.in
5+
# pip-compile --allow-unsafe --no-annotate .riot/requirements/108bb1d.in
66
#
77
attrs==25.3.0
88
coverage[toml]==7.6.1
@@ -11,7 +11,6 @@ gunicorn==23.0.0
1111
hypothesis==6.45.0
1212
importlib-metadata==8.5.0
1313
iniconfig==2.1.0
14-
lz4==4.3.3
1514
mock==5.2.0
1615
opentracing==2.4.0
1716
packaging==25.0
@@ -25,7 +24,8 @@ pytest-cov==5.0.0
2524
pytest-mock==3.14.1
2625
pytest-randomly==3.15.0
2726
sortedcontainers==2.4.0
28-
tomli==2.2.1
27+
tomli==2.3.0
2928
typing-extensions==4.13.2
30-
uwsgi==2.0.30
29+
uwsgi==2.0.31
3130
zipp==3.20.2
31+
zstandard==0.23.0

.riot/requirements/10ba61c.txt

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

0 commit comments

Comments
 (0)