JDK24 support

.github/actions/setup-environment/action.yml

@@ -18,7 +18,7 @@ runs:
       with:
         distribution: 'temurin'
         java-version: |
-          23
+          24
           21
           17
           11
@@ -31,7 +31,7 @@ runs:
         s|jdk11=11|jdk11=${JAVA_HOME_11_X64}|
         s|jdk17=17|jdk17=${JAVA_HOME_17_X64}|
         s|jdk21=21|jdk21=${JAVA_HOME_21_X64}|
-        s|jdk23=23|jdk23=${JAVA_HOME_23_X64}|" gradle.properties.gha
+        s|jdk24=24|jdk24=${JAVA_HOME_24_X64}|" gradle.properties.gha
         cat gradle.properties.gha >> gradle.properties
 
     - name: Setup Gradle
@@ -41,7 +41,7 @@ runs:
 
     - name: Setup Gradle options
       shell: bash
-      run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_23_X64" >> $GITHUB_ENV
+      run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_24_X64" >> $GITHUB_ENV
 
     - name: Download S3 instrumentation jar zip
       shell: bash

.github/workflows/GHA-Functional-Tests.yaml

@@ -28,7 +28,7 @@ jobs:
       ##max-parallel: 1 ## used to force sequential
       fail-fast: false
       matrix:
-        java-version: [ 8, 11, 17, 21, 23 ]
+        java-version: [ 8, 11, 17, 21, 24 ]
     steps:
       - name: Checkout Java agent
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

.github/workflows/GHA-Unit-Tests.yaml

@@ -25,7 +25,7 @@ jobs:
       # max-parallel: 1 ## used to force sequential vs. concurrent
       fail-fast: false
       matrix:
-        java-version: [ 8, 11, 17, 21, 23 ]
+        java-version: [ 8, 11, 17, 21, 24 ]
     steps:
       - name: Checkout Java agent
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

.github/workflows/Java-Instrumentation-Tests.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version: [ 8, 11, 17, 21, 23 ]
+        java-version: [ 8, 11, 17, 21, 24 ]
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
     # needs: install-all-java

.github/workflows/Test-AITs.yml

@@ -216,7 +216,7 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            23
+            24
             21
             17
             11
@@ -227,14 +227,14 @@ jobs:
           echo "JDK_zulu_11=${JAVA_HOME_11_X64}" >> $GITHUB_ENV
           echo "JDK_zulu_17=${JAVA_HOME_17_X64}" >> $GITHUB_ENV
           echo "JDK_zulu_21=${JAVA_HOME_21_X64}" >> $GITHUB_ENV
-          echo "JDK_zulu_23=${JAVA_HOME_23_X64}" >> $GITHUB_ENV
+          echo "JDK_zulu_24=${JAVA_HOME_24_X64}" >> $GITHUB_ENV
 
       - name: Set up Javas
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # pin@v4
         with:
           distribution: 'temurin'
           java-version: |
-            23
+            24
             21
             17
             11
@@ -287,10 +287,10 @@ jobs:
           <toolchain>
             <type>jdk</type>
             <provides>
-                    <version>23</version>
+                    <version>24</version>
             </provides>
             <configuration>
-                    <jdkHome>${JAVA_HOME_23_X64}</jdkHome>
+                    <jdkHome>${JAVA_HOME_24_X64}</jdkHome>
             </configuration>
             </toolchain>
           </toolchains>
@@ -327,12 +327,12 @@ jobs:
           ZULU11=${JDK_zulu_11} \
           ZULU17=${JDK_zulu_17} \
           ZULU21=${JDK_zulu_21} \
-          ZULU23=${JDK_zulu_23} \
+          ZULU24=${JDK_zulu_24} \
           JAVA8JRE=${JAVA_HOME_8_X64} \
           JAVA11JRE=${JAVA_HOME_11_X64} \
           JAVA17JRE=${JAVA_HOME_17_X64} \
           JAVA21JRE=${JAVA_HOME_21_X64} \
-          JAVA23JRE=${JAVA_HOME_23_X64} \
+          JAVA24JRE=${JAVA_HOME_24_X64} \
           conf/autoconfigure
           . conf/testenv java
           cat conf/java_local_config.yml

build.gradle

@@ -74,5 +74,5 @@ ext {
     // SynchronizedAnnotationNode, SynchronizedClassNode, SynchronizedFieldNode, SynchronizedInnerClassNode, SynchronizedMethodNode,
     // SynchronizedModuleExportNode, SynchronizedModuleNode, SynchronizedModuleOpenNode, SynchronizedModuleProvideNode, SynchronizedModuleRequireNode,
     // SynchronizedTypeAnnotationNode
-    asmVersion="9.7"
+    asmVersion="9.7.1"
 }

buildSrc/build.gradle

