From fe6f4535af7429c239a4849b23f0024b48a93551 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Oct 2025 09:34:19 -0700 Subject: [PATCH 1/2] Update app server patch versions that are tested --- docs/supported-libraries.md | 12 ++++++------ .../smoketest/appserver/AppServerTest.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/supported-libraries.md b/docs/supported-libraries.md index e36c9a0e336d..641580e5bc71 100644 --- a/docs/supported-libraries.md +++ b/docs/supported-libraries.md @@ -204,20 +204,20 @@ These are the application servers that the smoke tests are run against: | Application server | Version | JVM | OS | |---------------------------------------------------------------------------------------|------------------------------------------|--------------------------------------------------------|---------------------------------------| -| [Jetty](https://www.eclipse.org/jetty/) | 9.4.53 | OpenJDK 8, 11, 17, 21, 25
OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | -| [Jetty](https://www.eclipse.org/jetty/) | 10.0.19, 11.0.19 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | -| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 25
OpenJ9 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [Jetty](https://www.eclipse.org/jetty/) | 9.4.58 | OpenJDK 8, 11, 17, 21, 25
OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [Jetty](https://www.eclipse.org/jetty/) | 10.0.26, 11.0.26 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [Jetty](https://www.eclipse.org/jetty/) | 12.0.28 | OpenJDK 17, 21, 25
OpenJ9 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | | [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11
OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] | | [Open Liberty](https://openliberty.io/) | 21.0.0.12, 22.0.0.12 | OpenJDK 8, 11, 17
OpenJ9 8, 11, 17 | [`ubuntu-latest`], [`windows-latest`] | | [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20
OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] | | [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11
OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] | | [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | | [Tomcat](https://tomcat.apache.org/) | 7.0.109 | OpenJDK 8
OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] | -| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.85 | OpenJDK 8, 11, 17, 21, 25
OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | -| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [Tomcat](https://tomcat.apache.org/) | 8.5.98, 9.0.111 | OpenJDK 8, 11, 17, 21, 25
OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [Tomcat](https://tomcat.apache.org/) | 10.1.48 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | | [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8
OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] | | [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21, 25
OpenJ9 8, 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | -| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | +| [TomEE](https://tomee.apache.org/) | 9.1.3 | OpenJDK 11, 17, 21, 25
OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] | | [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 | | [WildFly](https://www.wildfly.org/) | 13.0.0.Final | OpenJDK 8
OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] | | [WildFly](https://www.wildfly.org/) | 17.0.1.Final, 21.0.0.Final | OpenJDK 8, 11, 17, 21
OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] | diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java index 54267d4be398..a9f4809570f5 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/AppServerTest.java @@ -64,7 +64,7 @@ void afterAll() { static Function appServerImage(String targetImagePrefix) { return a -> { String platformSuffix = a.isWindows() ? "-windows" : ""; - String extraTag = "-20251010.18403014526"; + String extraTag = "-20251014.18508284308"; String fullSuffix = a.getServerVersion() + "-jdk" + a.getJdk() + platformSuffix + extraTag; return targetImagePrefix + ":" + fullSuffix; }; From 9a33c47627f9adc2c25d9c41696eafa7578eed99 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 15 Oct 2025 10:54:39 -0700 Subject: [PATCH 2/2] update --- .../appserver/JettyJpmsSmokeTest.java | 8 +-- .../smoketest/appserver/JettySmokeTest.java | 64 +++++++++---------- .../smoketest/appserver/TomcatSmokeTest.java | 36 +++++------ .../smoketest/appserver/TomeeSmokeTest.java | 16 ++--- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettyJpmsSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettyJpmsSmokeTest.java index 4625711b2321..1a1a0cef549d 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettyJpmsSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettyJpmsSmokeTest.java @@ -14,15 +14,15 @@ protected void configure(SmokeTestOptions options) { JettySmokeTest.configureOptions(options).command("java", "-jar", "/server/start.jar", "--jpms"); } - @AppServer(version = "11.0.19", jdk = "11") + @AppServer(version = "11.0.26", jdk = "11") static class Jetty11JpmsJdk11 extends JettyJpmsSmokeTest {} - @AppServer(version = "11.0.19", jdk = "17") + @AppServer(version = "11.0.26", jdk = "17") static class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {} - @AppServer(version = "11.0.19", jdk = "21") + @AppServer(version = "11.0.26", jdk = "21") static class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {} - @AppServer(version = "11.0.19", jdk = "25") + @AppServer(version = "11.0.26", jdk = "25") static class Jetty11JpmsJdk25 extends JettyJpmsSmokeTest {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettySmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettySmokeTest.java index 48e11a241972..44cdf00a35d0 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettySmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/JettySmokeTest.java @@ -25,99 +25,99 @@ static SmokeTestOptions configureOptions( .waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Started Server.*")); } - @AppServer(version = "9.4.53", jdk = "8") + @AppServer(version = "9.4.58", jdk = "8") static class Jetty9Jdk8 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "8-openj9") + @AppServer(version = "9.4.58", jdk = "8-openj9") static class Jetty9Jdk8Openj9 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "11") + @AppServer(version = "9.4.58", jdk = "11") static class Jetty9Jdk11 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "11-openj9") + @AppServer(version = "9.4.58", jdk = "11-openj9") static class Jetty9Jdk11Openj9 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "17") + @AppServer(version = "9.4.58", jdk = "17") static class Jetty9Jdk17 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "17-openj9") + @AppServer(version = "9.4.58", jdk = "17-openj9") static class Jetty9Jdk17Openj9 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "21") + @AppServer(version = "9.4.58", jdk = "21") static class Jetty9Jdk21 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "21-openj9") + @AppServer(version = "9.4.58", jdk = "21-openj9") static class Jetty9Jdk21Openj9 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "25") + @AppServer(version = "9.4.58", jdk = "25") static class Jetty9Jdk25 extends JettySmokeTest {} - @AppServer(version = "9.4.53", jdk = "25-openj9") + @AppServer(version = "9.4.58", jdk = "25-openj9") static class Jetty9Jdk25Openj9 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "11") + @AppServer(version = "10.0.26", jdk = "11") static class Jetty10Jdk11 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "11-openj9") + @AppServer(version = "10.0.26", jdk = "11-openj9") static class Jetty10Jdk11Openj9 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "17") + @AppServer(version = "10.0.26", jdk = "17") static class Jetty10Jdk17 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "17-openj9") + @AppServer(version = "10.0.26", jdk = "17-openj9") static class Jetty10Jdk17Openj9 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "21") + @AppServer(version = "10.0.26", jdk = "21") static class Jetty10Jdk21 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "21-openj9") + @AppServer(version = "10.0.26", jdk = "21-openj9") static class Jetty10Jdk21Openj9 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "25") + @AppServer(version = "10.0.26", jdk = "25") static class Jetty10Jdk25 extends JettySmokeTest {} - @AppServer(version = "10.0.19", jdk = "25-openj9") + @AppServer(version = "10.0.26", jdk = "25-openj9") static class Jetty10Jdk25Openj9 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "11") + @AppServer(version = "11.0.26", jdk = "11") static class Jetty11Jdk11 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "11-openj9") + @AppServer(version = "11.0.26", jdk = "11-openj9") static class Jetty11Jdk11Openj9 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "17") + @AppServer(version = "11.0.26", jdk = "17") static class Jetty11Jdk17 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "17-openj9") + @AppServer(version = "11.0.26", jdk = "17-openj9") static class Jetty11Jdk17Openj9 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "21") + @AppServer(version = "11.0.26", jdk = "21") static class Jetty11Jdk21 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "21-openj9") + @AppServer(version = "11.0.26", jdk = "21-openj9") static class Jetty11Jdk21Openj9 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "25") + @AppServer(version = "11.0.26", jdk = "25") static class Jetty11Jdk25 extends JettySmokeTest {} - @AppServer(version = "11.0.19", jdk = "25-openj9") + @AppServer(version = "11.0.26", jdk = "25-openj9") static class Jetty11Jdk25Openj9 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "17") + @AppServer(version = "12.0.28", jdk = "17") static class Jetty12Jdk17 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "17-openj9") + @AppServer(version = "12.0.28", jdk = "17-openj9") static class Jetty12Jdk17Openj9 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "21") + @AppServer(version = "12.0.28", jdk = "21") static class Jetty12Jdk21 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "21-openj9") + @AppServer(version = "12.0.28", jdk = "21-openj9") static class Jetty12Jdk21Openj9 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "25") + @AppServer(version = "12.0.28", jdk = "25") static class Jetty12Jdk25 extends JettySmokeTest {} - @AppServer(version = "12.0.6", jdk = "25-openj9") + @AppServer(version = "12.0.28", jdk = "25-openj9") static class Jetty12Jdk25Openj9 extends JettySmokeTest {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomcatSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomcatSmokeTest.java index 0320686c260a..c233f65d13df 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomcatSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomcatSmokeTest.java @@ -61,57 +61,57 @@ static class Tomcat8Jdk25 extends TomcatSmokeTest {} @AppServer(version = "8.5.98", jdk = "25-openj9") static class Tomcat8Jdk25Openj9 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "8") + @AppServer(version = "9.0.111", jdk = "8") static class Tomcat9Jdk8 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "8-openj9") + @AppServer(version = "9.0.111", jdk = "8-openj9") static class Tomcat9Jdk8Openj9 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "11") + @AppServer(version = "9.0.111", jdk = "11") static class Tomcat9Jdk11 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "11-openj9") + @AppServer(version = "9.0.111", jdk = "11-openj9") static class Tomcat9Jdk11Openj9 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "17") + @AppServer(version = "9.0.111", jdk = "17") static class Tomcat9Jdk17 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "17-openj9") + @AppServer(version = "9.0.111", jdk = "17-openj9") static class Tomcat9Jdk17Openj9 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "21") + @AppServer(version = "9.0.111", jdk = "21") static class Tomcat9Jdk21 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "21-openj9") + @AppServer(version = "9.0.111", jdk = "21-openj9") static class Tomcat9Jdk21Openj9 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "25") + @AppServer(version = "9.0.111", jdk = "25") static class Tomcat9Jdk25 extends TomcatSmokeTest {} - @AppServer(version = "9.0.85", jdk = "25-openj9") + @AppServer(version = "9.0.111", jdk = "25-openj9") static class Tomcat9Jdk25Openj9 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "11") + @AppServer(version = "10.1.48", jdk = "11") static class Tomcat10Jdk11 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "11-openj9") + @AppServer(version = "10.1.48", jdk = "11-openj9") static class Tomcat10Jdk11Openj9 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "17") + @AppServer(version = "10.1.48", jdk = "17") static class Tomcat10Jdk17 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "17-openj9") + @AppServer(version = "10.1.48", jdk = "17-openj9") static class Tomcat10Jdk17Openj9 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "21") + @AppServer(version = "10.1.48", jdk = "21") static class Tomcat10Jdk21 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "21-openj9") + @AppServer(version = "10.1.48", jdk = "21-openj9") static class Tomcat10Jdk21Openj9 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "25") + @AppServer(version = "10.1.48", jdk = "25") static class Tomcat10Jdk25 extends TomcatSmokeTest {} - @AppServer(version = "10.1.18", jdk = "25-openj9") + @AppServer(version = "10.1.48", jdk = "25-openj9") static class Tomcat10Jdk25Openj9 extends TomcatSmokeTest {} } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomeeSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomeeSmokeTest.java index eb056526daf3..72c558965254 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomeeSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/appserver/TomeeSmokeTest.java @@ -70,27 +70,27 @@ static class Tomee8Jdk25 extends TomeeSmokeTest {} @AppServer(version = "8.0.16", jdk = "25-openj9") static class Tomee8Jdk25Openj9 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "11") + @AppServer(version = "9.1.3", jdk = "11") static class Tomee9Jdk11 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "11-openj9") + @AppServer(version = "9.1.3", jdk = "11-openj9") static class Tomee9Jdk11Openj9 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "17") + @AppServer(version = "9.1.3", jdk = "17") static class Tomee9Jdk17 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "17-openj9") + @AppServer(version = "9.1.3", jdk = "17-openj9") static class Tomee9Jdk17Openj9 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "21") + @AppServer(version = "9.1.3", jdk = "21") static class Tomee9Jdk21 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "21-openj9") + @AppServer(version = "9.1.3", jdk = "21-openj9") static class Tomee9Jdk21Openj9 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "25") + @AppServer(version = "9.1.3", jdk = "25") static class Tomee9Jdk25 extends TomeeSmokeTest {} - @AppServer(version = "9.1.2", jdk = "25-openj9") + @AppServer(version = "9.1.3", jdk = "25-openj9") static class Tomee9Jdk25Openj9 extends TomeeSmokeTest {} }