From 7cf562bb84dbafebce6e3e85953a9df3a5132baf Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 17 Oct 2025 23:23:54 +0300 Subject: [PATCH] Update spring boot smoke test image --- .../io/opentelemetry/smoketest/AgentDebugLoggingTest.java | 2 +- .../smoketest/DeclarativeConfigurationSmokeTest.java | 2 +- .../test/java/io/opentelemetry/smoketest/LogsSmokeTest.java | 2 +- .../io/opentelemetry/smoketest/PrometheusSmokeTest.java | 2 +- .../io/opentelemetry/smoketest/SdkDisabledSmokeTest.java | 2 +- .../opentelemetry/smoketest/SecurityManagerSmokeTest.java | 6 ++---- .../io/opentelemetry/smoketest/SpringBootSmokeTest.java | 6 ++---- .../smoketest/SpringBootWithSamplingSmokeTest.java | 2 +- .../smoketest/propagation/OtTracePropagationTest.java | 2 +- .../smoketest/propagation/PropagationTest.java | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java index e6e46687ffc6..7d6c91cdf075 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java @@ -16,7 +16,7 @@ class AgentDebugLoggingTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251011.18424653812") + .springBoot("20251017.18602659902") .waitStrategy( new TargetWaitStrategy.Log( Duration.ofMinutes(1), diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java index 553b4807330b..c1b7440aca8a 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java @@ -22,7 +22,7 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251011.18424653812") + .springBoot("20251017.18602659902") .env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml") .extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml")); } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java index a01908a20ba5..23671242e7bb 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java @@ -18,7 +18,7 @@ class LogsSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { - options.springBoot("20251011.18424653812"); + options.springBoot("20251017.18602659902"); } @ParameterizedTest diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java index 9460dd1b6533..ac72cb85aee9 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java @@ -20,7 +20,7 @@ class PrometheusSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251011.18424653812") + .springBoot("20251017.18602659902") .env("OTEL_METRICS_EXPORTER", "prometheus") .env("OTEL_EXPORTER_PROMETHEUS_PORT", String.valueOf(PROMETHEUS_PORT)) .extraPorts(PROMETHEUS_PORT); diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java index 5c24398ee724..3d24538e5b76 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java @@ -18,7 +18,7 @@ class SdkDisabledSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251011.18424653812") + .springBoot("20251017.18602659902") .env("OTEL_SDK_DISABLED", "true") .telemetryTimeout(Duration.ofSeconds(5)); } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java index 7c66b48ec5ef..679762d5601c 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java @@ -18,15 +18,13 @@ protected void configure(SmokeTestOptions options) { .image( jdk -> String.format( - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251009.18389598604", + "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251017.18602659887", jdk)) .env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true"); } @ParameterizedTest - // restore after image update - // @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25 - @ValueSource(ints = {8, 21}) // Security Manager removed in Java 25 + @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25 void securityManagerSmokeTest(int jdk) { start(jdk); testing.waitAndAssertTraces( diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java index 22c1bd820bf8..e52626454372 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java @@ -23,16 +23,14 @@ class SpringBootSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251013.18455512027") + .springBoot("20251017.18602659902") .setServiceName(false) .env("OTEL_METRICS_EXPORTER", "otlp") .env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar"); } @ParameterizedTest - // restore after image update - // @ValueSource(ints = {8, 11, 17, 21, 25}) - @ValueSource(ints = {8, 21, 25}) + @ValueSource(ints = {8, 11, 17, 21, 25}) void springBootSmokeTest(int jdk) { SmokeTestOutput output = start(jdk); diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.java index fac572efde65..386daf7fdc8f 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.java @@ -21,7 +21,7 @@ class SpringBootWithSamplingSmokeTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { options - .springBoot("20251011.18424653812") + .springBoot("20251017.18602659902") .env("OTEL_TRACES_SAMPLER", "parentbased_traceidratio") .env("OTEL_TRACES_SAMPLER_ARG", String.valueOf(SAMPLER_PROBABILITY)); } diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java index b491e9082cff..cf846786bfb6 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java @@ -18,7 +18,7 @@ class OtTracePropagationTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { - options.springBoot("20251011.18424653812").env("otel.propagators", "ottrace"); + options.springBoot("20251017.18602659902").env("otel.propagators", "ottrace"); } @Test diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java index 02a543cc0609..68b83f185e80 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java @@ -16,7 +16,7 @@ abstract class PropagationTest extends AbstractSmokeTest { @Override protected void configure(SmokeTestOptions options) { - options.springBoot("20251011.18424653812"); + options.springBoot("20251017.18602659902"); } @Test