Skip to content

Commit 0997afc

Browse files
traskotelbot[bot]
andauthored
Run smoke tests against Java 25 (#14953)
Co-authored-by: otelbot <[email protected]>
1 parent b926ef3 commit 0997afc

25 files changed

+79
-97
lines changed

docs/supported-libraries.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,24 +204,24 @@ These are the application servers that the smoke tests are run against:
204204

205205
| Application server | Version | JVM | OS |
206206
|---------------------------------------------------------------------------------------|------------------------------------------|--------------------------------------------------------|---------------------------------------|
207-
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.53 | OpenJDK 8, 11, 17, 21, 23<br/>OpenJ9 8, 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
208-
| [Jetty](https://www.eclipse.org/jetty/) | 10.0.19, 11.0.19 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
209-
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 23<br/>OpenJ9 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
207+
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.53 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
208+
| [Jetty](https://www.eclipse.org/jetty/) | 10.0.19, 11.0.19 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
209+
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 25<br/>OpenJ9 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
210210
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
211211
| [Open Liberty](https://openliberty.io/) | 21.0.0.12, 22.0.0.12 | OpenJDK 8, 11, 17<br/>OpenJ9 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] |
212212
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
213213
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
214-
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
214+
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
215215
| [Tomcat](https://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
216-
| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.85 | OpenJDK 8, 11, 17, 21, 23<br/>OpenJ9 8, 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
217-
| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
216+
| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.85 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
217+
| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
218218
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
219-
| [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21, 23<br/>OpenJ9 8, 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
220-
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
219+
| [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21, 25<br/>OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
220+
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
221221
| [Websphere Traditional](https://www.ibm.com/uk-en/cloud/websphere-application-server) | 8.5.5.22, 9.0.5.14 | IBM JDK 8 | Red Hat Enterprise Linux 8.4 |
222222
| [WildFly](https://www.wildfly.org/) | 13.0.0.Final | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
223223
| [WildFly](https://www.wildfly.org/) | 17.0.1.Final, 21.0.0.Final | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
224-
| [WildFly](https://www.wildfly.org/) | 28.0.1.Final, 29.0.1.Final, 30.0.1.Final | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
224+
| [WildFly](https://www.wildfly.org/) | 28.0.1.Final, 29.0.1.Final, 30.0.1.Final | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
225225

226226
[`ubuntu-latest`]: https://github.com/actions/runner-images#available-images
227227
[`windows-latest`]: https://github.com/actions/runner-images#available-images

smoke-tests/images/servlet/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ val targets = mapOf(
4242
ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
4343
// Test application is not deployed when server is sarted with hotspot jdk version 21
4444
ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"),
45-
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21", latestJava), war = "servlet-5.0")
45+
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21"), war = "servlet-5.0")
4646
),
4747
"tomcat" to listOf(
4848
ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")),
@@ -63,12 +63,12 @@ val targets = mapOf(
6363
ImageTarget(
6464
listOf("17.0.1.Final", "21.0.0.Final"),
6565
listOf("hotspot", "openj9"),
66-
listOf("8", "11", "17", "21", latestJava)
66+
listOf("8", "11", "17", "21")
6767
),
6868
ImageTarget(
6969
listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
7070
listOf("hotspot", "openj9"),
71-
listOf("11", "17", "21", latestJava),
71+
listOf("11", "17", "21"),
7272
war = "servlet-5.0"
7373
),
7474
),

smoke-tests/src/main/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected void startEnvironment() {
3838
backend =
3939
new GenericContainer<>(
4040
DockerImageName.parse(
41-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20250811.16876216352"))
41+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
4242
.withExposedPorts(BACKEND_PORT)
4343
.withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
4444
.waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))

smoke-tests/src/main/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected void startEnvironment() {
7878
.getId();
7979

8080
String backendImageName =
81-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20250811.16876216352";
81+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20251006.18272043386";
8282
if (!imageExists(backendImageName)) {
8383
pullImage(backendImageName);
8484
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AgentDebugLoggingTest extends AbstractSmokeTest<Integer> {
1616
@Override
1717
protected void configure(SmokeTestOptions<Integer> options) {
1818
options
19-
.springBoot("20250915.17728045097")
19+
.springBoot("20251011.18424653812")
2020
.waitStrategy(
2121
new TargetWaitStrategy.Log(
2222
Duration.ofMinutes(1),

smoke-tests/src/test/java/io/opentelemetry/smoketest/CrashEarlyJdk8Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void setUp() {
4040
target =
4141
new GenericContainer<>(
4242
DockerImageName.parse(
43-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20240709.9848833570"))
43+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20251006.18272043367"))
4444
.withStartupTimeout(Duration.ofMinutes(5))
4545
.withLogConsumer(new Slf4jLogConsumer(logger))
4646
.withCopyFileToContainer(

smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest<Integer> {
2222
@Override
2323
protected void configure(SmokeTestOptions<Integer> options) {
2424
options
25-
.springBoot("20241021.11448062567")
25+
.springBoot("20251011.18424653812")
2626
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
2727
.extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));
2828
}
2929

3030
@ParameterizedTest
31-
@ValueSource(ints = {8, 11, 17})
31+
@ValueSource(ints = {8, 11, 17, 21, 25})
3232
void springBootSmokeTest(int jdk) {
3333
start(jdk);
3434

smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ protected void configure(SmokeTestOptions<Integer> options) {
2626
.image(
2727
jdk ->
2828
String.format(
29-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-20241021.11448062549",
29+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-20251009.18389598594",
3030
jdk))
3131
.waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Server started.*"));
3232
}
3333

3434
@ParameterizedTest
35-
@ValueSource(ints = {8, 11, 17, 21, 23})
35+
@ValueSource(ints = {8, 11, 17, 21, 25})
3636
void grpcSmokeTest(int jdk) {
3737
SmokeTestOutput output = start(jdk);
3838
ManagedChannel channel = null;

smoke-tests/src/test/java/io/opentelemetry/smoketest/IbmHttpsUrlConnectionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void setUp() {
4646
backend =
4747
new GenericContainer<>(
4848
DockerImageName.parse(
49-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20250811.16876216352"))
49+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
5050
.withExposedPorts(BACKEND_PORT)
5151
.withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
5252
.waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class LogsSmokeTest extends AbstractSmokeTest<Integer> {
1818

1919
@Override
2020
protected void configure(SmokeTestOptions<Integer> options) {
21-
options.springBoot("20211213.1570880324");
21+
options.springBoot("20251011.18424653812");
2222
}
2323

2424
@ParameterizedTest
25-
@ValueSource(ints = {8, 11, 17})
25+
@ValueSource(ints = {8, 11, 17, 21, 25})
2626
void shouldExportLogs(int jdk) {
2727
start(jdk);
2828
client().get("/greeting").aggregate().join();

0 commit comments

Comments
 (0)