Add Java 18 to test matrix (#2391)

* Add Java 18 to test matrix * Exclude asm transitive dependencies from agent * Disable Log4j 1.2 smoke test for Java version greater than 17 * Disable Log4j 1.2 smoke test for Java version greater than 17 Co-authored-by: jeanbisutti <[email protected]>
microsoft · Jul 20, 2022 · 60414b2 · 60414b2
1 parent f0d550e
commit 60414b2
Show file tree

Hide file tree

Showing 49 changed files with 314 additions and 5 deletions.
diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml
@@ -16,6 +16,7 @@ jobs:
           - 8
           - 11
           - 17
+          - 18
         vm:
           - hotspot
           # TODO (trask) enable once profiler supports OpenJ9

diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts
@@ -16,7 +16,9 @@ dependencies {
   implementation(project(":agent:agent-gc-monitor:gc-monitor-api"))
   implementation(project(":agent:agent-gc-monitor:gc-monitor-core"))
   implementation(project(":agent:agent-profiler:agent-diagnostics-api"))
-  implementation(project(":agent:azure-monitor-exporter"))
+  implementation(project(":agent:azure-monitor-exporter")) {
+    exclude("org.ow2.asm", "asm")
+  }
 
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
@@ -47,6 +49,7 @@ dependencies {
     //  via `IntelliJCredential` or `DefaultAzureCredential`"
     // NOTE this exclusion saves 6.5 mb !!!!
     exclude("org.linguafranca.pwdb", "KeePassJava2")
+    exclude("org.ow2.asm", "asm")
   }
 
   //  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -34,8 +34,8 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:5.14.0")
   implementation("com.google.guava:guava:30.1-jre")
   implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
-  implementation("org.ow2.asm:asm:9.1")
-  implementation("org.ow2.asm:asm-tree:9.1")
+  implementation("org.ow2.asm:asm:9.3")
+  implementation("org.ow2.asm:asm-tree:9.3")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
   implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
 

diff --git a/...etrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java b/...etrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java
@@ -25,6 +25,8 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -100,6 +102,12 @@ static class Java11OpenJ9Test extends MicrometerTest {}
   @Environment(JAVA_17)
   static class Java17Test extends MicrometerTest {}
 
+  @Environment(JAVA_18)
+  static class Java18Test extends MicrometerTest {}
+
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends MicrometerTest {}
+
+  @Environment(JAVA_18_OPENJ9)
+  static class Java18OpenJ9Test extends MicrometerTest {}
 }
diff --git a/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PerfCountersDataTest.java b/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PerfCountersDataTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -163,6 +164,9 @@ static class Tomcat8Java11OpenJ9Test extends PerfCountersDataTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends PerfCountersDataTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends PerfCountersDataTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends PerfCountersDataTest {}
 

diff --git a/...AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java b/...AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -77,6 +78,9 @@ static class Tomcat8Java11OpenJ9Test extends AzureSdkTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends AzureSdkTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends AzureSdkTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends AzureSdkTest {}
 

diff --git a/...ssandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java b/...ssandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -82,6 +83,9 @@ static class Tomcat8Java11OpenJ9Test extends CassandraTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends CassandraTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends CassandraTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends CassandraTest {}
 

diff --git a/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java b/.../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -66,6 +67,9 @@ static class Tomcat8Java11OpenJ9Test extends CustomDimensionsTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends CustomDimensionsTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends CustomDimensionsTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends CustomDimensionsTest {}
 

diff --git a/...smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java b/...smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java
@@ -1,8 +1,13 @@
 package com.microsoft.applicationinsights.smoketest;
 
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.microsoft.applicationinsights.smoketest.schemav2.Data;
@@ -68,9 +73,24 @@ private static Envelope getRequestEnvelope(List<Envelope> envelopes, String name
   @Environment(JAVA_8)
   static class Java8Test extends CustomInstrumentationTest {}
 
+  @Environment(JAVA_8_OPENJ9)
+  static class Java8OpenJ9Test extends CustomInstrumentationTest {}
+
   @Environment(JAVA_11)
   static class Java11Test extends CustomInstrumentationTest {}
 
+  @Environment(JAVA_11_OPENJ9)
+  static class Java11OpenJ9Test extends CustomInstrumentationTest {}
+
   @Environment(JAVA_17)
   static class Java17Test extends CustomInstrumentationTest {}
+
+  @Environment(JAVA_18)
+  static class Java18Test extends CustomInstrumentationTest {}
+
+  @Environment(JAVA_17_OPENJ9)
+  static class Java17OpenJ9Test extends CustomInstrumentationTest {}
+
+  @Environment(JAVA_18_OPENJ9)
+  static class Java18OpenJ9Test extends CustomInstrumentationTest {}
 }
diff --git a/...artBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java b/...artBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -75,6 +76,9 @@ static class Tomcat8Java11OpenJ9Test extends HeartBeatTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends HeartBeatTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends HeartBeatTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends HeartBeatTest {}
 

diff --git a/...s/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientSmokeTest.java b/...s/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientSmokeTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -149,6 +150,9 @@ static class Tomcat8Java11OpenJ9Test extends HttpClientSmokeTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends HttpClientSmokeTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends HttpClientSmokeTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends HttpClientSmokeTest {}
 

diff --git a/...aders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java b/...aders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -81,6 +82,9 @@ static class Tomcat8Java11OpenJ9Test extends HttpHeadersTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends HttpHeadersTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends HttpHeadersTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends HttpHeadersTest {}
 

diff --git a/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java b/.../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -67,6 +68,9 @@ static class Tomcat8Java11OpenJ9Test extends HttpServer4xxDefaultTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends HttpServer4xxDefaultTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends HttpServer4xxDefaultTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends HttpServer4xxDefaultTest {}
 

diff --git a/...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java b/...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -67,6 +68,9 @@ static class Tomcat8Java11OpenJ9Test extends HttpServer4xxTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends HttpServer4xxTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends HttpServer4xxTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends HttpServer4xxTest {}
 

diff --git a/...es/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java b/...es/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java
@@ -25,6 +25,8 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -86,6 +88,12 @@ static class Java11OpenJ9Test extends SpringBootAutoTest {}
   @Environment(JAVA_17)
   static class Java17Test extends SpringBootAutoTest {}
 
+  @Environment(JAVA_18)
+  static class Java18Test extends SpringBootAutoTest {}
+
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends SpringBootAutoTest {}
+
+  @Environment(JAVA_18_OPENJ9)
+  static class Java18OpenJ9Test extends SpringBootAutoTest {}
 }
