Skip to content

Commit 120eea4

Browse files
trasktrask
committed
updates
1 parent 29191c6 commit 120eea4

File tree

2 files changed

+24
-17
lines changed
  • smoke-tests

2 files changed

+24
-17
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_17;
99
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21;
1010
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_21_OPENJ9;
11+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23;
12+
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_23_OPENJ9;
1113
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8;
1214
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.TOMCAT_8_JAVA_8_OPENJ9;
1315
import static com.microsoft.applicationinsights.smoketest.EnvironmentValue.WILDFLY_13_JAVA_8;
@@ -88,6 +90,12 @@ static class Tomcat8Java21Test extends SamplingTest {}
8890
@Environment(TOMCAT_8_JAVA_21_OPENJ9)
8991
static class Tomcat8Java21OpenJ9Test extends SamplingTest {}
9092

93+
@Environment(TOMCAT_8_JAVA_23)
94+
static class Tomcat8Java23Test extends SamplingTest {}
95+
96+
@Environment(TOMCAT_8_JAVA_23_OPENJ9)
97+
static class Tomcat8Java23OpenJ9Test extends SamplingTest {}
98+
9199
@Environment(WILDFLY_13_JAVA_8)
92100
static class Wildfly13Java8Test extends SamplingTest {}
93101

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,41 @@
77

88
public enum EnvironmentValue {
99
TOMCAT_8_JAVA_8(
10-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.72-jdk8-20221129.3575751672",
10+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-20240926.11049343243",
1111
"/server/webapps"),
1212
TOMCAT_8_JAVA_8_OPENJ9(
13-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.72-jdk8-openj9-20221129.3575751672",
13+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk8-openj9-20240926.11049343243",
1414
"/server/webapps"),
1515
TOMCAT_8_JAVA_11(
16-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.72-jdk11-20221129.3575751672",
16+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-20240926.11049343243",
1717
"/server/webapps"),
1818
TOMCAT_8_JAVA_11_OPENJ9(
19-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.72-jdk11-openj9-20221129.3575751672",
19+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk11-openj9-20240926.11049343243",
2020
"/server/webapps"),
2121
TOMCAT_8_JAVA_17(
22-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.72-jdk17-20221129.3575751672",
22+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk17-20240926.11049343243",
2323
"/server/webapps"),
2424
TOMCAT_8_JAVA_21(
25-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-20240419.8749862078",
25+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-20240926.11049343243",
2626
"/server/webapps"),
2727
TOMCAT_8_JAVA_21_OPENJ9(
28-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-openj9-20240419.8749862078",
28+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk21-openj9-20240926.11049343243",
29+
"/server/webapps"),
30+
TOMCAT_8_JAVA_23(
31+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-20240926.11049343243",
32+
"/server/webapps"),
33+
TOMCAT_8_JAVA_23_OPENJ9(
34+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-openj9-20240926.11049343243",
2935
"/server/webapps"),
30-
// TODO (trask) re-enable when we have a new version of the image
31-
// TOMCAT_8_JAVA_23(
32-
// "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-20240419.8749862078",
33-
// "/server/webapps"),
34-
// TOMCAT_8_JAVA_23_OPENJ9(
35-
// "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-tomcat:8.5.98-jdk23-openj9-20240419.8749862078",
36-
// "/server/webapps"),
3736
WILDFLY_13_JAVA_8(
38-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-20221129.3575751672",
37+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-20240926.11049343243",
3938
"/opt/jboss/wildfly/standalone/deployments"),
4039
WILDFLY_13_JAVA_8_OPENJ9(
41-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-openj9-20221129.3575751672",
40+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-wildfly:13.0.0.Final-jdk8-openj9-20240926.11049343243",
4241
"/opt/jboss/wildfly/standalone/deployments"),
4342

4443
LIBERTY_20_JAVA_8(
45-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-liberty:21.0.0.10-jdk8-20221129.3575751672",
44+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-servlet-liberty:21.0.0.10-jdk8-20240926.11049343243",
4645
"/config/apps",
4746
"app.war"),
4847

0 commit comments

Comments
 (0)