@@ -13,8 +13,8 @@ repositories {
 dependencies {
     // This is how we do our NR-specific patching. That is, moving Log4jPlugins,
     // changing Logger.getLogger, and checking for unmapped dependencies.
-    implementation("org.ow2.asm:asm:9.7")
-    implementation("org.ow2.asm:asm-commons:9.7")
+    implementation("org.ow2.asm:asm:9.7.1")
+    implementation("org.ow2.asm:asm-commons:9.7.1")
 
     // Shadow is used here because several classes implement the Transformer interface
     implementation("com.github.jengelman.gradle.plugins:shadow:6.0.0")

functional_test/src/test/java/com/newrelic/agent/instrumentation/ClassLoaderTest.java

@@ -13,7 +13,7 @@
 import com.newrelic.test.marker.IBMJ9IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -69,7 +69,7 @@ public void testMissingNewRelicClass() throws ClassNotFoundException {
 
     // Java 12 no longer lets us access the declared field
     @Test
-    @Category({ IBMJ9IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+    @Category({ IBMJ9IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
     public void testSetSystemClassLoader() throws Exception {
 
         final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();

functional_test/src/test/java/com/newrelic/agent/instrumentation/ClassRetransformBootstrapTest.java

@@ -10,15 +10,15 @@
 import com.newrelic.test.marker.Java11IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import javax.activation.MimeType;
 import java.util.HashMap;
 import java.util.Map;
 
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 public class ClassRetransformBootstrapTest {
 
     /**

functional_test/src/test/java/com/newrelic/agent/instrumentation/CustomExtensionTestAddition.java

@@ -13,14 +13,14 @@
 import com.newrelic.test.marker.Java11IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 
 import javax.activation.MimeType;
 
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 public class CustomExtensionTestAddition {
 
     @Test

gradle.properties.gha

@@ -2,4 +2,4 @@ jdk8=8
 jdk11=11
 jdk17=17
 jdk21=21
-jdk23=23
+jdk24=24

gradle/script/java.gradle

@@ -92,7 +92,7 @@ test {
     ext.configuredWithValidTestJDK = {
         if (project.hasProperty("test9") || project.hasProperty("test10") || project.hasProperty("test12") || project.hasProperty("test13") ||
                 project.hasProperty("test14") || project.hasProperty("test15") || project.hasProperty("test16") || project.hasProperty("test18") ||
-                project.hasProperty("test19") || project.hasProperty("test20") || project.hasProperty("test22")) {
+                project.hasProperty("test19") || project.hasProperty("test20") || project.hasProperty("test22") || project.hasProperty("test23")) {
             logger.lifecycle("The newrelic-java-agent project does not support testing with the Java version configured by the -PtestN gradle property.")
             return false
         }
@@ -113,8 +113,8 @@ test {
         configuration.call()
     }
 
-    if (project.hasProperty("test23")) {
-        configureTest("jdk23") {
+    if (project.hasProperty("test24")) {
+        configureTest("jdk24") {
             jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED',
                     '--add-opens=java.base/java.util=ALL-UNNAMED',
                     '--add-opens=java.base/java.net=ALL-UNNAMED',
@@ -123,12 +123,13 @@ test {
                     '--add-exports=java.base/sun.net.spi=ALL-UNNAMED',
                     '--add-exports=java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED'
             useJUnit {
-                excludeCategories 'com.newrelic.test.marker.Java23IncompatibleTest'
+                excludeCategories 'com.newrelic.test.marker.Java24IncompatibleTest'
             }
         }
         // mockito uses a version of bytebuddy that has experimental support for Java 21
         systemProperty("net.bytebuddy.experimental", "true")
     }
+
     if (project.hasProperty("test21")) {
         configureTest("jdk21") {
             jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED',

instrumentation/akka-2.2/src/test/java/com/nr/instrumentation/akka22/test/AkkaTest.java

@@ -14,7 +14,7 @@
 import com.newrelic.agent.introspec.TracedMetricData;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorA;
 import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorB;
 import com.nr.instrumentation.akka22.test.actors.broadcasting.ActorC;
@@ -33,7 +33,7 @@
 import static org.junit.Assert.assertTrue;
 
 // Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
-@Category({ Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"akka.actor", "akka.dispatch", "akka.pattern", "akka.routing"})
 public class AkkaTest {

instrumentation/akka-http-2.11_2.4.5/src/test/java/com/agent/instrumentation/akka/http/AkkaHttpRoutesTest.java

@@ -30,7 +30,7 @@
 import static org.hamcrest.Matchers.containsString;
 
 // Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"akka", "scala", "com.agent", "com.nr"})
 public class AkkaHttpRoutesTest {

instrumentation/akka-http-2.11_2.4.5/src/test/java/com/agent/instrumentation/akka/http/AkkaResponseWrapperTest.java

@@ -14,7 +14,7 @@
 import com.newrelic.test.marker.Java11IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -30,7 +30,7 @@
 import static org.junit.Assert.assertTrue;
 
 // Not compatible with Java 11+ and Scala 2.13+ https://github.com/scala/bug/issues/12340
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"akka", "scala"})
 public class AkkaResponseWrapperTest {

instrumentation/apache-log4j-1/src/test/java/com/nr/agent/instrumentation/log4j1/LoggingEventMapTest.java

@@ -10,7 +10,7 @@
 import com.newrelic.agent.bridge.logging.AppLoggingUtils;
 import com.newrelic.agent.bridge.logging.LogAttributeKey;
 import com.newrelic.agent.bridge.logging.LogAttributeType;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.apache.log4j.Category;
 import org.apache.log4j.MDC;
 import org.apache.log4j.Priority;
@@ -29,7 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 // Log4J1 has a quirk with Java 23(.0.0), maybe this will work when 23.0.1 is released
-@org.junit.experimental.categories.Category({ Java23IncompatibleTest.class })
+@org.junit.experimental.categories.Category({ Java24IncompatibleTest.class })
 public class LoggingEventMapTest {
 
     private static Stream<Arguments> providerParamsForLoggingEventMapTest() {

instrumentation/apache-log4j-1/src/test/java/org/apache/log4j/ContextDataTest.java

@@ -10,7 +10,7 @@
 import com.newrelic.agent.introspec.InstrumentationTestRunner;
 import com.newrelic.agent.introspec.Introspector;
 import com.newrelic.agent.model.LogEvent;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertEquals;
 
 @RunWith(InstrumentationTestRunner.class)
-@org.junit.experimental.categories.Category({ Java23IncompatibleTest.class })
+@org.junit.experimental.categories.Category({ Java24IncompatibleTest.class })
 @InstrumentationTestConfig(includePrefixes = {"org.apache.log4j"}, configName = "application_logging_context_data_enabled.yml")
 public class ContextDataTest {
 

instrumentation/async-http-client-2.0.0/src/test/java/com/nr/agent/instrumentation/asynchttpclient/AsyncHttpClient2_0_0Tests.java

@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.nr.agent.instrumentation.asynchttpclient", "org.asynchttpclient"})
 public class AsyncHttpClient2_0_0Tests {

instrumentation/async-http-client-2.1.0/src/test/java/com/nr/agent/instrumentation/asynchttpclient/AsyncHttpClient2_1_0Tests.java

@@ -26,7 +26,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.nr.agent.instrumentation.asynchttpclient", "org.asynchttpclient"})
 public class AsyncHttpClient2_1_0Tests {

instrumentation/cassandra-datastax-4.0.0/src/test/java/com/nr/agent/instrumentation/cassandra/CassandraInstrumented.java

@@ -18,7 +18,7 @@
 import com.newrelic.test.marker.Java11IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.cassandraunit.CassandraCQLUnit;
 import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
 import org.junit.Rule;
@@ -34,7 +34,7 @@
 import static org.junit.Assert.assertNotNull;
 
 // Issue when running cassandra unit on Java 9+ - https://github.com/jsevellec/cassandra-unit/issues/249
-@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = { "com.datastax.oss.driver" })
 public class CassandraInstrumented {

instrumentation/cassandra-datastax-4.0.0/src/test/java/com/nr/agent/instrumentation/cassandra/CassandraNoInstrumentation.java

@@ -16,7 +16,7 @@
 import com.newrelic.test.marker.Java11IncompatibleTest;
 import com.newrelic.test.marker.Java17IncompatibleTest;
 import com.newrelic.test.marker.Java21IncompatibleTest;
-import com.newrelic.test.marker.Java23IncompatibleTest;
+import com.newrelic.test.marker.Java24IncompatibleTest;
 import org.cassandraunit.CassandraCQLUnit;
 import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
 import org.junit.Rule;
@@ -27,7 +27,7 @@
 import static org.junit.Assert.assertEquals;
 
 // Issue when running cassandra unit on Java 9+ - https://github.com/jsevellec/cassandra-unit/issues/249
-@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java23IncompatibleTest.class })
+@Category({ IBMJ9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class, Java21IncompatibleTest.class, Java24IncompatibleTest.class })
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = { "none" })
 public class CassandraNoInstrumentation {

instrumentation/jms-3/build.gradle

@@ -14,16 +14,6 @@ verifyInstrumentation {
     passesOnly 'jakarta.jms:jakarta.jms-api:[3.0.0-RC1,)'
 }
 
-test {
-    // ActiveMQ calls javax.security.auth.Subject.getSubject. Java 23 added logic that will
-    // throw an exception if security manager is not enabled.
-    // They have a ticket regarding this: https://issues.apache.org/jira/browse/ARTEMIS-4975
-    // but it is unlikely the fix can be used here because it will likely not be Java 8 compatible.
-    if (project.hasProperty("test23")) {
-        jvmArgs += '-Djava.security.manager=allow'
-    }
-}
-
 site {
     title 'JMS'
     type 'Messaging'