diff --git a/...ests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java b/...ests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java
@@ -25,6 +25,8 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -131,6 +133,12 @@ static class Java11OpenJ9Test extends JmsTest {}
   @Environment(JAVA_17)
   static class Java17Test extends JmsTest {}
 
+  @Environment(JAVA_18)
+  static class Java18Test extends JmsTest {}
+
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends JmsTest {}
+
+  @Environment(JAVA_18_OPENJ9)
+  static class Java18OpenJ9Test extends JmsTest {}
 }
diff --git a/...ts/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java b/...ts/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -341,6 +342,9 @@ static class Tomcat8Java11OpenJ9Test extends JdbcTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends JdbcTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends JdbcTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends JdbcTest {}
 

diff --git a/.../apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java b/.../apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java
@@ -24,6 +24,7 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_17;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_18;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.WILDFLY_13_JAVA_8;
@@ -82,6 +83,9 @@ static class Tomcat8Java11OpenJ9Test extends JedisTest {}
   @Environment(TOMCAT_8_JAVA_17)
   static class Tomcat8Java17Test extends JedisTest {}
 
+  @Environment(TOMCAT_8_JAVA_18)
+  static class Tomcat8Java18Test extends JedisTest {}
+
   @Environment(WILDFLY_13_JAVA_8)
   static class Wildfly13Java8Test extends JedisTest {}
 

diff --git a/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java b/...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java
@@ -25,6 +25,8 @@
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_11_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_17_OPENJ9;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18;
+import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_18_OPENJ9;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8;
 import static com.microsoft.applicationinsights.smoketest.WarEnvironmentValue.JAVA_8_OPENJ9;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -66,6 +68,12 @@ static class Java11OpenJ9Test extends JettyNativeHandlerTest {}
   @Environment(JAVA_17)
   static class Java17Test extends JettyNativeHandlerTest {}
 
+  @Environment(JAVA_18)
+  static class Java18Test extends JettyNativeHandlerTest {}
+
   @Environment(JAVA_17_OPENJ9)
   static class Java17OpenJ9Test extends JettyNativeHandlerTest {}
+
+  @Environment(JAVA_18_OPENJ9)
+  static class Java18OpenJ9Test extends JettyNativeHandlerTest {}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ jobs: @@
               - 8
               - 11
               - 17
+              - 18
             vm:
               - hotspot
               # TODO (trask) enable once profiler supports OpenJ9
@@ Expand Down @@