[NR-234870] GHA Update Unit Test Action

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

@@ -17,6 +17,7 @@ runs:
       with:
         distribution: 'temurin'
         java-version: |
+          21
           20
           17
           11
@@ -29,7 +30,8 @@ runs:
         sed -i -e "s|jdk8=8|jdk8=${JAVA_HOME_8_X64}|
         s|jdk11=11|jdk11=${JAVA_HOME_11_X64}|
         s|jdk17=17|jdk17=${JAVA_HOME_17_X64}|
-        s|jdk20=20|jdk20=${JAVA_HOME_20_X64}|" gradle.properties.gha
+        s|jdk20=20|jdk20=${JAVA_HOME_20_X64}|
+        s|jdk21=21|jdk20=${JAVA_HOME_21_X64}|" gradle.properties.gha
         cat gradle.properties.gha >> gradle.properties
 
     - name: Setup Gradle

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

@@ -36,6 +36,7 @@ runs:
       with:
         distribution: 'temurin'
         java-version: |
+          21
           20
           17
           11
@@ -48,7 +49,8 @@ runs:
         sed -i -e "s|jdk8=8|jdk8=${JAVA_HOME_8_X64}|
         s|jdk11=11|jdk11=${JAVA_HOME_11_X64}|
         s|jdk17=17|jdk17=${JAVA_HOME_17_X64}|
-        s|jdk20=20|jdk20=${JAVA_HOME_20_X64}|" gradle.properties.gha
+        s|jdk20=20|jdk20=${JAVA_HOME_20_X64}|
+        s|jdk21=21|jdk21=${JAVA_HOME_21_X64}|" gradle.properties.gha
         cat gradle.properties.gha >> gradle.properties
 
     - name: Setup Gradle

.github/actions/unit-test/action.yml

@@ -1,10 +1,45 @@
 name: Instrumentation unit tests
 description: Run all the instrumentation unit test.
+inputs:
+  java-version:
+    description: 'The JVM Version to use'
+    required: true
+    default: '8'
 
 runs:
   using: composite
 
   steps:
-    - name: Run instrumentation unit tests
+    - name: Run instrumentation unit tests on Java ${{ inputs.java-version }} attempt 1
+      id: run_tests_1
       shell: bash
-      run: ./gradlew ${GRADLE_OPTIONS} --info test
+      continue-on-error: true
+      run: |
+        echo "Running attempt 1"
+        ./gradlew ${GRADLE_OPTIONS} --info test -Ptest${{ inputs.java-version }} --continue
+
+    - name: Run instrumentation unit tests on Java ${{ inputs.java-version }} attempt 2
+      id: run_tests_2
+      shell: bash
+      continue-on-error: true
+      if: steps.run_tests_1.outcome == 'failure'
+      run: |
+        echo "Running attempt 2"
+        ./gradlew ${GRADLE_OPTIONS} --info test -Ptest${{ inputs.java-version }} --continue
+
+    - name: Run instrumentation unit tests on Java ${{ inputs.java-version }} attempt 3
+      id: run_tests_3
+      shell: bash
+      continue-on-error: true
+      if: steps.run_tests_2.outcome == 'failure'
+      run: |
+        echo "Running attempt 3"
+        ./gradlew ${GRADLE_OPTIONS} --info test -Ptest${{ inputs.java-version }} --continue
+
+    - name: Run instrumentation unit tests on Java ${{ inputs.java-version }} attempt 4
+      id: run_tests_4
+      shell: bash
+      if: steps.run_tests_3.outcome == 'failure'
+      run: |
+        echo "Running attempt 4"
+        ./gradlew ${GRADLE_OPTIONS} --info test -Ptest${{ inputs.java-version }} --continue

.github/workflows/X-Reusable-Build-Security-Agent.yml

@@ -59,6 +59,10 @@ jobs:
   # this list is paginated and will be used in the verify-module job.
   build-agent:
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        java-version: [ 8, 11, 17 ]
+
     steps:
       - name: Checkout CSEC Repo
         uses: actions/checkout@v3
@@ -79,4 +83,6 @@ jobs:
 
       - name: Run CSEC unit tests
         if: ${{ inputs.run-unit-test == 'true' }}
-        uses: ./.github/actions/unit-test
+        uses: ./.github/actions/unit-test
+        with:
+          java-version: ${{ matrix.java-version }}

instrumentation-security/apache-log4j-3.0.0/build.gradle

