Skip to content

Commit e3e9365

Browse files
committed
Merge remote-tracking branch 'origin/master' into glopes/exec-solib
2 parents 60ac0f3 + 14dabf8 commit e3e9365

File tree

87 files changed

+1059
-650
lines changed

Some content is hidden

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

87 files changed

+1059
-650
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ updates:
99
directory: "/"
1010
schedule:
1111
interval: "monthly"
12+
cooldown:
13+
default-days: 2
1214
groups:
1315
gh-actions-packages:
1416
patterns:
15-
- "*"
17+
- "*"
18+

.github/workflows/auto_add_pr_to_miletone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818

1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222

23-
- uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
23+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
2424
with:
2525
dotnet-version: '7.0.101'
2626

.github/workflows/auto_check_snapshots.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616
with:
1717
fetch-depth: 0
1818

19-
- uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
19+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
2020
with:
2121
dotnet-version: '7.0.101'
2222

.github/workflows/auto_label_prs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818

19-
- uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
19+
- uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
2020
with:
2121
dotnet-version: '7.0.101'
2222

.github/workflows/prof_correctness.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
with:
2424
fetch-depth: 1
2525
submodules: true
2626

2727
- name: Setup PHP
28-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
28+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
2929
with:
3030
php-version: ${{ matrix.php-version }}
3131
coverage: none
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: true
3636

3737
- name: Restore build cache
38-
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
38+
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
3939
with:
4040
path: |
4141
~/.cargo/bin/
@@ -63,7 +63,7 @@ jobs:
6363
cargo rustc --features="trigger_time_sample" --profile profiler-release --crate-type=cdylib
6464
6565
- name: Cache build dependencies
66-
uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
66+
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
6767
with:
6868
path: |
6969
~/.cargo/bin/

.github/workflows/prune-stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write
1414
steps:
1515
- name: Prune
16-
uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
16+
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
1717
with:
1818
days-before-stale: 180
1919
stale-pr-message: 'This pull request has been marked as stale because it has not had activity in the past half year. It will be closed in 7 days if no further activity occurs. Feel free to reopen it if you are still working on it.'

.github/workflows/update_latest_versions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1919

20-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
20+
- uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
2121
id: octo-sts
2222
with:
2323
scope: DataDog/dd-trace-php
2424
policy: self.update-latest-versions.create-pr
2525

2626
- name: Install PHP
27-
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
27+
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2.37.0
2828
with:
2929
php-version: "8.3"
3030

@@ -44,7 +44,7 @@ jobs:
4444
run: git diff
4545

4646
- name: Create Pull Request
47-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
47+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
4848
with:
4949
token: ${{ steps.octo-sts.outputs.token }}
5050
commit-message: "chore: update latest versions"

.gitlab/add_final_status.xsl

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

