From 7f43b549a9f74291450dee21158ff7bb4534b53e Mon Sep 17 00:00:00 2001 From: tbradellis Date: Mon, 4 Apr 2022 13:44:50 -0700 Subject: [PATCH 1/3] 18 GA tests and version utils --- .../AITs-Basic-Features-Special-JREs.yml | 4 ++-- .github/workflows/AITs-Basic-Features.yml | 4 ++-- .github/workflows/AITs-Datastores.yml | 4 ++-- .github/workflows/AITs-Frameworks.yml | 4 ++-- .github/workflows/AITs-Security.yml | 4 ++-- .github/workflows/AITs-Servers.yml | 4 ++-- .github/workflows/AITs-Traces.yml | 4 ++-- .github/workflows/GHA-Functional-Tests.yaml | 4 ++-- .github/workflows/GHA-Unit-Tests.yaml | 4 ++-- .github/workflows/X-Reusable-Test.yml | 6 ++--- .../agent/config/JavaVersionUtils.java | 6 ++--- .../agent/config/JavaVersionUtilsTest.java | 23 ++++++++++--------- newrelic-api/build.gradle | 2 +- 13 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.github/workflows/AITs-Basic-Features-Special-JREs.yml b/.github/workflows/AITs-Basic-Features-Special-JREs.yml index b0f7c3f865..2251abf122 100644 --- a/.github/workflows/AITs-Basic-Features-Special-JREs.yml +++ b/.github/workflows/AITs-Basic-Features-Special-JREs.yml @@ -142,11 +142,11 @@ jobs: run: | echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Basic-Features.yml b/.github/workflows/AITs-Basic-Features.yml index 49b855c559..3c9b35768f 100644 --- a/.github/workflows/AITs-Basic-Features.yml +++ b/.github/workflows/AITs-Basic-Features.yml @@ -156,11 +156,11 @@ jobs: echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV # Install 18 EA - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Datastores.yml b/.github/workflows/AITs-Datastores.yml index b2833fe59e..608edd7c24 100644 --- a/.github/workflows/AITs-Datastores.yml +++ b/.github/workflows/AITs-Datastores.yml @@ -131,11 +131,11 @@ jobs: run: | echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Frameworks.yml b/.github/workflows/AITs-Frameworks.yml index e435bc077c..ff3e000c59 100644 --- a/.github/workflows/AITs-Frameworks.yml +++ b/.github/workflows/AITs-Frameworks.yml @@ -142,11 +142,11 @@ jobs: echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV # Install 18 EA - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Security.yml b/.github/workflows/AITs-Security.yml index 169681b9f0..23c1563ed7 100644 --- a/.github/workflows/AITs-Security.yml +++ b/.github/workflows/AITs-Security.yml @@ -141,11 +141,11 @@ jobs: echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV # Install 18 EA - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Servers.yml b/.github/workflows/AITs-Servers.yml index a829f71435..c941bfe92f 100644 --- a/.github/workflows/AITs-Servers.yml +++ b/.github/workflows/AITs-Servers.yml @@ -143,11 +143,11 @@ jobs: echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV # Install 18 EA - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/AITs-Traces.yml b/.github/workflows/AITs-Traces.yml index 93039aeb03..612e02cd8d 100644 --- a/.github/workflows/AITs-Traces.yml +++ b/.github/workflows/AITs-Traces.yml @@ -136,11 +136,11 @@ jobs: echo "ORG_GRADLE_PROJECT_jdk17=${JAVA_HOME}" >> $GITHUB_ENV # Install 18 EA - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/GHA-Functional-Tests.yaml b/.github/workflows/GHA-Functional-Tests.yaml index a0b82ed4fc..9a658c39ae 100644 --- a/.github/workflows/GHA-Functional-Tests.yaml +++ b/.github/workflows/GHA-Functional-Tests.yaml @@ -66,11 +66,11 @@ jobs: echo "Current JAVA_HOME = ${JAVA_HOME}" echo "ORG_GRADLE_PROJECT_jdk17=$JAVA_HOME" >> $GITHUB_ENV - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/GHA-Unit-Tests.yaml b/.github/workflows/GHA-Unit-Tests.yaml index fe1a33d296..1cfde9a142 100644 --- a/.github/workflows/GHA-Unit-Tests.yaml +++ b/.github/workflows/GHA-Unit-Tests.yaml @@ -67,11 +67,11 @@ jobs: echo "Current JAVA_HOME = ${JAVA_HOME}" echo "ORG_GRADLE_PROJECT_jdk17=$JAVA_HOME" >> $GITHUB_ENV - - name: Set up Java 18-ea + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 - name: Save JAVA_HOME as JDK18 for later usage run: | diff --git a/.github/workflows/X-Reusable-Test.yml b/.github/workflows/X-Reusable-Test.yml index 2acf31304c..eb66b9a074 100644 --- a/.github/workflows/X-Reusable-Test.yml +++ b/.github/workflows/X-Reusable-Test.yml @@ -74,12 +74,12 @@ jobs: echo "Current JAVA_HOME = ${JAVA_HOME}" echo "ORG_GRADLE_PROJECT_jdk17=$JAVA_HOME" >> $GITHUB_ENV - # Install 18-ea - - name: Set up Java 18-ea + # Install 18 + - name: Set up Java 18 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 18-ea + java-version: 18 # Save new JDK variable - name: Save JAVA_HOME as JDK18ea for later usage diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java b/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java index 91a53182ff..c0e170f5d6 100644 --- a/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java +++ b/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java @@ -13,10 +13,10 @@ * Simple set of utilities to help us validate that the agent is being run on a supported version of Java. */ public class JavaVersionUtils { - private static final Pattern SUPPORTED_JAVA_VERSION_PATTERN = Pattern.compile("^(1\\.8|9|1[0-7])$"); + private static final Pattern SUPPORTED_JAVA_VERSION_PATTERN = Pattern.compile("^(1\\.8|9|1[0-8])$"); private static final Pattern EXCLUSIVE_MIN_JAVA_VERSION_PATTERN = Pattern.compile("^1\\.7$"); - private static final Pattern EXCLUSIVE_MAX_JAVA_VERSION_PATTERN = Pattern.compile("^18$"); - private static final String MAX_SUPPORTED_VERSION = "17"; + private static final Pattern EXCLUSIVE_MAX_JAVA_VERSION_PATTERN = Pattern.compile("^19$"); + private static final String MAX_SUPPORTED_VERSION = "18"; public static final String JAVA_7 = "1.7"; public static final String JAVA_8 = "1.8"; diff --git a/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java b/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java index 22ed79999d..c4f19bb78d 100644 --- a/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java +++ b/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java @@ -29,6 +29,7 @@ public void supportAgentJavaSpecVersions() { assertTrue(JavaVersionUtils.isAgentSupportedJavaSpecVersion(JavaVersionUtils.JAVA_15)); assertTrue(JavaVersionUtils.isAgentSupportedJavaSpecVersion(JavaVersionUtils.JAVA_16)); assertTrue(JavaVersionUtils.isAgentSupportedJavaSpecVersion(JavaVersionUtils.JAVA_17)); + assertTrue(JavaVersionUtils.isAgentSupportedJavaSpecVersion(JavaVersionUtils.JAVA_18)); } @@ -53,14 +54,14 @@ public void unsupportedAgentVersionsLessThanJava8() { @Test public void javaVersionHigherThanSupported() { - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18+181")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0+181")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0_b181")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0.1")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0.1+11")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0.1_11")); - assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0.1_11-b11")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19+181")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0+181")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0_b181")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0.1")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0.1+11")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0.1_11")); + assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("19.0.1_11-b11")); } @Test @@ -87,9 +88,9 @@ public void unsupportedJavaVersionMessageWhenLessThanMinimalSupportedVersion() { @Test public void unsupportedJavaVersionMessageWhenGreaterThanMaxSupportedVersion() { - String msg = JavaVersionUtils.getUnsupportedAgentJavaSpecVersionMessage(JavaVersionUtils.JAVA_18); - assertThat(msg, containsString(JavaVersionUtils.JAVA_18)); - assertThat(msg, containsString("Java greater than 17.")); + String msg = JavaVersionUtils.getUnsupportedAgentJavaSpecVersionMessage(JavaVersionUtils.JAVA_19); + assertThat(msg, containsString(JavaVersionUtils.JAVA_19)); + assertThat(msg, containsString("Java greater than 18.")); } @Test diff --git a/newrelic-api/build.gradle b/newrelic-api/build.gradle index ab23548fb2..af2605713c 100644 --- a/newrelic-api/build.gradle +++ b/newrelic-api/build.gradle @@ -8,7 +8,7 @@ plugins { jar { from("$rootDir/LICENSE") manifest { - attributes 'Implementation-Title': 'New Relic Agent API', 'Implementation-Version': project.version, 'Automatic-Module-Name': 'newrelic.api' + attributes 'Implementation-Title': 'New Relic Agent API', 'Implementation-Version': project.version } } From a676afa22ab1de3aba7184c8f0370e747c08d2c8 Mon Sep 17 00:00:00 2001 From: tbradellis Date: Mon, 4 Apr 2022 14:34:08 -0700 Subject: [PATCH 2/3] correct api build.gradle --- newrelic-api/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newrelic-api/build.gradle b/newrelic-api/build.gradle index af2605713c..ab23548fb2 100644 --- a/newrelic-api/build.gradle +++ b/newrelic-api/build.gradle @@ -8,7 +8,7 @@ plugins { jar { from("$rootDir/LICENSE") manifest { - attributes 'Implementation-Title': 'New Relic Agent API', 'Implementation-Version': project.version + attributes 'Implementation-Title': 'New Relic Agent API', 'Implementation-Version': project.version, 'Automatic-Module-Name': 'newrelic.api' } } From 6359b6c4b7dd315d726ddc55fb41dac9ea0b01db Mon Sep 17 00:00:00 2001 From: tbradellis Date: Mon, 4 Apr 2022 16:22:13 -0700 Subject: [PATCH 3/3] refactor instrumentation test name --- ...trumentation-Tests.yml => Java-18-Instrumentation-Tests.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{Java-18-ea-Instrumentation-Tests.yml => Java-18-Instrumentation-Tests.yml} (94%) diff --git a/.github/workflows/Java-18-ea-Instrumentation-Tests.yml b/.github/workflows/Java-18-Instrumentation-Tests.yml similarity index 94% rename from .github/workflows/Java-18-ea-Instrumentation-Tests.yml rename to .github/workflows/Java-18-Instrumentation-Tests.yml index 55000397ed..3782689a80 100644 --- a/.github/workflows/Java-18-ea-Instrumentation-Tests.yml +++ b/.github/workflows/Java-18-Instrumentation-Tests.yml @@ -1,4 +1,4 @@ -name: Java 18ea Instrumentation Tests +name: Java 18 Instrumentation Tests on: pull_request: