From c975c031cf99807f68362b2b8e22261fe35a3c14 Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Mon, 4 May 2026 14:04:40 +0200
Subject: [PATCH 1/4] add jdk 26

---
 .github/workflows/build.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e8ef808..72b6a61f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
           path: |
             ./agentextension/build/libs/elastic-otel-agentextension-*.jar
 
-  test:
+  jdk-test:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -80,12 +80,16 @@ jobs:
             vm: 'hotspot'
           - version: 25
             vm: 'hotspot'
+          - version: 26
+            vm: 'hotspot'
           - version: 11
             vm: 'openj9'
           - version: 21
             vm: 'openj9'
           - version: 25
             vm: 'openj9'
+          - version: 26
+            vm: 'openj9'
     steps:
       # We use the cached working directory so that we don't have to recompile everything
       - name: Download cached build working directory

From 77af1cb6c9f21c0ab1c740454a4810b65d851b1a Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Mon, 4 May 2026 15:41:52 +0200
Subject: [PATCH 2/4] try to add dependency on matrix test result

---
 .github/workflows/build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 72b6a61f..d2f57e00 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
           path: |
             ./agentextension/build/libs/elastic-otel-agentextension-*.jar
 
-  jdk-test:
+  jdk-test-matrix:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -123,6 +123,13 @@ jobs:
           name: test-results-${{ matrix.version }}-${{ matrix.vm }}
           path: '**/build/test-results/test/TEST-*.xml'
 
+  jdk-test:
+    runs-on: ubuntu-latest
+    needs:
+      - jdk-test-matrix
+    steps:
+      - run: echo "no test to run, this job depends on the results of jdk-test-matrix"
+
   muzzle-check:
     runs-on: ubuntu-latest
     steps:

From b902193262076180358611210015a8d58fc9a5ff Mon Sep 17 00:00:00 2001
From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com>
Date: Mon, 4 May 2026 16:16:03 +0200
Subject: [PATCH 3/4] change matrix job name

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d2f57e00..165fc56e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
           path: |
             ./agentextension/build/libs/elastic-otel-agentextension-*.jar
 
-  jdk-test-matrix:
+  jdk-matrix:
     runs-on: ubuntu-latest
     needs:
       - build
@@ -126,9 +126,9 @@ jobs:
   jdk-test:
     runs-on: ubuntu-latest
     needs:
-      - jdk-test-matrix
+      - jdk-matrix
     steps:
-      - run: echo "no test to run, this job depends on the results of jdk-test-matrix"
+      - run: echo "no test to run, this job depends on the results of jdk-matrix"
 
   muzzle-check:
     runs-on: ubuntu-latest

From d6b45fe33cb922695612080c75c83f5f5b22d1e2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 4 May 2026 14:18:09 +0000
Subject: [PATCH 4/4] update jdk-test job: run always and fail if jdk-matrix
 has failures

Agent-Logs-Url: https://github.com/elastic/elastic-otel-java/sessions/bfb4681e-c1df-48aa-bf12-b2d1886dcd50

Co-authored-by: v1v <2871786+v1v@users.noreply.github.com>
---
 .github/workflows/build.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 165fc56e..0af1ef3c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -125,10 +125,15 @@ jobs:
 
   jdk-test:
     runs-on: ubuntu-latest
+    if: always()
     needs:
       - jdk-matrix
     steps:
-      - run: echo "no test to run, this job depends on the results of jdk-matrix"
+      - name: Check jdk-matrix result
+        run: |
+          result="${{ needs.jdk-matrix.result }}"
+          echo "jdk-matrix result: $result"
+          [[ "$result" == "success" ]] || exit 1
 
   muzzle-check:
     runs-on: ubuntu-latest