Skip to content

Commit 54e142d

Browse files
trasktrask
authored
Add Java 23 to smoke test matrix (#12451)
1 parent e2dd703 commit 54e142d

File tree

12 files changed

+133
-36
lines changed

12 files changed

+133
-36
lines changed

‎.github/workflows/build-common.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ jobs:
209209
- 3
210210
exclude:
211211
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
212-
- test-java-version: 23
213-
vm: openj9
214212
fail-fast: false
215213
steps:
216214
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

‎docs/supported-libraries.md‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -186,26 +186,26 @@ These are the supported libraries and frameworks:
186186

187187
These are the application servers that the smoke tests are run against:
188188

189-
| Application server | Version | JVM | OS |
190-
|---------------------------------------------------------------------------------------|------------------------------------------|------------------------------------------------|---------------------------------------|
191-
| [Jetty](https://www.eclipse.org/jetty/) | 9.4.53 | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
192-
| [Jetty](https://www.eclipse.org/jetty/) | 10.0.19, 11.0.19 | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
193-
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21<br/>OpenJ9 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
194-
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
195-
| [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`] |
196-
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
197-
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
198-
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
199-
| [Tomcat](http://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
200-
| [Tomcat](http://tomcat.apache.org/) | 8.5.98, 9.0.85 | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
201-
| [Tomcat](http://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
202-
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
203-
| [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
204-
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
205-
| [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 |
206-
| [WildFly](https://www.wildfly.org/) | 13.0.0.Final | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
207-
| [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`] |
208-
| [WildFly](https://www.wildfly.org/) | 28.0.1.Final, 29.0.1.Final, 30.0.1.Final | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
189+
| Application server | Version | JVM | OS |
190+
|---------------------------------------------------------------------------------------|------------------------------------------|--------------------------------------------------------|---------------------------------------|
191+
| [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`] |
192+
| [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`] |
193+
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 23<br/>OpenJ9 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
194+
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
195+
| [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`] |
196+
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
197+
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
198+
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
199+
| [Tomcat](http://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
200+
| [Tomcat](http://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`] |
201+
| [Tomcat](http://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
202+
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
203+
| [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`] |
204+
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
205+
| [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 |
206+
| [WildFly](https://www.wildfly.org/) | 13.0.0.Final | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
207+
| [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`] |
208+
| [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`] |
209209

210210
[`ubuntu-latest`]: https://github.com/actions/runner-images#available-images
211211
[`windows-latest`]: https://github.com/actions/runner-images#available-images
@@ -214,10 +214,10 @@ These are the application servers that the smoke tests are run against:
214214

215215
These are the JVMs and operating systems that the integration tests are run against:
216216

217-
| JVM | Versions | OS |
218-
| ----------------------------------------------------------------------------------------- |-------------------| ------------------------------------- |
219-
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17, 21, 22 | [`ubuntu-latest`], [`windows-latest`] |
220-
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17, 21 | [`ubuntu-latest`] |
217+
| JVM | Versions | OS |
218+
|-------------------------------------------------------------------------------------------|-------------------|-------------------|
219+
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17, 21, 23 | [`ubuntu-latest`] |
220+
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17, 21, 23 | [`ubuntu-latest`] |
221221

222222
## Disabled instrumentations
223223

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ abstract class AppServerTest extends SmokeTest {
5959
@Override
6060
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
6161
String platformSuffix = windows ? "-windows" : ""
62-
String extraTag = "20240216.7928274208"
63-
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
62+
String extraTag = "-20241014.11321808438"
63+
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix$extraTag"
6464
return getTargetImagePrefix() + ":" + fullSuffix
6565
}
6666

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import static java.util.stream.Collectors.toSet
2323
class GrpcSmokeTest extends SmokeTest {
2424

2525
protected String getTargetImage(String jdk) {
26-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20230228.4289437270"
26+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20241021.11448062549"
2727
}
2828

2929
@Override
@@ -67,6 +67,6 @@ class GrpcSmokeTest extends SmokeTest {
6767
channel.shutdown()
6868

6969
where:
70-
jdk << [8, 11, 17, 19]
70+
jdk << [8, 11, 17, 21, 23]
7171
}
7272
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
2424
@AppServer(version = "11.0.19", jdk = "21")
2525
class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {
2626
}
27+
@AppServer(version = "11.0.19", jdk = "23")
28+
class Jetty11JpmsJdk23 extends JettyJpmsSmokeTest {
29+
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ class Jetty9Jdk21 extends JettySmokeTest {
5151
class Jetty9Jdk21Openj9 extends JettySmokeTest {
5252
}
5353

54+
@AppServer(version = "9.4.53", jdk = "23")
55+
class Jetty9Jdk23 extends JettySmokeTest {
56+
}
57+
58+
@AppServer(version = "9.4.53", jdk = "23-openj9")
59+
class Jetty9Jdk23Openj9 extends JettySmokeTest {
60+
}
61+
5462
@AppServer(version = "10.0.19", jdk = "11")
5563
class Jetty10Jdk11 extends JettySmokeTest {
5664
}
@@ -75,6 +83,14 @@ class Jetty10Jdk21 extends JettySmokeTest {
7583
class Jetty10Jdk21Openj9 extends JettySmokeTest {
7684
}
7785

86+
@AppServer(version = "10.0.19", jdk = "23")
87+
class Jetty10Jdk23 extends JettySmokeTest {
88+
}
89+
90+
@AppServer(version = "10.0.19", jdk = "23-openj9")
91+
class Jetty10Jdk23Openj9 extends JettySmokeTest {
92+
}
93+
7894
@AppServer(version = "11.0.19", jdk = "11")
7995
class Jetty11Jdk11 extends JettySmokeTest {
8096
}
@@ -99,6 +115,14 @@ class Jetty11Jdk21 extends JettySmokeTest {
99115
class Jetty11Jdk21Openj9 extends JettySmokeTest {
100116
}
101117

118+
@AppServer(version = "11.0.19", jdk = "23")
119+
class Jetty11Jdk23 extends JettySmokeTest {
120+
}
121+
122+
@AppServer(version = "11.0.19", jdk = "23-openj9")
123+
class Jetty11Jdk23Openj9 extends JettySmokeTest {
124+
}
125+
102126
@AppServer(version = "12.0.6", jdk = "17")
103127
class Jetty12Jdk17 extends JettySmokeTest {
104128
}
@@ -114,3 +138,11 @@ class Jetty12Jdk21 extends JettySmokeTest {
114138
@AppServer(version = "12.0.6", jdk = "21-openj9")
115139
class Jetty12Jdk21Openj9 extends JettySmokeTest {
116140
}
141+
142+
@AppServer(version = "12.0.6", jdk = "23")
143+
class Jetty12Jdk23 extends JettySmokeTest {
144+
}
145+
146+
@AppServer(version = "12.0.6", jdk = "23-openj9")
147+
class Jetty12Jdk23Openj9 extends JettySmokeTest {
148+
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContaine
1717
class PlaySmokeTest extends SmokeTest {
1818

1919
protected String getTargetImage(String jdk) {
20-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$jdk-20241018.11404849345"
20+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$jdk-20241022.11450623960"
2121
}
2222

2323
@Override

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SecurityManagerSmokeTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class SecurityManagerSmokeTest extends SmokeTest {
1616

1717
@Override
1818
protected String getTargetImage(String jdk) {
19-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$jdk-20230323.4502979551"
19+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$jdk-20241021.11448062560"
2020
}
2121

2222
@Override
@@ -37,6 +37,6 @@ class SecurityManagerSmokeTest extends SmokeTest {
3737
stopTarget()
3838

3939
where:
40-
jdk << [8, 11, 17, 19]
40+
jdk << [8, 11, 17, 21, 23]
4141
}
4242
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet
2121
class SpringBootSmokeTest extends SmokeTest {
2222

2323
protected String getTargetImage(String jdk) {
24-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20230920.6251727205"
24+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20241021.11448062567"
2525
}
2626

2727
@Override
@@ -105,12 +105,12 @@ class SpringBootSmokeTest extends SmokeTest {
105105
.map { it.stringValue }
106106
.findAny()
107107
serviceVersion.isPresent()
108-
serviceVersion.get() == "1.31.0-alpha-SNAPSHOT"
108+
serviceVersion.get() == "2.10.0-alpha-SNAPSHOT"
109109

110110
cleanup:
111111
stopTarget()
112112

113113
where:
114-
jdk << [8, 11, 17, 19]
114+
jdk << [8, 11, 17, 21, 23]
115115
}
116116
}

‎smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ class Tomcat8Jdk21 extends TomcatSmokeTest {
6464
class Tomcat8Jdk21Openj9 extends TomcatSmokeTest {
6565
}
6666

67+
@AppServer(version = "8.5.98", jdk = "23")
68+
class Tomcat8Jdk23 extends TomcatSmokeTest {
69+
}
70+
71+
@AppServer(version = "8.5.98", jdk = "23-openj9")
72+
class Tomcat8Jdk23Openj9 extends TomcatSmokeTest {
73+
}
74+
6775
@AppServer(version = "9.0.85", jdk = "8")
6876
class Tomcat9Jdk8 extends TomcatSmokeTest {
6977
}
@@ -96,6 +104,14 @@ class Tomcat9Jdk21 extends TomcatSmokeTest {
96104
class Tomcat9Jdk21Openj9 extends TomcatSmokeTest {
97105
}
98106

107+
@AppServer(version = "9.0.85", jdk = "23")
108+
class Tomcat9Jdk23 extends TomcatSmokeTest {
109+
}
110+
111+
@AppServer(version = "9.0.85", jdk = "23-openj9")
112+
class Tomcat9Jdk23Openj9 extends TomcatSmokeTest {
113+
}
114+
99115
@AppServer(version = "10.1.18", jdk = "11")
100116
class Tomcat10Jdk11 extends TomcatSmokeTest {
101117
}
@@ -119,3 +135,11 @@ class Tomcat10Jdk21 extends TomcatSmokeTest {
119135
@AppServer(version = "10.1.18", jdk = "21-openj9")
120136
class Tomcat10Jdk21Openj9 extends TomcatSmokeTest {
121137
}
138+
139+
@AppServer(version = "10.1.18", jdk = "23")
140+
class Tomcat10Jdk23 extends TomcatSmokeTest {
141+
}
142+
143+
@AppServer(version = "10.1.18", jdk = "23-openj9")
144+
class Tomcat10Jdk23Openj9 extends TomcatSmokeTest {
145+
}

0 commit comments

Comments
 (0)