@@ -23,3 +23,10 @@ java {
         languageVersion.set(JavaLanguageVersion.of(11))
     }
 }
+
+test {
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
+    onlyIf {
+        !project.hasProperty('test8')
+    }
+}

instrumentation-security/httpclient-jdk11/build.gradle

@@ -21,11 +21,13 @@ java {
 }
 
 test {
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
     onlyIf {
-        inputs.getProperties()["test.jdk"]!="jdk8"
+        !project.hasProperty('test8')
     }
 }
 
+
 compileJava {
     options.fork = true
     options.bootstrapClasspath = null

instrumentation-security/java-io-inputstream-jdk8/src/test/java/com/nr/agent/security/instrumentation/javaio/InputStreamJdk8Test.java

@@ -5,13 +5,15 @@
 import com.newrelic.agent.security.introspec.SecurityInstrumentationTestRunner;
 import com.newrelic.agent.security.introspec.SecurityIntrospector;
 import com.newrelic.api.agent.security.schema.SecurityMetaData;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 
@@ -31,6 +33,7 @@
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"java.io","com.newrelic.agent.security.instrumentation.javaio"})
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Category({Java17IncompatibleTest.class})
 public class InputStreamJdk8Test {
     private static String FILE;
     private static String FILE_TEMP;

instrumentation-security/java-io-inputstream-jdk9/build.gradle

@@ -21,8 +21,8 @@ java {
 }
 
 test {
-//     These instrumentation tests only run on Java 9+ regardless of the -PtestN gradle property that is set.
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
     onlyIf {
-        java.toolchain.getLanguageVersion().get().asInt() > 10
+        !project.hasProperty('test8')
     }
-}
+}

instrumentation-security/java-io-inputstream-jdk9/src/test/java/com/nr/instrumentation/security/inputstream/jdk9/InputStreamJdk9Test.java

@@ -5,6 +5,7 @@
 import com.newrelic.agent.security.introspec.SecurityIntrospector;
 import com.newrelic.api.agent.security.schema.SecurityMetaData;
 import com.newrelic.security.test.marker.Java11IncompatibleTest;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
 import com.newrelic.security.test.marker.Java8IncompatibleTest;
 import org.junit.AfterClass;
 import org.junit.Assert;
@@ -30,7 +31,7 @@
 import java.util.List;
 import java.util.UUID;
 
-@Category({ Java8IncompatibleTest.class, Java11IncompatibleTest.class })
+@Category({ Java8IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class })
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.javaio.io","com.newrelic.agent.security.instrumentation.javaio"})
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)

instrumentation-security/javax-xpath/src/test/java/com/nr/agent/security/instrumentation/xpath/javax/XPathTest.java

@@ -7,10 +7,12 @@
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
 import com.newrelic.api.agent.security.schema.operation.XPathOperation;
 import com.newrelic.agent.security.instrumentation.xpath.javax.XPATHUtils;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.w3c.dom.Document;
