From fd7f5c5abcaa5da315a7b4264d2f43c1d4011c2f Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 5 Nov 2025 12:19:11 +0100 Subject: [PATCH] Rename TestImage.OPENTELEMETRY to OTEL_COLLECTOR Closes gh-47956 --- ...ockerComposeConnectionDetailsFactoryIntegrationTests.java | 4 ++-- ...icsContainerConnectionDetailsFactoryIntegrationTests.java | 2 +- ...ockerComposeConnectionDetailsFactoryIntegrationTests.java | 4 ++-- ...ingContainerConnectionDetailsFactoryIntegrationTests.java | 2 +- ...tlpLoggingDockerComposeConnectionDetailsFactoryTests.java | 2 +- ...torOltpLoggingContainerConnectionDetailsFactoryTests.java | 2 +- .../boot/testsupport/container/TestImage.java | 5 +++-- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/docker/compose/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/docker/compose/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java index c9f6e421017..df854e5470f 100644 --- a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/docker/compose/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/docker/compose/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -24,13 +24,13 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Integration tests for {@link OpenTelemetryMetricsDockerComposeConnectionDetailsFactory} - * using {@link TestImage#OPENTELEMETRY}. + * using {@link TestImage#OTEL_COLLECTOR}. * * @author Eddú Meléndez */ class OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OPENTELEMETRY) + @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OTEL_COLLECTOR) void runCreatesConnectionDetails(OtlpMetricsConnectionDetails connectionDetails) { assertThat(connectionDetails.getUrl()).startsWith("http://").endsWith("/v1/metrics"); } diff --git a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index 0ad4878940b..927165fdb7b 100644 --- a/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/testcontainers/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -67,7 +67,7 @@ class OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OPENTELEMETRY.genericContainer() + static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() .withCommand("--config=/etc/" + CONFIG_FILE_NAME) .withCopyToContainer(MountableFile.forClasspathResource(CONFIG_FILE_NAME), "/etc/" + CONFIG_FILE_NAME) .withExposedPorts(4318, 9090); diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/docker/compose/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/docker/compose/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java index 85c6e1b8fde..a68162d0dab 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/docker/compose/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/docker/compose/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,13 +25,13 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Integration tests for {@link OpenTelemetryTracingDockerComposeConnectionDetailsFactory} - * using {@link TestImage#OPENTELEMETRY}. + * using {@link TestImage#OTEL_COLLECTOR}. * * @author Eddú Meléndez */ class OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OPENTELEMETRY) + @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OTEL_COLLECTOR) void runCreatesConnectionDetails(OtlpTracingConnectionDetails connectionDetails) { assertThat(connectionDetails.getUrl(Transport.HTTP)).startsWith("http://").endsWith("/v1/traces"); assertThat(connectionDetails.getUrl(Transport.GRPC)).startsWith("http://").endsWith("/v1/traces"); diff --git a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java index 61cd1c07c39..a60f875081a 100644 --- a/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/testcontainers/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java @@ -44,7 +44,7 @@ class OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OPENTELEMETRY.genericContainer() + static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() .withExposedPorts(4317, 4318); @Autowired diff --git a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java index 11908d32941..2d903c795e8 100644 --- a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java +++ b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ class OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests { - @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OPENTELEMETRY) + @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OTEL_COLLECTOR) void runCreatesConnectionDetails(OtlpLoggingConnectionDetails connectionDetails) { assertThat(connectionDetails.getUrl(Transport.HTTP)).startsWith("http://").endsWith("/v1/logs"); assertThat(connectionDetails.getUrl(Transport.GRPC)).startsWith("http://").endsWith("/v1/logs"); diff --git a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java index b11a46084e3..14f884c8ebe 100644 --- a/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java +++ b/module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java @@ -44,7 +44,7 @@ class OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests { @Container @ServiceConnection - static final GenericContainer container = TestImage.OPENTELEMETRY.genericContainer() + static final GenericContainer container = TestImage.OTEL_COLLECTOR.genericContainer() .withExposedPorts(4317, 4318); @Autowired diff --git a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index e17094ef812..9744b6e0ac4 100644 --- a/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -214,9 +214,10 @@ public enum TestImage { .withStartupTimeout(Duration.ofMinutes(2))), /** - * A container image suitable for testing Opentelemetry. + * A container image suitable for testing OpenTelemetry using the OpenTelemetry + * collector. */ - OPENTELEMETRY("otel/opentelemetry-collector-contrib", "0.75.0"), + OTEL_COLLECTOR("otel/opentelemetry-collector-contrib", "0.75.0"), /** * A container image suitable for testing Postgres.