Rename TestImage.OPENTELEMETRY to OTEL_COLLECTOR

Closes gh-47956

Author: mhalbritter

module/spring-boot-micrometer-metrics/src/dockerTest/java/org/springframework/boot/micrometer/metrics/docker/compose/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -24,13 +24,13 @@
 
 /**
  * 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");
 	}

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);

module/spring-boot-micrometer-tracing-opentelemetry/src/dockerTest/java/org/springframework/boot/micrometer/tracing/opentelemetry/docker/compose/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java

@@ -25,13 +25,13 @@
 
 /**
  * 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");

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

module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java

@@ -30,7 +30,7 @@
  */
 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");

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

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.