From 701fdb16a288b3aad934eed6fa104da90a6b3275 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 12 May 2026 13:03:55 -0400 Subject: [PATCH 1/3] Run startup benchmarks on PRs as well --- .gitlab/java-benchmark-configs.yml | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index 4ae8993ce0c..b2664a97dda 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -18,6 +18,26 @@ interruptible: true allow_failure: true +# Startup benchmarks run on PRs as well +.parallel_startup_benchmark_rules: ¶llel_startup_benchmark_rules + - if: '$POPULATE_CACHE' + when: never + - if: '$CI_COMMIT_TAG =~ /^v?[0-9]+\.[0-9]+\.[0-9]+$/' + when: manual + allow_failure: true + - if: '$CI_COMMIT_BRANCH == "master"' + when: on_success + interruptible: false + - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/' + when: on_success + interruptible: true + - if: '$CI_COMMIT_BRANCH =~ /^gh-readonly-queue\//' + when: on_success + interruptible: true + - when: on_success + interruptible: true + allow_failure: true + # Ensure the tracer artifact publish finishes before the benchmark jobs start. linux-java-spring-petclinic-parallel: needs: ["publish-artifacts-to-s3"] @@ -32,11 +52,11 @@ linux-java-spring-petclinic-load-parallel: linux-java-insecure-bank-startup-parallel: needs: ["publish-artifacts-to-s3"] - rules: *parallel_benchmark_rules + rules: *parallel_startup_benchmark_rules linux-java-spring-petclinic-startup-parallel: needs: ["publish-artifacts-to-s3"] - rules: *parallel_benchmark_rules + rules: *parallel_startup_benchmark_rules linux-java-dacapo-parallel-1: needs: ["publish-artifacts-to-s3"] @@ -47,10 +67,17 @@ linux-java-dacapo-parallel-2: rules: *parallel_benchmark_rules java-startup-parallel-check-slo-breaches: - rules: *parallel_benchmark_rules + rules: *parallel_startup_benchmark_rules java-load-parallel-check-slo-breaches: rules: *parallel_benchmark_rules java-dacapo-parallel-check-slo-breaches: rules: *parallel_benchmark_rules + +# Override upstream "needs" so that the PR comment posts after startup completes, +# without waiting for manually-triggered load / dacapo benchmarks to complete. +java-post-pr-comment: + needs: + - job: java-startup-parallel-check-slo-breaches + artifacts: true From cc9c403fd25dc60bccb56adf4770f67aa7736ed1 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 12 May 2026 13:32:15 -0400 Subject: [PATCH 2/3] Use personal apm-sdks-benchmarks branch --- .gitlab-ci.yml | 2 +- .gitlab/java-benchmark-configs.yml | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5290d93abd0..cc62f758c87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ include: ref: 'main' - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-post-pr-comment.yml' - ref: 'main' + ref: 'sarahchen6/update-java-pr-commenting-jobs' # TODO: revert to 'main' after apm-sdks-benchmarks PR merges - local: ".gitlab/java-benchmark-configs.yml" stages: diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index b2664a97dda..cda3f38dd51 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -75,9 +75,7 @@ java-load-parallel-check-slo-breaches: java-dacapo-parallel-check-slo-breaches: rules: *parallel_benchmark_rules -# Override upstream "needs" so that the PR comment posts after startup completes, -# without waiting for manually-triggered load / dacapo benchmarks to complete. java-post-pr-comment: - needs: - - job: java-startup-parallel-check-slo-breaches - artifacts: true + variables: + # TODO: revert to "main" after apm-sdks-benchmarks PR merges + APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/update-java-pr-commenting-jobs" From f121f133b7e70856b32e9db392a0f822af0d413c Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 13 May 2026 11:18:22 -0400 Subject: [PATCH 3/3] Remove check-slo-breaches job overrisions --- .gitlab/java-benchmark-configs.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml index cda3f38dd51..64bee62b47e 100644 --- a/.gitlab/java-benchmark-configs.yml +++ b/.gitlab/java-benchmark-configs.yml @@ -66,15 +66,6 @@ linux-java-dacapo-parallel-2: needs: ["publish-artifacts-to-s3"] rules: *parallel_benchmark_rules -java-startup-parallel-check-slo-breaches: - rules: *parallel_startup_benchmark_rules - -java-load-parallel-check-slo-breaches: - rules: *parallel_benchmark_rules - -java-dacapo-parallel-check-slo-breaches: - rules: *parallel_benchmark_rules - java-post-pr-comment: variables: # TODO: revert to "main" after apm-sdks-benchmarks PR merges