Test with jdk 24 and 25 ea (#3949)

Author: JonasKunz

.github/workflows/main.yml

@@ -308,7 +308,9 @@ jobs:
             distribution: 'temurin'
           - version: 21
             distribution: 'temurin'
-          - version: 23
+          - version: 24
+            distribution: 'temurin'
+          - version: '25-ea'
             distribution: 'temurin'
     steps:
       - uses: actions/checkout@v4

apm-agent-core/src/test/java/co/elastic/apm/agent/util/JdkVersionTest.java

@@ -33,7 +33,6 @@ public class JdkVersionTest {
     private static List<Arguments> releaseSchedule() {
         // from https://www.oracle.com/java/technologies/java-se-support-roadmap.html
         return List.of(
-            Arguments.of(24, LocalDate.parse("2025-04-01")),
             Arguments.of(25, LocalDate.parse("2025-10-01")),
             Arguments.of(26, LocalDate.parse("2026-04-01"))
         );

apm-agent-plugins/apm-awslambda-plugin/src/test/java/co/elastic/apm/agent/awslambda/AbstractLambdaTest.java

@@ -149,7 +149,9 @@ protected boolean supportsContextPropagation() {
         return true;
     }
 
+
     static synchronized void initAllButInstrumentation() {
+        ElasticApmAgent.reset(); // reset the AbstractInstrumentationTest beforeAll initialization
         config = SpyConfiguration.createSpyConfig();
         serverlessConfiguration = config.getConfig(ServerlessConfigurationImpl.class);
         doReturn(true).when(serverlessConfiguration).runsOnAwsLambda();

apm-agent-plugins/apm-profiling-plugin/src/test/java/co/elastic/apm/agent/profiler/CallTreeSpanifyTest.java

@@ -30,7 +30,9 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
 import org.stagemonitor.configuration.ConfigurationRegistry;
 
@@ -67,6 +69,7 @@ void tearDown() throws IOException {
     @Test
     @DisabledOnOs(OS.WINDOWS)
     @DisabledOnAppleSilicon
+    @DisabledForJreRange(min = JRE.JAVA_24)
     void testSpanification() throws Exception {
         CallTree.Root callTree = CallTreeTest.getCallTree(tracer, new String[]{
             " dd   ",

apm-agent-plugins/apm-profiling-plugin/src/test/java/co/elastic/apm/agent/profiler/CallTreeTest.java

@@ -21,20 +21,25 @@
 import co.elastic.apm.agent.MockReporter;
 import co.elastic.apm.agent.MockTracer;
 import co.elastic.apm.agent.configuration.SpyConfiguration;
-import co.elastic.apm.agent.impl.transaction.*;
-import co.elastic.apm.agent.tracer.configuration.TimeDuration;
 import co.elastic.apm.agent.impl.ElasticApmTracer;
 import co.elastic.apm.agent.impl.sampling.ConstantSampler;
+import co.elastic.apm.agent.impl.transaction.AbstractSpanImpl;
 import co.elastic.apm.agent.impl.transaction.SpanImpl;
+import co.elastic.apm.agent.impl.transaction.StackFrame;
+import co.elastic.apm.agent.impl.transaction.TraceContextImpl;
+import co.elastic.apm.agent.impl.transaction.TransactionImpl;
 import co.elastic.apm.agent.objectpool.NoopObjectPool;
 import co.elastic.apm.agent.objectpool.ObservableObjectPool;
 import co.elastic.apm.agent.objectpool.impl.ListBasedObjectPool;
 import co.elastic.apm.agent.testutils.DisabledOnAppleSilicon;
+import co.elastic.apm.agent.tracer.configuration.TimeDuration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
 import org.stagemonitor.configuration.ConfigurationRegistry;
 
@@ -57,6 +62,7 @@
 
 @DisabledOnOs(OS.WINDOWS)
 @DisabledOnAppleSilicon
+@DisabledForJreRange(min = JRE.JAVA_24)
 class CallTreeTest {
 
     private MockReporter reporter;

apm-agent-plugins/apm-profiling-plugin/src/test/java/co/elastic/apm/agent/profiler/SamplingProfilerQueueTest.java

@@ -24,7 +24,9 @@
 import co.elastic.apm.agent.objectpool.ObjectPoolFactoryImpl;
 import co.elastic.apm.agent.testutils.DisabledOnAppleSilicon;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -35,6 +37,7 @@ public class SamplingProfilerQueueTest {
     @Test
     @DisabledOnOs(OS.WINDOWS)
     @DisabledOnAppleSilicon
+    @DisabledForJreRange(min = JRE.JAVA_24)
     void testFillQueue() throws Exception {
         System.out.println(System.getProperty("os.name"));
 

apm-agent-plugins/apm-profiling-plugin/src/test/java/co/elastic/apm/agent/profiler/SamplingProfilerTest.java

@@ -56,6 +56,7 @@
 // async-profiler doesn't work on Windows
 @DisabledOnOs(OS.WINDOWS)
 @DisabledOnAppleSilicon
+@DisabledForJreRange(min = JRE.JAVA_24)
 class SamplingProfilerTest {
 
     private MockReporter reporter;

docs/reference/config-profiling.md

@@ -63,7 +63,7 @@ The inferred spans are created after a profiling session has ended. This means t
 Only platform threads are supported. Virtual threads are not supported and will not be profiled.
 
 ::::{note}
-This feature is not available on Windows and on OpenJ9
+This feature is not available on Windows and on OpenJ9. In addition only Java 7 to Java 23 are supported.
 ::::
 
 

integration-tests/spring-boot-1-5/pom.xml

@@ -76,4 +76,16 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

pom.xml

@@ -116,7 +116,7 @@
         <!-- -dependencies versions -->
         <version.error_prone>2.2.0</version.error_prone>
         <version.h2>1.4.196</version.h2>
-        <version.junit>5.9.1</version.junit>
+        <version.junit>5.12.2</version.junit>
         <version.junit.vintage>4.13.2</version.junit.vintage>
         <version.okhttp>4.12.0</version.okhttp>
         <!-- this is the last version of slf4j that is compatible with Java 7-->
@@ -476,6 +476,19 @@
                 </executions>
             </plugin>
             <plugin>
+                <!--
+                  Note that we don't actively use jacoco anymore, but for reasons beyond my understanding the tests will fail if we remove it.
+                  When removing jacoco, some tests will fail deterministically with a java.lang.VerifyError: null during retransformation
+                  of the classes under test. I extracted the bytecode from the failed tests and verified it manually using the ASM CheckClassAdapter,
+                  there the bytecode looks fine and is validated without issues.
+                  My best guess of an explanation for this behaviour is that we cause some kind of obscure JVM bug during our tests, because
+                  we continuously retransform classes. This "bug" seems to be prevented by having multiple agents in the JVM (e.g. running the tests
+                  from IntelliJ with IntelliJ's debug agent also makes them succeed.
+                  This seems to happen only due to the runtime attachment of the agent in the tests,
+                  because we have never seen these kinds of problems in production systems.
+
+                  So for now I've decided to just let it be and leave jacoco in here.
+                -->
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
@@ -596,7 +609,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.8</version>
+                    <version>0.8.13</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>