From ebb51147b602e3142971230b56d996967e2eb88e Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 2 Jul 2025 11:32:24 -0400 Subject: [PATCH 1/5] Test JDK 25 EA builder image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac5e0d86be2..d34903b318a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/" GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/" - BUILDER_IMAGE_VERSION_PREFIX: "v25.06-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") + BUILDER_IMAGE_VERSION_PREFIX: "111_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/ PROFILE_TESTS: From 3751eeae11f49f8caa5bee248623ed08b411309d Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 15:36:13 -0400 Subject: [PATCH 2/5] Try new PR 113 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d34903b318a..922fa654441 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/" GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/" - BUILDER_IMAGE_VERSION_PREFIX: "111_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") + BUILDER_IMAGE_VERSION_PREFIX: "113_merge-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-") REPO_NOTIFICATION_CHANNEL: "#apm-java-escalations" DEFAULT_TEST_JVMS: /^(8|11|17|21|stable)$/ PROFILE_TESTS: From 15080eac9c3ea7034c176c22da1f225829b547d0 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 16:49:52 -0400 Subject: [PATCH 3/5] Add print statement to see java version being run --- .../trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy index 7683bd644f7..775246eea66 100644 --- a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy +++ b/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy @@ -16,6 +16,7 @@ class RuntimeCallSiteTest extends AgentTestRunner { def 'test exec with command string'() { setup: + System.out.println(System.getProperty("java.version")) final runtime = Mock(Runtime) CommandInjectionModule iastModule = Mock(CommandInjectionModule) final command = 'ls' From f9daa1840c87b393b37276fd5936cb1cc47b59cc Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 18:04:15 -0400 Subject: [PATCH 4/5] Empty commit From 4755b8d19781233c908211d75a1cc8c921b90e0d Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 22:08:22 -0400 Subject: [PATCH 5/5] Exclude 25 from stable jvm calculation --- gradle/java_no_deps.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle index 895ff430627..d82cf079c94 100644 --- a/gradle/java_no_deps.gradle +++ b/gradle/java_no_deps.gradle @@ -154,6 +154,7 @@ project.afterEvaluate { def javaVersions = System.getenv() .findAll { it.key =~ /^JAVA_[0-9]+_HOME$/ } .collect { (it.key =~ /^JAVA_(\d+)_HOME$/)[0][1] as Integer } + .findAll { it != 25 } // Exclude LTS JDK v25 (early access) if (javaVersions.isEmpty()) { throw new GradleException("No valid JAVA_X_HOME environment variables found.")