@@ -25,6 +27,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = { "javax.xml.xpath", "com.sun.org.apache.xpath.internal" })
+@Category({ Java17IncompatibleTest.class})
 public class XPathTest {
 
     private final String XML_DOC = "src/test/resources/Customer.xml";

instrumentation-security/javax-xpath/src/test/java/com/nr/agent/security/instrumentation/xpath/javax/internal/XPathInternalTest.java

@@ -6,6 +6,7 @@
 import com.newrelic.api.agent.security.schema.AbstractOperation;
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
 import com.newrelic.api.agent.security.schema.operation.XPathOperation;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
 import com.sun.org.apache.xml.internal.utils.DefaultErrorHandler;
 import com.sun.org.apache.xml.internal.utils.PrefixResolver;
 import com.sun.org.apache.xml.internal.utils.PrefixResolverDefault;
@@ -16,6 +17,7 @@
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.w3c.dom.Document;
@@ -32,6 +34,7 @@
 @RunWith(SecurityInstrumentationTestRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @InstrumentationTestConfig(includePrefixes = { "javax.xml.xpath", "com.sun.org.apache.xpath.internal" })
+@Category({ Java17IncompatibleTest.class})
 public class XPathInternalTest {
     private final String XML_DOC = "src/test/resources/Customer.xml";
     private final String EXPRESSION = "/Customers/Customer";

instrumentation-security/jersey-2.16/src/test/java/com/nr/agent/security/instrumentation/jersey2/JerseyTests.java

@@ -18,6 +18,9 @@
 import com.newrelic.api.agent.security.schema.HttpResponse;
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
 import com.newrelic.api.agent.security.schema.operation.RXSSOperation;
+import com.newrelic.security.test.marker.Java11IncompatibleTest;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
+import com.newrelic.security.test.marker.Java9IncompatibleTest;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.util.Header;
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
@@ -26,6 +29,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import javax.ws.rs.client.Client;
@@ -53,6 +57,7 @@
 
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.jersey2", "org.glassfish.jersey"})
+@Category({ Java9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class })
 public class JerseyTests {
 
     private static HttpServer server;

instrumentation-security/jersey-2/src/test/java/com/nr/agent/security/instrumentation/jersey2/JerseyTests.java

@@ -18,6 +18,9 @@
 import com.newrelic.api.agent.security.schema.HttpResponse;
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
 import com.newrelic.api.agent.security.schema.operation.RXSSOperation;
+import com.newrelic.security.test.marker.Java11IncompatibleTest;
+import com.newrelic.security.test.marker.Java17IncompatibleTest;
+import com.newrelic.security.test.marker.Java9IncompatibleTest;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.util.Header;
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
@@ -26,6 +29,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import javax.ws.rs.client.Client;
@@ -53,6 +57,7 @@
 
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.jersey2", "org.glassfish.jersey"})
+@Category({ Java9IncompatibleTest.class, Java11IncompatibleTest.class, Java17IncompatibleTest.class })
 public class JerseyTests {
 
     private static HttpServer server;

instrumentation-security/jersey-3/src/test/java/com/nr/agent/security/instrumentation/jersey2/JerseyTests.java

@@ -18,6 +18,8 @@
 import com.newrelic.api.agent.security.schema.HttpResponse;
 import com.newrelic.api.agent.security.schema.VulnerabilityCaseType;
 import com.newrelic.api.agent.security.schema.operation.RXSSOperation;
+import com.newrelic.security.test.marker.Java11IncompatibleTest;
+import com.newrelic.security.test.marker.Java8IncompatibleTest;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.util.Header;
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
@@ -26,6 +28,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
 import jakarta.ws.rs.client.Client;
@@ -53,6 +56,7 @@
 
 @RunWith(SecurityInstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"com.newrelic.agent.security.instrumentation.jersey2", "org.glassfish.jersey"})
+@Category({Java8IncompatibleTest.class, Java11IncompatibleTest.class})
 public class JerseyTests {
 
     private static HttpServer server;

instrumentation-security/jetty-11/build.gradle

@@ -21,6 +21,14 @@ java {
     }
 }
 
+test {
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
+    onlyIf {
+        !project.hasProperty('test8')
+    }
+}
+
+
 site {
     title 'Jetty'
     type 'Appserver'

instrumentation-security/jetty-12/build.gradle

@@ -22,6 +22,13 @@ java {
     }
 }
 
+test {
+    // These instrumentation tests only run on Java 17+ regardless of the -PtestN gradle property that is set.
+    onlyIf {
+        !project.hasProperty('test8') && !project.hasProperty('test11')
+    }
+}
+
 site {
     title 'Jetty'
     type 'Appserver'

instrumentation-security/jsp-3/build.gradle

@@ -24,6 +24,13 @@ java {
     }
 }
 
+test {
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
+    onlyIf {
+        !project.hasProperty('test8')
+    }
+}
+
 site {
     title 'JSP'
     type 'Other'

instrumentation-security/ldaptive-2.0/build.gradle

@@ -25,8 +25,9 @@ java {
 }
 
 test {
+    // These instrumentation tests only run on Java 11+ regardless of the -PtestN gradle property that is set.
     onlyIf {
-        inputs.getProperties()["test.jdk"]!="jdk8" && inputs.getProperties()["test.jdk"]!="jdk9" && inputs.getProperties()["test.jdk"]!="jdk10"
+        !project.hasProperty('test8')
     }
 }
 

instrumentation-security/lettuce-4.3/build.gradle

@@ -3,7 +3,7 @@ dependencies {
     implementation("com.newrelic.agent.java:newrelic-api:${nrAPIVersion}")
     implementation("com.newrelic.agent.java:newrelic-weaver-api:${nrAPIVersion}")
     implementation("biz.paluch.redis:lettuce:4.4.0.Final")
-    testImplementation("com.github.codemonstur:embedded-redis:1.0.0")
+    testImplementation('org.testcontainers:testcontainers:1.17.1')
 }
 
 jar {