Bump smoke test images

trask · trask · commit fcdada7929dd · 2025-11-17T14:16:14.000-08:00
diff --git a/smoke-tests/src/main/java/io/opentelemetry/smoketest/ImageVersions.java b/smoke-tests/src/main/java/io/opentelemetry/smoketest/ImageVersions.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.smoketest;
+
+// TODO configure renovate to update these versions
+public final class ImageVersions {
+
+  public static final String FAKE_BACKEND_VERSION = "20251117.19421579342";
+
+  public static final String FAKE_BACKEND_WINDOWS_VERSION = "20251117.19421579342";
+
+  private ImageVersions() {}
+}
diff --git a/smoke-tests/src/main/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java b/smoke-tests/src/main/java/io/opentelemetry/smoketest/LinuxTestContainerManager.java
@@ -38,7 +38,8 @@ protected void startEnvironment() {
     backend =
         new GenericContainer<>(
                 DockerImageName.parse(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:"
+                        + ImageVersions.FAKE_BACKEND_VERSION))
             .withExposedPorts(BACKEND_PORT)
             .withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
             .waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))
diff --git a/smoke-tests/src/main/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java b/smoke-tests/src/main/java/io/opentelemetry/smoketest/windows/WindowsTestContainerManager.java
@@ -78,7 +78,8 @@ protected void startEnvironment() {
             .getId();
 
     String backendImageName =
-        "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20251006.18272043386";
+        "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:"
+            + ImageVersions.FAKE_BACKEND_WINDOWS_VERSION;
     if (!imageExists(backendImageName)) {
       pullImage(backendImageName);
     }
diff --git 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<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .waitStrategy(
             new TargetWaitStrategy.Log(
                 Duration.ofMinutes(1),
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/CrashEarlyJdk8Test.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/CrashEarlyJdk8Test.java
@@ -40,7 +40,8 @@ void setUp() {
     target =
         new GenericContainer<>(
                 DockerImageName.parse(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:20251006.18272043367"))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-zulu-openjdk-8u31:"
+                        + ImageVersions.ZULU_OPENJDK_8U31_VERSION))
             .withStartupTimeout(Duration.ofMinutes(5))
             .withLogConsumer(new Slf4jLogConsumer(logger))
             .withCopyFileToContainer(
diff --git 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<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .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/GrpcSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/GrpcSmokeTest.java
@@ -26,8 +26,8 @@ protected void configure(SmokeTestOptions<Integer> options) {
         .image(
             jdk ->
                 String.format(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-20251009.18389598594",
-                    jdk))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-grpc:jdk%s-%s",
+                    jdk, ImageVersions.GRPC_VERSION))
         .waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Server started.*"));
   }
 
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/IbmHttpsUrlConnectionTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/IbmHttpsUrlConnectionTest.java
@@ -46,7 +46,8 @@ void setUp() {
     backend =
         new GenericContainer<>(
                 DockerImageName.parse(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:20251006.18272043386"))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend:"
+                        + ImageVersions.FAKE_BACKEND_VERSION))
             .withExposedPorts(BACKEND_PORT)
             .withEnv("JAVA_TOOL_OPTIONS", "-Xmx128m")
             .waitingFor(Wait.forHttp("/health").forPort(BACKEND_PORT))
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/ImageVersions.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/ImageVersions.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.smoketest;
+
+// TODO configure renovate to update these versions
+public final class ImageVersions {
+
+  public static final String SPRING_BOOT_VERSION = "20251116.19402383847";
+
+  public static final String GRPC_VERSION = "20251117.19445937433";
+
+  public static final String PLAY_VERSION = "20251117.19437482782";
+
+  public static final String QUARKUS_VERSION = "20251116.19402383840";
+
+  public static final String SECURITY_MANAGER_VERSION = "20251116.19402383852";
+
+  public static final String ZULU_OPENJDK_8U31_VERSION = "20251117.19421579350";
+
+  private ImageVersions() {}
+}
diff --git 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<Integer> {
 
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
-    options.springBoot("20251017.18602659902");
+    options.springBoot();
   }
 
   @ParameterizedTest
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/PlaySmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/PlaySmokeTest.java
@@ -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-20251009.18389598601",
-                    jdk))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-play:jdk%s-%s",
+                    jdk, ImageVersions.PLAY_VERSION))
         .waitStrategy(
             new TargetWaitStrategy.Log(java.time.Duration.ofMinutes(1), ".*Listening for HTTP.*"));
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {8, 11, 17, 21, 25})
+  @ValueSource(ints = {17, 21, 25})
   void playSmokeTest(int jdk) {
     start(jdk);
 
diff --git 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<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .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/QuarkusSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java
@@ -21,8 +21,8 @@ protected void configure(SmokeTestOptions<Integer> options) {
         .image(
             jdk ->
                 String.format(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk%s-20251009.18389598609",
-                    jdk))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk%s-%s",
+                    jdk, ImageVersions.QUARKUS_VERSION))
         .waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*"))
         .setServiceName(false);
   }
