From 511e45451826204566e3746ed0f367d10c576cc0 Mon Sep 17 00:00:00 2001 From: Augusto de Oliveira Date: Wed, 16 Sep 2026 17:53:15 +0200 Subject: [PATCH 1/2] ci: bump apm-sdks-benchmarks pin to include S3 upload support The ref pinned for the five apm-sdks-benchmarks includes (spring-petclinic, load, startup, dacapo, post-pr-comment) predates apm-sdks-benchmarks commit 346ee41 ("feat: upload parallel benchmark results to S3 (#251)"), so .gitlab/templates/upload-results.yml does not exist at that commit and these jobs' S3 upload path is broken on master today. Already validated on a separate branch, augusto/test-java-macrobenchmark-stability, pinned to an earlier post-346ee41 commit: a real stability-monitoring run there collected 500 .converted.json files across 10 samples, 103 scenarios, 14 metrics. This bumps master itself to current apm-sdks-benchmarks main. Co-Authored-By: Claude Sonnet 5 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e26911aa0b..6d56c2212db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: - local: ".gitlab/ci-visibility-tests.yml" - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-spring-petclinic-parallel.yml' - ref: &apm_sdks_benchmarks_sha '0899730be7696774b222937adfc6583932c050e1' # pinned by "Update apm-sdks-benchmarks reference" workflow + ref: &apm_sdks_benchmarks_sha 'fac3cc729a442486d780f0ace8b43aef855a28e9' # apm-sdks-benchmarks#261 merge commit - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-load-parallel.yml' ref: *apm_sdks_benchmarks_sha From 4c4ff20eb0b6e9e3bc22cea5070255a6aa99bd95 Mon Sep 17 00:00:00 2001 From: Augusto de Oliveira Date: Thu, 17 Sep 2026 09:30:13 +0200 Subject: [PATCH 2/2] docs: clarify apm-sdks-benchs pin update workf src --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d56c2212db..7250f10b46b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: - local: ".gitlab/ci-visibility-tests.yml" - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-spring-petclinic-parallel.yml' - ref: &apm_sdks_benchmarks_sha 'fac3cc729a442486d780f0ace8b43aef855a28e9' # apm-sdks-benchmarks#261 merge commit + ref: &apm_sdks_benchmarks_sha 'fac3cc729a442486d780f0ace8b43aef855a28e9' # pinned by .github/workflows/update-apm-sdks-benchmarks-reference.yaml - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-load-parallel.yml' ref: *apm_sdks_benchmarks_sha