Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions docs/supported-libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,24 +204,24 @@ 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, 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`] |
| [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`] |
| [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`] |
| [Jetty](https://www.eclipse.org/jetty/) | 12.0.6 | OpenJDK 17, 21, 25<br/>OpenJ9 17, 21, 25 | [`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`] |
| [Payara](https://www.payara.fish/) | 6.2023.12 | OpenJDK 11, 17<br/>OpenJ9 11, 17, 21, 25 | [`ubuntu-latest`], [`windows-latest`] |
| [Tomcat](https://tomcat.apache.org/) | 7.0.109 | OpenJDK 8<br/>OpenJ9 8 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 23<br/>OpenJ9 11, 17, 21, 23 | [`ubuntu-latest`], [`windows-latest`] |
| [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`] |
| [Tomcat](https://tomcat.apache.org/) | 10.1.18 | OpenJDK 11, 17, 21, 25<br/>OpenJ9 11, 17, 21, 25 | [`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`] |
| [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`] |
| [TomEE](https://tomee.apache.org/) | 9.1.2 | OpenJDK 11, 17, 21, 25<br/>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<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`] |
| [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`] |

[`ubuntu-latest`]: https://github.com/actions/runner-images#available-images
[`windows-latest`]: https://github.com/actions/runner-images#available-images
Expand Down
6 changes: 3 additions & 3 deletions smoke-tests/images/servlet/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ val targets = mapOf(
ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
// Test application is not deployed when server is sarted with hotspot jdk version 21
ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"),
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21", latestJava), war = "servlet-5.0")
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21"), war = "servlet-5.0")
),
"tomcat" to listOf(
ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")),
Expand All @@ -63,12 +63,12 @@ val targets = mapOf(
ImageTarget(
listOf("17.0.1.Final", "21.0.0.Final"),
listOf("hotspot", "openj9"),
listOf("8", "11", "17", "21", latestJava)
listOf("8", "11", "17", "21")
),
ImageTarget(
listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
listOf("hotspot", "openj9"),
listOf("11", "17", "21", latestJava),
listOf("11", "17", "21"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these older app server versions fail with Java 25, I'll follow-up with a PR to add a newer version of the app servers that support Java 25

war = "servlet-5.0"
),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected void startEnvironment() {
backend =
new GenericContainer<>(
DockerImageName.parse(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20250811.16876216352"))
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
.withExposedPorts(BACKEND_PORT)
.withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
.waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ protected void startEnvironment() {
.getId();

String backendImageName =
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20250811.16876216352";
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20251006.18272043386";
if (!imageExists(backendImageName)) {
pullImage(backendImageName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AgentDebugLoggingTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20250915.17728045097")
.springBoot("20251011.18424653812")
.waitStrategy(
new TargetWaitStrategy.Log(
Duration.ofMinutes(1),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void setUp() {
target =
new GenericContainer<>(
DockerImageName.parse(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20240709.9848833570"))
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20251006.18272043367"))
.withStartupTimeout(Duration.ofMinutes(5))
.withLogConsumer(new Slf4jLogConsumer(logger))
.withCopyFileToContainer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20241021.11448062567")
.springBoot("20251011.18424653812")
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
.extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17})
@ValueSource(ints = {8, 11, 17, 21, 25})
void springBootSmokeTest(int jdk) {
start(jdk);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ protected void configure(SmokeTestOptions<Integer> options) {
.image(
jdk ->
String.format(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-20241021.11448062549",
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-20251009.18389598594",
jdk))
.waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Server started.*"));
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17, 21, 23})
@ValueSource(ints = {8, 11, 17, 21, 25})
void grpcSmokeTest(int jdk) {
SmokeTestOutput output = start(jdk);
ManagedChannel channel = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void setUp() {
backend =
new GenericContainer<>(
DockerImageName.parse(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20250811.16876216352"))
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
.withExposedPorts(BACKEND_PORT)
.withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
.waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ class LogsSmokeTest extends AbstractSmokeTest<Integer> {

@Override
protected void configure(SmokeTestOptions<Integer> options) {
options.springBoot("20211213.1570880324");
options.springBoot("20251011.18424653812");
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17})
@ValueSource(ints = {8, 11, 17, 21, 25})
void shouldExportLogs(int jdk) {
start(jdk);
client().get("/greeting").aggregate().join();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ protected void configure(SmokeTestOptions<Integer> options) {
.image(
jdk ->
String.format(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk%s-20241022.11450623960",
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk%s-20251009.18389598601",
jdk))
.waitStrategy(
new TargetWaitStrategy.Log(java.time.Duration.ofMinutes(1), ".*Listening for HTTP.*"));
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17, 21})
@ValueSource(ints = {8, 11, 17, 21, 25})
void playSmokeTest(int jdk) {
start(jdk);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ class PrometheusSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20211213.1570880324")
.springBoot("20251011.18424653812")
.env("OTEL_METRICS_EXPORTER", "prometheus")
.env("OTEL_EXPORTER_PROMETHEUS_PORT", String.valueOf(PROMETHEUS_PORT))
.extraPorts(PROMETHEUS_PORT);
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17})
@ValueSource(ints = {8, 11, 17, 21, 25})
void shouldExportMetrics(int jdk) {
start(jdk);
client().get("/greeting").aggregate().join();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ protected void configure(SmokeTestOptions<Integer> options) {
.image(
jdk ->
String.format(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk%s-20250915.17728045126",
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk%s-20251009.18389598609",
jdk))
.waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*"))
.setServiceName(false);
}

@ParameterizedTest
@ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
@ValueSource(ints = {17, 21, 25}) // Quarkus 3.7+ requires Java 17+
void quarkusSmokeTest(int jdk) {
start(jdk);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ class SdkDisabledSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20211213.1570880324")
.springBoot("20251011.18424653812")
.env("OTEL_SDK_DISABLED", "true")
.telemetryTimeout(Duration.ofSeconds(5));
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17})
@ValueSource(ints = {8, 11, 17, 21, 25})
void noopSdkSmokeTest(int jdk) {
SmokeTestOutput output = start(jdk);
assertThat(client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ protected void configure(SmokeTestOptions<Integer> options) {
.image(
jdk ->
String.format(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20250915.17728045123",
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251009.18389598604",
jdk))
.env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true");
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17, 21, 23})
@ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
void securityManagerSmokeTest(int jdk) {
start(jdk);
testing.waitAndAssertTraces(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ class SpringBootSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20241021.11448062567")
.springBoot("20251011.18424653812")
.setServiceName(false)
.env("OTEL_METRICS_EXPORTER", "otlp")
.env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar");
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17, 21, 23})
@ValueSource(ints = {8, 11, 17, 21, 25})
void springBootSmokeTest(int jdk) {
SmokeTestOutput output = start(jdk);

Expand Down Expand Up @@ -60,7 +60,7 @@ void springBootSmokeTest(int jdk) {
ServiceAttributes.SERVICE_NAME, "otel-spring-test-app")
.hasAttribute(
ServiceAttributes.SERVICE_VERSION,
"2.10.0-alpha-SNAPSHOT")),
"2.21.0-alpha-SNAPSHOT")),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sent #14958 to avoid needing to bump this going forward

span -> span.hasName("WebController.withSpan")));

// Check agent version is logged on startup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ class SpringBootWithSamplingSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20211213.1570880324")
.springBoot("20251011.18424653812")
.env("OTEL_TRACES_SAMPLER", "parentbased_traceidratio")
.env("OTEL_TRACES_SAMPLER_ARG", String.valueOf(SAMPLER_PROBABILITY));
}

@ParameterizedTest
@ValueSource(ints = {8, 11, 17})
@ValueSource(ints = {8, 11, 17, 21, 25})
void springBootWithProbabilitySamplingEnabled(int jdk) {
start(jdk);
for (int i = 1; i <= NUM_TRIES; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void afterAll() {
static Function<AppServerImage, String> appServerImage(String targetImagePrefix) {
return a -> {
String platformSuffix = a.isWindows() ? "-windows" : "";
String extraTag = "-20241014.11321808438";
String extraTag = "-20251010.18403014526";
String fullSuffix = a.getServerVersion() + "-jdk" + a.getJdk() + platformSuffix + extraTag;
return targetImagePrefix + ":" + fullSuffix;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ static class Jetty11JpmsJdk17 extends JettyJpmsSmokeTest {}
@AppServer(version = "11.0.19", jdk = "21")
static class Jetty11JpmsJdk21 extends JettyJpmsSmokeTest {}

@AppServer(version = "11.0.19", jdk = "23")
static class Jetty11JpmsJdk23 extends JettyJpmsSmokeTest {}
@AppServer(version = "11.0.19", jdk = "25")
static class Jetty11JpmsJdk25 extends JettyJpmsSmokeTest {}
}
Loading