Skip to content

Add JDK 26-EA testing to CI #9996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarahchen6 merged 8 commits into from
Dec 1, 2025
Merged

Add JDK 26-EA testing to CI #9996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41b2043
Add Java 26 to CI as non-default JVM
sarahchen6 Nov 18, 2025
86e2fa9
Add EA workarounds
sarahchen6 Nov 18, 2025
024715c
Update gradle compatibility check
sarahchen6 Nov 18, 2025
c8cac17
Skip maven smoke tests
sarahchen6 Nov 20, 2025
c272092
Merge branch 'master' into sarahchen6/add-jdk-26-ea-to-ci
sarahchen6 Nov 20, 2025
1f594d8
Use @EnabledForJreRange instead of workaround
sarahchen6 Nov 21, 2025
eda14ac
Oops use annotation correctly now
sarahchen6 Nov 21, 2025
621988a
Merge branch 'master' into sarahchen6/add-jdk-26-ea-to-ci
sarahchen6 Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ workflow:
- "17"
- "21"
- "25"
- "26"
- "semeru11"
- "oracle8"
- "zulu8"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class TestJvmSpec(val project: Project) {
"stable" -> {
val javaVersions = project.providers.environmentVariablesPrefixedBy("JAVA_").map { javaHomes ->
javaHomes
.filter { it.key.matches(Regex("^JAVA_[0-9]+_HOME$")) }
.filter { it.key.matches(Regex("^JAVA_[0-9]+_HOME$")) && it.key != "JAVA_26_HOME" } // JDK 26 is EA
.map { Regex("^JAVA_(\\d+)_HOME$").find(it.key)!!.groupValues[1].toInt() }
}.get()

Expand Down
8 changes: 8 additions & 0 deletions ...a-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,8 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -674,6 +676,8 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -701,6 +705,8 @@ public void suspendKotlin() throws IOException, URISyntaxException {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down Expand Up @@ -734,6 +740,8 @@ public void suspendMethodKotlin() {
}

@Test
@EnabledForJreRange(
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
@DisabledIf(
value = "datadog.environment.JavaVirtualMachine#isJ9",
disabledReason = "Issue with J9 when compiling Kotlin code")
Expand Down
6 changes: 5 additions & 1 deletion dd-smoke-tests/gradle/src/test/groovy/datadog/smoketest/AbstractGradleTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ class AbstractGradleTest extends CiVisibilitySmokeTest {

private static boolean isSupported(ComparableVersion gradleVersion) {
// https://docs.gradle.org/current/userguide/compatibility.html
if (Jvm.current.isJavaVersionCompatible(25)) {
if (Jvm.current.isJavaVersionCompatible(26)) {
// TODO: Fix for Java 26. Check compatibility doc / issue to confirm the minimum version.
// https://github.com/gradle/gradle/issues/35406
return gradleVersion.compareTo(new ComparableVersion("9.4")) >= 0
} else if (Jvm.current.isJavaVersionCompatible(25)) {
return gradleVersion.compareTo(new ComparableVersion("9.1")) >= 0
} else if (Jvm.current.isJavaVersionCompatible(24)) {
return gradleVersion.compareTo(new ComparableVersion("8.14")) >= 0
Expand Down
5 changes: 5 additions & 0 deletions dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package datadog.smoketest

import datadog.environment.JavaVirtualMachine
import datadog.trace.api.civisibility.CIConstants
import datadog.trace.api.config.CiVisibilityConfig
import datadog.trace.api.config.GeneralConfig
Expand All @@ -13,6 +14,7 @@ import org.slf4j.LoggerFactory
import org.w3c.dom.Document
import org.w3c.dom.NodeList
import spock.lang.AutoCleanup
import spock.lang.IgnoreIf
import spock.lang.Shared
import spock.lang.TempDir
import spock.util.environment.Jvm
Expand All @@ -30,6 +32,9 @@ import java.util.concurrent.TimeoutException

import static org.junit.jupiter.api.Assumptions.assumeTrue

@IgnoreIf(reason = "TODO: Fix for Java 26. Maven compiler fails to compile the tests for Java 26-ea.", value = {
JavaVirtualMachine.isJavaVersionAtLeast(26)
})
class MavenSmokeTest extends CiVisibilitySmokeTest {

private static final Logger LOGGER = LoggerFactory.getLogger(MavenSmokeTest)
Expand Down