Skip to content

Commit eda42a5

Browse files
authored
Update spring boot smoke test image (#15039)
1 parent 01e8e96 commit eda42a5

File tree

10 files changed

+12
-16
lines changed

10 files changed

+12
-16
lines changed

smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AgentDebugLoggingTest extends AbstractSmokeTest<Integer> {
1616
@Override
1717
protected void configure(SmokeTestOptions<Integer> options) {
1818
options
19-
.springBoot("20251011.18424653812")
19+
.springBoot("20251017.18602659902")
2020
.waitStrategy(
2121
new TargetWaitStrategy.Log(
2222
Duration.ofMinutes(1),

smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest<Integer> {
2222
@Override
2323
protected void configure(SmokeTestOptions<Integer> options) {
2424
options
25-
.springBoot("20251011.18424653812")
25+
.springBoot("20251017.18602659902")
2626
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
2727
.extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));
2828
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class LogsSmokeTest extends AbstractSmokeTest<Integer> {
1818

1919
@Override
2020
protected void configure(SmokeTestOptions<Integer> options) {
21-
options.springBoot("20251011.18424653812");
21+
options.springBoot("20251017.18602659902");
2222
}
2323

2424
@ParameterizedTest

smoke-tests/src/test/java/io/opentelemetry/smoketest/PrometheusSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PrometheusSmokeTest extends AbstractSmokeTest<Integer> {
2020
@Override
2121
protected void configure(SmokeTestOptions<Integer> options) {
2222
options
23-
.springBoot("20251011.18424653812")
23+
.springBoot("20251017.18602659902")
2424
.env("OTEL_METRICS_EXPORTER", "prometheus")
2525
.env("OTEL_EXPORTER_PROMETHEUS_PORT", String.valueOf(PROMETHEUS_PORT))
2626
.extraPorts(PROMETHEUS_PORT);

smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class SdkDisabledSmokeTest extends AbstractSmokeTest<Integer> {
1818
@Override
1919
protected void configure(SmokeTestOptions<Integer> options) {
2020
options
21-
.springBoot("20251011.18424653812")
21+
.springBoot("20251017.18602659902")
2222
.env("OTEL_SDK_DISABLED", "true")
2323
.telemetryTimeout(Duration.ofSeconds(5));
2424
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ protected void configure(SmokeTestOptions<Integer> options) {
1818
.image(
1919
jdk ->
2020
String.format(
21-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251009.18389598604",
21+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251017.18602659887",
2222
jdk))
2323
.env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true");
2424
}
2525

2626
@ParameterizedTest
27-
// restore after image update
28-
// @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
29-
@ValueSource(ints = {8, 21}) // Security Manager removed in Java 25
27+
@ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
3028
void securityManagerSmokeTest(int jdk) {
3129
start(jdk);
3230
testing.waitAndAssertTraces(

smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,14 @@ class SpringBootSmokeTest extends AbstractSmokeTest<Integer> {
2323
@Override
2424
protected void configure(SmokeTestOptions<Integer> options) {
2525
options
26-
.springBoot("20251013.18455512027")
26+
.springBoot("20251017.18602659902")
2727
.setServiceName(false)
2828
.env("OTEL_METRICS_EXPORTER", "otlp")
2929
.env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar");
3030
}
3131

3232
@ParameterizedTest
33-
// restore after image update
34-
// @ValueSource(ints = {8, 11, 17, 21, 25})
35-
@ValueSource(ints = {8, 21, 25})
33+
@ValueSource(ints = {8, 11, 17, 21, 25})
3634
void springBootSmokeTest(int jdk) {
3735
SmokeTestOutput output = start(jdk);
3836

smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SpringBootWithSamplingSmokeTest extends AbstractSmokeTest<Integer> {
2121
@Override
2222
protected void configure(SmokeTestOptions<Integer> options) {
2323
options
24-
.springBoot("20251011.18424653812")
24+
.springBoot("20251017.18602659902")
2525
.env("OTEL_TRACES_SAMPLER", "parentbased_traceidratio")
2626
.env("OTEL_TRACES_SAMPLER_ARG", String.valueOf(SAMPLER_PROBABILITY));
2727
}

smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class OtTracePropagationTest extends AbstractSmokeTest<Integer> {
1818

1919
@Override
2020
protected void configure(SmokeTestOptions<Integer> options) {
21-
options.springBoot("20251011.18424653812").env("otel.propagators", "ottrace");
21+
options.springBoot("20251017.18602659902").env("otel.propagators", "ottrace");
2222
}
2323

2424
@Test

smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class PropagationTest extends AbstractSmokeTest<Integer> {
1616

1717
@Override
1818
protected void configure(SmokeTestOptions<Integer> options) {
19-
options.springBoot("20251011.18424653812");
19+
options.springBoot("20251017.18602659902");
2020
}
2121

2222
@Test

0 commit comments

Comments
 (0)