From 42ce3696d1e63d548498e2742433f86e69e0c2b5 Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 13 May 2026 15:34:58 -0400
Subject: [PATCH 1/2] Test sarahchen6/bring-back-comparisons branch

---
 .gitlab-ci.yml                     | 13 ++++++++-----
 .gitlab/java-benchmark-configs.yml | 28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5290d93abd0..0d6a8688d50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,21 +3,22 @@ include:
   - local: ".gitlab/benchmarks.yml"
   - local: ".gitlab/exploration-tests.yml"
   - local: ".gitlab/ci-visibility-tests.yml"
+  # TODO: revert all refs to 'main' after apm-sdks-benchmarks PR merges
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-spring-petclinic-parallel.yml'
-    ref: 'main'
+    ref: 'sarahchen6/bring-back-comparisons'
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-load-parallel.yml'
-    ref: 'main'
+    ref: 'sarahchen6/bring-back-comparisons'
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-startup-parallel.yml'
-    ref: 'main'
+    ref: 'sarahchen6/bring-back-comparisons'
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-dacapo-parallel.yml'
-    ref: 'main'
+    ref: 'sarahchen6/bring-back-comparisons'
   - project: 'DataDog/apm-reliability/apm-sdks-benchmarks'
     file: '.gitlab/ci-java-post-pr-comment.yml'
-    ref: 'main'
+    ref: 'sarahchen6/bring-back-comparisons'
   - local: ".gitlab/java-benchmark-configs.yml"
 
 stages:
@@ -42,6 +43,8 @@ stages:
   - generate-signing-key
 
 variables:
+  # TODO: remove after apm-sdks-benchmarks PR merges
+  APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/bring-back-comparisons"
   # Gitlab runner features; see https://docs.gitlab.com/runner/configuration/feature-flags.html
   # Fold and time all script sections
   FF_SCRIPT_SECTIONS: 1
diff --git a/.gitlab/java-benchmark-configs.yml b/.gitlab/java-benchmark-configs.yml
index b984847c6a0..0f8a0cf89ac 100644
--- a/.gitlab/java-benchmark-configs.yml
+++ b/.gitlab/java-benchmark-configs.yml
@@ -38,30 +38,58 @@
     interruptible: true
     allow_failure: true
 
+# TODO: remove APM_SDKS_BENCHMARKS_BRANCH overrides after apm-sdks-benchmarks PR merges.
+# Job-level variables override the template default ("main") which otherwise takes
+# precedence over the pipeline-level variable.
+.benchmark_branch_override: &benchmark_branch_override
+  APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/bring-back-comparisons"
+
 # 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 899580b1563228a00793ea2c0d7ae6717b521dcf Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Mon, 18 May 2026 15:30:20 -0400
Subject: [PATCH 2/2] Fix gitlab pipeline

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d6a8688d50..a0532bdc7aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,6 @@ stages:
   - generate-signing-key
 
 variables:
-  # TODO: remove after apm-sdks-benchmarks PR merges
-  APM_SDKS_BENCHMARKS_BRANCH: "sarahchen6/bring-back-comparisons"
   # Gitlab runner features; see https://docs.gitlab.com/runner/configuration/feature-flags.html
   # Fold and time all script sections
   FF_SCRIPT_SECTIONS: 1