Skip to content

Commit 8c1af2e

Browse files
committed
updates
1 parent 2d207ca commit 8c1af2e

File tree

4 files changed

+31
-0
lines changed

4 files changed

+31
-0
lines changed

smoke-tests/apps/AutoPerfCounters/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AutoPerfCountersTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
77
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
910
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
11+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
12+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23;
13+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9;
1014
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1115
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1216
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -146,9 +150,21 @@ static class Tomcat8Java11OpenJ9Test extends AutoPerfCountersTest {}
146150
@Environment(TOMCAT_8_JAVA_17)
147151
static class Tomcat8Java17Test extends AutoPerfCountersTest {}
148152

153+
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
154+
static class Tomcat8Java17OpenJ9Test extends AutoPerfCountersTest {}
155+
149156
@Environment(TOMCAT_8_JAVA_21)
150157
static class Tomcat8Java21Test extends AutoPerfCountersTest {}
151158

159+
@Environment(TOMCAT_8_JAVA_21_OPENJ9)
160+
static class Tomcat8Java21OpenJ9Test extends AutoPerfCountersTest {}
161+
162+
@Environment(TOMCAT_8_JAVA_23)
163+
static class Tomcat8Java23Test extends AutoPerfCountersTest {}
164+
165+
@Environment(TOMCAT_8_JAVA_23_OPENJ9)
166+
static class Tomcat8Java23OpenJ9Test extends AutoPerfCountersTest {}
167+
152168
@Environment(WILDFLY_13_JAVA_8)
153169
static class Wildfly13Java8Test extends AutoPerfCountersTest {}
154170

smoke-tests/apps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_17_OPENJ9;
1010
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21;
1111
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_21_OPENJ9;
12+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23;
13+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_23_OPENJ9;
1214
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8;
1315
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.JAVA_8_OPENJ9;
1416
import static org.assertj.core.api.Assertions.assertThat;
@@ -131,4 +133,10 @@ static class Java21Test extends JmsTest {}
131133

132134
@Environment(JAVA_21_OPENJ9)
133135
static class Java21OpenJ9Test extends JmsTest {}
136+
137+
@Environment(JAVA_23)
138+
static class Java23Test extends JmsTest {}
139+
140+
@Environment(JAVA_23_OPENJ9)
141+
static class Java23OpenJ9Test extends JmsTest {}
134142
}

smoke-tests/apps/Sampling/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/SamplingTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11;
77
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_11_OPENJ9;
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
9+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17_OPENJ9;
910
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1011
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
1112
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23;
@@ -84,6 +85,9 @@ static class Tomcat8Java11OpenJ9Test extends SamplingTest {}
8485
@Environment(TOMCAT_8_JAVA_17)
8586
static class Tomcat8Java17Test extends SamplingTest {}
8687

88+
@Environment(TOMCAT_8_JAVA_17_OPENJ9)
89+
static class Tomcat8Java17OpenJ9Test extends SamplingTest {}
90+
8791
@Environment(TOMCAT_8_JAVA_21)
8892
static class Tomcat8Java21Test extends SamplingTest {}
8993

smoke-tests/framework/src/main/java/com/microsoft/applicationinsights/smoketest/EnvironmentValue.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ public enum EnvironmentValue {
2121
TOMCAT_8_JAVA_17(
2222
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-20240926.11049343243",
2323
"/server/webapps"),
24+
TOMCAT_8_JAVA_17_OPENJ9(
25+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-openj9-20240926.11049343243",
26+
"/server/webapps"),
2427
TOMCAT_8_JAVA_21(
2528
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-20240926.11049343243",
2629
"/server/webapps"),

0 commit comments

Comments
 (0)