open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Java 23 to smoke test matrix (#12451)

This commit is contained in:
Trask Stalnaker 2024-10-23 22:26:04 -07:00 committed by GitHub
parent e2dd703a8a
commit 54e142da2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 133 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-common.yml vendored
View File

@ -209,8 +209,6 @@ jobs:
- 3
exclude:
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
- test-java-version: 23
vm: openj9
fail-fast: false
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

48
docs/supported-libraries.md
View File

@ -186,26 +186,26 @@ These are the supported libraries and frameworks:
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<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21<br/>OpenJ9 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
| [Tomcat](http://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Tomcat](http://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [TomEE](https://tomee.apache.org/) | 8.0.16 | OpenJDK 8, 11, 17, 21<br/>OpenJ9 8, 11, 17, 21 | [`ubuntu-latest`], [`windows-latest`] |
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21<br/>OpenJ9 11, 17, 21 | [`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<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [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`] |
| Application server | Version | JVM | OS |
|---------------------------------------------------------------------------------------|------------------------------------------|--------------------------------------------------------|---------------------------------------|
| [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`] |
| [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`] |
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 23<br/>OpenJ9 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
| [Open Liberty](https://openliberty.io/) | 20.0.0.12 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Open Liberty](https://openliberty.io/) | 23.0.0.12 | OpenJDK 8, 11, 17, 20<br/>OpenJ9 8, 11, 17, 20 | [`ubuntu-latest`], [`windows-latest`] |
| [Payara](https://www.payara.fish/) | 5.2020.6, 5.2021.8 | OpenJDK 8, 11<br/>OpenJ9 8, 11 | [`ubuntu-latest`], [`windows-latest`] |
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
| [Tomcat](http://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Tomcat](http://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
| [TomEE](https://tomee.apache.org/) | 7.0.9, 7.1.4 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`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<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [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`] |
[`ubuntu-latest`]: https://github.com/actions/runner-images#available-images
[`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:
These are the JVMs and operating systems that the integration tests are run against:
| JVM | Versions | OS |
| ----------------------------------------------------------------------------------------- |-------------------| ------------------------------------- |
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17, 21, 22 | [`ubuntu-latest`], [`windows-latest`] |
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17, 21 | [`ubuntu-latest`] |
| JVM | Versions | OS |
|-------------------------------------------------------------------------------------------|-------------------|-------------------|
| [OpenJDK (Eclipse Temurin)](https://adoptium.net/) | 8, 11, 17, 21, 23 | [`ubuntu-latest`] |
| [OpenJ9 (IBM Semeru Runtimes)](https://developer.ibm.com/languages/java/semeru-runtimes/) | 8, 11, 17, 21, 23 | [`ubuntu-latest`] |
## Disabled instrumentations

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/AppServerTest.groovy
View File

@ -59,8 +59,8 @@ abstract class AppServerTest extends SmokeTest {
@Override
protected String getTargetImage(String jdk, String serverVersion, boolean windows) {
String platformSuffix = windows ? "-windows" : ""
String extraTag = "20240216.7928274208"
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix-$extraTag"
String extraTag = "-20241014.11321808438"
String fullSuffix = "${serverVersion}-jdk$jdk$platformSuffix$extraTag"
return getTargetImagePrefix() + ":" + fullSuffix
}

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/GrpcSmokeTest.groovy
View File

@ -23,7 +23,7 @@ import static java.util.stream.Collectors.toSet
class GrpcSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) {
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20230228.4289437270"
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk$jdk-20241021.11448062549"
}
@Override
@ -67,6 +67,6 @@ class GrpcSmokeTest extends SmokeTest {
channel.shutdown()
where:
jdk << [8, 11, 17, 19]
jdk << [8, 11, 17, 21, 23]
}
}

3
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettyJpmsSmokeTest.groovy
View File

@ -24,3 +24,6 @@ class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {
@AppServer(version = "11.0.19", jdk = "21")
class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {
}
@AppServer(version = "11.0.19", jdk = "23")
class Jetty11JpmsJdk23 extends JettyJpmsSmokeTest {
}

32
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
View File

@ -51,6 +51,14 @@ class Jetty9Jdk21 extends JettySmokeTest {
class Jetty9Jdk21Openj9 extends JettySmokeTest {
}
@AppServer(version = "9.4.53", jdk = "23")
class Jetty9Jdk23 extends JettySmokeTest {
}
@AppServer(version = "9.4.53", jdk = "23-openj9")
class Jetty9Jdk23Openj9 extends JettySmokeTest {
}
@AppServer(version = "10.0.19", jdk = "11")
class Jetty10Jdk11 extends JettySmokeTest {
}
@ -75,6 +83,14 @@ class Jetty10Jdk21 extends JettySmokeTest {
class Jetty10Jdk21Openj9 extends JettySmokeTest {
}
@AppServer(version = "10.0.19", jdk = "23")
class Jetty10Jdk23 extends JettySmokeTest {
}
@AppServer(version = "10.0.19", jdk = "23-openj9")
class Jetty10Jdk23Openj9 extends JettySmokeTest {
}
@AppServer(version = "11.0.19", jdk = "11")
class Jetty11Jdk11 extends JettySmokeTest {
}
@ -99,6 +115,14 @@ class Jetty11Jdk21 extends JettySmokeTest {
class Jetty11Jdk21Openj9 extends JettySmokeTest {
}
@AppServer(version = "11.0.19", jdk = "23")
class Jetty11Jdk23 extends JettySmokeTest {
}
@AppServer(version = "11.0.19", jdk = "23-openj9")
class Jetty11Jdk23Openj9 extends JettySmokeTest {
}
@AppServer(version = "12.0.6", jdk = "17")
class Jetty12Jdk17 extends JettySmokeTest {
}
@ -114,3 +138,11 @@ class Jetty12Jdk21 extends JettySmokeTest {
@AppServer(version = "12.0.6", jdk = "21-openj9")
class Jetty12Jdk21Openj9 extends JettySmokeTest {
}
@AppServer(version = "12.0.6", jdk = "23")
class Jetty12Jdk23 extends JettySmokeTest {
}
@AppServer(version = "12.0.6", jdk = "23-openj9")
class Jetty12Jdk23Openj9 extends JettySmokeTest {
}

2
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/PlaySmokeTest.groovy
View File

@ -17,7 +17,7 @@ import static io.opentelemetry.smoketest.TestContainerManager.useWindowsContaine
class PlaySmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) {
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$jdk-20241018.11404849345"
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk$jdk-20241022.11450623960"
}
@Override

4
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SecurityManagerSmokeTest.groovy
View File

@ -16,7 +16,7 @@ class SecurityManagerSmokeTest extends SmokeTest {
@Override
protected String getTargetImage(String jdk) {
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$jdk-20230323.4502979551"
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk$jdk-20241021.11448062560"
}
@Override
@ -37,6 +37,6 @@ class SecurityManagerSmokeTest extends SmokeTest {
stopTarget()
where:
jdk << [8, 11, 17, 19]
jdk << [8, 11, 17, 21, 23]
}
}

6
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootSmokeTest.groovy
View File

@ -21,7 +21,7 @@ import static java.util.stream.Collectors.toSet
class SpringBootSmokeTest extends SmokeTest {
protected String getTargetImage(String jdk) {
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20230920.6251727205"
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk$jdk-20241021.11448062567"
}
@Override
@ -105,12 +105,12 @@ class SpringBootSmokeTest extends SmokeTest {
.map { it.stringValue }
.findAny()
serviceVersion.isPresent()
serviceVersion.get() == "1.31.0-alpha-SNAPSHOT"
serviceVersion.get() == "2.10.0-alpha-SNAPSHOT"
cleanup:
stopTarget()
where:
jdk << [8, 11, 17, 19]
jdk << [8, 11, 17, 21, 23]
}
}

24
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomcatSmokeTest.groovy
View File

@ -64,6 +64,14 @@ class Tomcat8Jdk21 extends TomcatSmokeTest {
class Tomcat8Jdk21Openj9 extends TomcatSmokeTest {
}
@AppServer(version = "8.5.98", jdk = "23")
class Tomcat8Jdk23 extends TomcatSmokeTest {
}
@AppServer(version = "8.5.98", jdk = "23-openj9")
class Tomcat8Jdk23Openj9 extends TomcatSmokeTest {
}
@AppServer(version = "9.0.85", jdk = "8")
class Tomcat9Jdk8 extends TomcatSmokeTest {
}
@ -96,6 +104,14 @@ class Tomcat9Jdk21 extends TomcatSmokeTest {
class Tomcat9Jdk21Openj9 extends TomcatSmokeTest {
}
@AppServer(version = "9.0.85", jdk = "23")
class Tomcat9Jdk23 extends TomcatSmokeTest {
}
@AppServer(version = "9.0.85", jdk = "23-openj9")
class Tomcat9Jdk23Openj9 extends TomcatSmokeTest {
}
@AppServer(version = "10.1.18", jdk = "11")
class Tomcat10Jdk11 extends TomcatSmokeTest {
}
@ -119,3 +135,11 @@ class Tomcat10Jdk21 extends TomcatSmokeTest {
@AppServer(version = "10.1.18", jdk = "21-openj9")
class Tomcat10Jdk21Openj9 extends TomcatSmokeTest {
}
@AppServer(version = "10.1.18", jdk = "23")
class Tomcat10Jdk23 extends TomcatSmokeTest {
}
@AppServer(version = "10.1.18", jdk = "23-openj9")
class Tomcat10Jdk23Openj9 extends TomcatSmokeTest {
}

16
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/TomeeSmokeTest.groovy
View File

@ -76,6 +76,14 @@ class Tomee8Jdk21 extends TomeeSmokeTest {
class Tomee8Jdk21Openj9 extends TomeeSmokeTest {
}
@AppServer(version = "8.0.16", jdk = "23")
class Tomee8Jdk23 extends TomeeSmokeTest {
}
@AppServer(version = "8.0.16", jdk = "23-openj9")
class Tomee8Jdk23Openj9 extends TomeeSmokeTest {
}
@AppServer(version = "9.1.2", jdk = "11")
class Tomee9Jdk11 extends TomeeSmokeTest {
}
@ -99,3 +107,11 @@ class Tomee9Jdk21 extends TomeeSmokeTest {
@AppServer(version = "9.1.2", jdk = "21-openj9")
class Tomee9Jdk21Openj9 extends TomeeSmokeTest {
}
@AppServer(version = "9.1.2", jdk = "23")
class Tomee9Jdk23 extends TomeeSmokeTest {
}
@AppServer(version = "9.1.2", jdk = "23-openj9")
class Tomee9Jdk23Openj9 extends TomeeSmokeTest {
}

24
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/WildflySmokeTest.groovy
View File

@ -116,6 +116,14 @@ class Wildfly28Jdk21 extends WildflySmokeTest {
class Wildfly28Jdk21Openj9 extends WildflySmokeTest {
}
@AppServer(version = "28.0.1.Final", jdk = "23")
class Wildfly28Jdk23 extends WildflySmokeTest {
}
@AppServer(version = "28.0.1.Final", jdk = "23-openj9")
class Wildfly28Jdk23Openj9 extends WildflySmokeTest {
}
@AppServer(version = "29.0.1.Final", jdk = "11")
class Wildfly29Jdk11 extends WildflySmokeTest {
}
@ -140,6 +148,14 @@ class Wildfly29Jdk21 extends WildflySmokeTest {
class Wildfly29Jdk21Openj9 extends WildflySmokeTest {
}
@AppServer(version = "29.0.1.Final", jdk = "23")
class Wildfly29Jdk23 extends WildflySmokeTest {
}
@AppServer(version = "29.0.1.Final", jdk = "23-openj9")
class Wildfly29Jdk23Openj9 extends WildflySmokeTest {
}
@AppServer(version = "30.0.1.Final", jdk = "11")
class Wildfly30Jdk11 extends WildflySmokeTest {
}
@ -163,3 +179,11 @@ class Wildfly30Jdk21 extends WildflySmokeTest {
@AppServer(version = "30.0.1.Final", jdk = "21-openj9")
class Wildfly30Jdk21Openj9 extends WildflySmokeTest {
}
@AppServer(version = "30.0.1.Final", jdk = "23")
class Wildfly30Jdk23 extends WildflySmokeTest {
}
@AppServer(version = "30.0.1.Final", jdk = "23-openj9")
class Wildfly30Jdk23Openj9 extends WildflySmokeTest {
}