.gitlab/generate-common.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ function windows_git_setup_with_packages() {
156156
DD_POOL_TRACE_CHECK_FAILURES: true
157157
DD_DISABLE_ERROR_RESPONSES: true
158158
SNAPSHOT_REGEX_PLACEHOLDERS: 'path:/\S+/dd-trace-php(?=/),httpbin:(?<=//)httpbin-integration:8080'
159+
KUBERNETES_SERVICE_CPU_REQUEST: 1
160+
KUBERNETES_SERVICE_CPU_LIMIT: 1
161+
KUBERNETES_SERVICE_MEMORY_REQUEST: 512Mi
162+
KUBERNETES_SERVICE_MEMORY_LIMIT: 512Mi
159163

160164
request-replayer:
161165
name: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-request-replayer-2.0

.gitlab/generate-package.php

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191
variables:
9292
CARGO_HOME: "${CI_PROJECT_DIR}/.cache/cargo"
9393

94+
# One pipeline injection package size ratchet
95+
OCI_PACKAGE_MAX_SIZE_BYTES: 150_000_000
96+
LIB_INJECTION_IMAGE_MAX_SIZE_BYTES: 210_000_000
97+
9498
include:
9599
- local: .gitlab/one-pipeline.locked.yml
96100
- local: .gitlab/benchmarks.yml
@@ -1235,6 +1239,7 @@
12351239
# Install Python dependencies
12361240
pip install -U pip virtualenv
12371241
<?php dockerhub_login() ?>
1242+
- /tmp/vault kv get --format=json "kv/k8s/gitlab-runner/dd-trace-php/datadoghq-api-key" 2>/dev/null | python3 -c "import sys,json;print(json.load(sys.stdin)['data']['data']['key'])" > /tmp/.dd-api-key 2>/dev/null || true
12381243
- git clone https://github.com/DataDog/system-tests.git
12391244
- mv packages/{datadog-setup.php,dd-library-php-*x86_64-linux-gnu.tar.gz} system-tests/binaries
12401245
- cd system-tests
@@ -1244,10 +1249,13 @@
12441249
when: always
12451250
paths:
12461251
- .cache/
1252+
after_script:
1253+
- DATADOG_API_KEY=$(cat /tmp/.dd-api-key 2>/dev/null) || true
1254+
- mkdir -p artifacts && for f in system-tests/logs*/reportJunit.xml; do dir=$(basename $(dirname "$f")); cp "$f" "artifacts/reportJunit_${dir}.xml" 2>/dev/null || true; done
1255+
- DATADOG_API_KEY=${DATADOG_API_KEY:-} DD_SERVICE=system-tests DD_JUNIT_XPATH_TAGS="test.codeowners=/testcase/properties/property[@name='test.codeowners']" .gitlab/silent-upload-junit-to-datadog.sh
12471256
artifacts:
12481257
paths:
1249-
- "system-tests/logs_parametric/"
1250-
- "system-tests/logs/"
1258+
- "system-tests/logs*/"
12511259
when: "always"
12521260

12531261
"System Tests: [default]":
@@ -1268,6 +1276,22 @@
12681276
script:
12691277
- ./run.sh $TESTSUITE
12701278

1279+
"System Tests: [tracer-release]":
1280+
extends: .system_tests
1281+
timeout: 4h
1282+
rules:
1283+
- if: $CI_COMMIT_REF_NAME == "master"
1284+
when: on_success
1285+
- if: $CI_PIPELINE_SOURCE == "schedule"
1286+
when: on_success
1287+
- when: manual
1288+
allow_failure: true
1289+
script:
1290+
- DD_API_KEY=$(cat /tmp/.dd-api-key 2>/dev/null) || { echo "Failed to fetch DD_API_KEY"; exit 1; }
1291+
- export DD_API_KEY
1292+
- SCENARIOS=$(PYTHONPATH=. venv/bin/python utils/scripts/compute-workflow-parameters.py php -g tracer_release -f json | python3 -c "import sys,json;d=json.load(sys.stdin);s=set();[s.update(v['scenarios']) for v in d.values() if isinstance(v,dict) and 'scenarios' in v];print(' '.join(sorted(s)))")
1293+
- FAILED=""; for S in $SCENARIOS; do echo "=== Running $S ==="; ./run.sh $S || FAILED="$FAILED $S"; done; if [ -n "$FAILED" ]; then echo "Failed scenarios:$FAILED"; exit 1; fi
1294+
12711295
"System Tests: [parametric]":
12721296
extends: .system_tests
12731297
variables:
@@ -1433,7 +1457,7 @@
14331457
image: registry.ddbuild.io/ci/libdatadog-build/ci_docker_base:67145216
14341458
tags: [ "arch:amd64" ]
14351459
rules:
1436-
- if: $CI_PIPELINE_SOURCE == "schedule" && $NIGHTLY_BUILD
1460+
- if: $NIGHTLY_BUILD
14371461
when: on_success
14381462
- if: $CI_COMMIT_REF_NAME =~ /^ddtrace-/
14391463
when: on_success

0 commit comments

Comments
 (0)