From 2640c06a8c91b8a102065ca7dcb1e0875072b96b Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 1 Jun 2026 16:58:32 -0400 Subject: [PATCH 1/4] Test sarahchen6/improve-startup-stability branch of apm-sdks-benchmarks --- .gitlab-ci.yml | 10 +++++----- .gitlab/java-benchmark-configs.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8177e7bc54..ed593b62877 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,19 +5,19 @@ include: - local: ".gitlab/ci-visibility-tests.yml" - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-spring-petclinic-parallel.yml' - ref: 'main' + ref: 'sarahchen6/improve-startup-stability' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-load-parallel.yml' - ref: 'main' + ref: 'sarahchen6/improve-startup-stability' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-startup-parallel.yml' - ref: 'main' + ref: 'sarahchen6/improve-startup-stability' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-dacapo-parallel.yml' - ref: 'main' + ref: 'sarahchen6/improve-startup-stability' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-post-pr-comment.yml' - ref: 'main' + ref: 'sarahchen6/improve-startup-stability' - local: ".gitlab/java-benchmark-configs.yml" stages: diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index b984847c6a0..0abf6249a9c 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -38,30 +38,56 @@ interruptible: true allow_failure: true +# TODO: remove APM_SDKS_BENCHMARKS_BRANCH overrides after apm-sdks-benchmarks PR merges. +.benchmark_branch_override: &benchmark_branch_override + APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/improve-startup-stability" + # Ensure the tracer artifact publish finishes before the benchmark jobs start. linux-java-spring-petclinic-parallel: needs: ["publish-artifacts-to-s3"] + variables: + <<: *benchmark_branch_override linux-java-insecure-bank-load-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-spring-petclinic-load-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-insecure-bank-startup-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_startup_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-spring-petclinic-startup-parallel: needs: ["publish-artifacts-to-s3"] rules: *parallel_startup_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-dacapo-parallel-1: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override linux-java-dacapo-parallel-2: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules + variables: + <<: *benchmark_branch_override + +java-post-pr-comment-startup: + variables: + <<: *benchmark_branch_override + +java-post-pr-comment-load-dacapo: + variables: + <<: *benchmark_branch_override From 0f1b83e9cfe0643a5868edd55d6aa69f8084a133 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 1 Jun 2026 17:45:03 -0400 Subject: [PATCH 2/4] Empty commit to run benchmarks From f9f2ee2f5decfcce77541ae20644cd49cf214c90 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 2 Jun 2026 10:26:18 -0400 Subject: [PATCH 3/4] Disable non-benchmark tests --- .gitlab/java-benchmark-configs.yml | 90 ++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 0abf6249a9c..44aa4fc6870 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -91,3 +91,93 @@ java-post-pr-comment-startup: java-post-pr-comment-load-dacapo: variables: <<: *benchmark_branch_override + +# Disable all non-benchmark CI jobs +# build and publish-artifacts-to-s3 are left enabled because the benchmarks depend on them. +.never: &never + rules: + - when: never + +build_tests: + <<: *never + +populate_dep_cache: + <<: *never + +spotless: + <<: *never + +check-instrumentation-naming: + <<: *never + +config-inversion-linter: + <<: *never + +test_published_artifacts: + <<: *never + +check_build_src: + <<: *never + +check_base: + <<: *never + +check_inst: + <<: *never + +check_smoke: + <<: *never + +check_profiling: + <<: *never + +check_debugger: + <<: *never + +muzzle: + <<: *never + +muzzle-dep-report: + <<: *never + +agent_integration_tests: + <<: *never + +test_base: + <<: *never + +test_inst: + <<: *never + +test_inst_latest: + <<: *never + +test_flaky: + <<: *never + +test_flaky_inst: + <<: *never + +test_profiling: + <<: *never + +test_debugger: + <<: *never + +test_smoke: + <<: *never + +test_ssi_smoke: + <<: *never + +test_smoke_graalvm: + <<: *never + +test_smoke_semeru8_debugger: + <<: *never + +aggregate_test_counts: + <<: *never + +requirements_json_test: + <<: *never From 777f6651f2fe6fa232144e3db70ea56eaab37c41 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 2 Jun 2026 11:33:39 -0400 Subject: [PATCH 4/4] Fix gitlab configs --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed593b62877..107afdfbf1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -557,6 +557,7 @@ muzzle: matrix: - GRADLE_TARGET: ":instrumentationTest" CACHE_TYPE: "inst" + optional: true stage: tests rules: - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'