diff --git 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<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .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
@@ -18,8 +18,8 @@ protected void configure(SmokeTestOptions<Integer> options) {
         .image(
             jdk ->
                 String.format(
-                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251017.18602659887",
-                    jdk))
+                    "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-%s",
+                    jdk, ImageVersions.SECURITY_MANAGER_VERSION))
         .env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true");
   }
 
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SmokeTestOptions.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SmokeTestOptions.java
@@ -34,12 +34,12 @@ public SmokeTestOptions<T> image(Function<T, String> getImage) {
 
   /** Configure test for spring boot test app. */
   @CanIgnoreReturnValue
-  public SmokeTestOptions<T> springBoot(String imageTag) {
+  public SmokeTestOptions<T> springBoot() {
     image(
         jdk ->
             String.format(
                 "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk%s-%s",
-                jdk, imageTag));
+                jdk, ImageVersions.SPRING_BOOT_VERSION));
     waitStrategy(
         new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Started SpringbootApplication in.*"));
     return this;
diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/SpringBootSmokeTest.java
@@ -23,7 +23,7 @@ class SpringBootSmokeTest extends AbstractSmokeTest<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .setServiceName(false)
         .env("OTEL_METRICS_EXPORTER", "otlp")
         .env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar");
diff --git 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<Integer> {
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
     options
-        .springBoot("20251017.18602659902")
+        .springBoot()
         .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
@@ -18,7 +18,7 @@ class OtTracePropagationTest extends AbstractSmokeTest<Integer> {
 
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
-    options.springBoot("20251017.18602659902").env("otel.propagators", "ottrace");
+    options.springBoot().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
@@ -16,7 +16,7 @@ abstract class PropagationTest extends AbstractSmokeTest<Integer> {
 
   @Override
   protected void configure(SmokeTestOptions<Integer> options) {
-    options.springBoot("20251017.18602659902");
+    options.springBoot();
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ protected void startEnvironment() {`
`78`	`78`	`.getId();`
`79`	`79`
`80`	`80`	`String backendImageName =`
`81`		`- "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:20251006.18272043386";`
	`81`	`+ "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-fake-backend-windows:"`
	`82`	`+ + ImageVersions.FAKE_BACKEND_WINDOWS_VERSION;`
`82`	`83`	`if (!imageExists(backendImageName)) {`
`83`	`84`	`pullImage(backendImageName);`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest<Integer> {`
`22`	`22`	`@Override`
`23`	`23`	`protected void configure(SmokeTestOptions<Integer> options) {`
`24`	`24`	`options`
`25`		`- .springBoot("20251017.18602659902")`
	`25`	`+ .springBoot()`
`26`	`26`	`.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")`
`27`	`27`	`.extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class LogsSmokeTest extends AbstractSmokeTest<Integer> {`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`protected void configure(SmokeTestOptions<Integer> options) {`
`21`		`- options.springBoot("20251017.18602659902");`
	`21`	`+ options.springBoot();`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@ParameterizedTest`