Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Java 18 to test matrix #2391

Merged
merged 6 commits into from
Jul 20, 2022
Merged

Add Java 18 to test matrix #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da57a9b
Add Java 18 to test matrix
trask Jul 13, 2022
c796163
Exclude asm transitive dependencies from agent
jeanbisutti Jul 19, 2022
634d2cf
Merge remote-tracking branch 'origin/main' into java18
trask Jul 19, 2022
8569636
Disable Log4j 1.2 smoke test for Java version greater than 17
jeanbisutti Jul 20, 2022
8d2ea3a
Merge branch 'java18' of https://github.com/microsoft/ApplicationInsi…
jeanbisutti Jul 20, 2022
c94432f
Disable Log4j 1.2 smoke test for Java version greater than 17
jeanbisutti Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/reusable-test.yml
View file
Open in desktop
Original file line number Diff 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
5 changes: 4 additions & 1 deletion agent/agent-tooling/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
8 changes: 8 additions & 0 deletions ...etrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}
}
4 changes: 4 additions & 0 deletions .../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/PerfCountersDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions ...AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions ...ssandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CassandraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions .../src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomDimensionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
20 changes: 20 additions & 0 deletions ...smokeTest/java/com/microsoft/applicationinsights/smoketest/CustomInstrumentationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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 {}
}
4 changes: 4 additions & 0 deletions ...artBeat/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HeartBeatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions ...s/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpClientSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions ...aders/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpHeadersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions .../smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxDefaultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions ...4xx/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/HttpServer4xxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
8 changes: 8 additions & 0 deletions ...es/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SpringBootAutoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}
}
8 changes: 8 additions & 0 deletions ...ests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}
}
4 changes: 4 additions & 0 deletions ...ts/apps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JdbcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
4 changes: 4 additions & 0 deletions .../apps/Jedis/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}

Expand Down
8 changes: 8 additions & 0 deletions ...rc/smokeTest/java/com/microsoft/applicationinsights/smoketest/JettyNativeHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {}
}
Loading