From 446677375e0c7311d9bfbaecc8dbc1e5aefb1f3d Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 11 Oct 2023 23:07:33 +0900 Subject: [PATCH] Polish gh-35082 See gh-37831 --- .../export/otlp/OtlpMetricsConnectionDetails.java | 2 +- .../otlp/OtlpMetricsExportAutoConfiguration.java | 2 +- .../tracing/otlp/OtlpTracingConfigurations.java | 7 ++----- .../tracing/otlp/OtlpTracingConnectionDetails.java | 6 +++--- ...MetricsDockerComposeConnectionDetailsFactory.java | 8 ++++---- ...TracingDockerComposeConnectionDetailsFactory.java | 2 +- ...poseConnectionDetailsFactoryIntegrationTests.java | 2 +- ...poseConnectionDetailsFactoryIntegrationTests.java | 2 +- ...tryMetricsContainerConnectionDetailsFactory.java} | 10 +++++----- ...tryTracingContainerConnectionDetailsFactory.java} | 12 ++++++------ .../src/main/resources/META-INF/spring.factories | 4 ++-- ...nerConnectionDetailsFactoryIntegrationTests.java} | 4 ++-- ...nerConnectionDetailsFactoryIntegrationTests.java} | 4 ++-- .../testsupport/testcontainers/DockerImageNames.java | 5 +++-- 14 files changed, 34 insertions(+), 36 deletions(-) rename spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/{OpenTelemetryMetricsConnectionDetailsFactory.java => OpenTelemetryMetricsContainerConnectionDetailsFactory.java} (87%) rename spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/{OpenTelemetryTracingConnectionDetailsFactory.java => OpenTelemetryTracingContainerConnectionDetailsFactory.java} (81%) rename spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/{OpenTelemetryMetricsConnectionDetailsFactoryIntegrationTests.java => OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java} (96%) rename spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/{OpenTelemetryTracingConnectionDetailsFactoryIntegrationTests.java => OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java} (93%) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsConnectionDetails.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsConnectionDetails.java index 16f968a89de..eeef0ae685b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsConnectionDetails.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsConnectionDetails.java @@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.metrics.export.otlp; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; /** - * Details required to establish a connection to a OpenTelemetry Collector service. + * Details required to establish a connection to an OpenTelemetry Collector service. * * @author Eddú Meléndez * @since 3.2.0 diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java index 546503c6d9a..c7da21f488d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/otlp/OtlpMetricsExportAutoConfiguration.java @@ -57,7 +57,7 @@ public class OtlpMetricsExportAutoConfiguration { } @Bean - @ConditionalOnMissingBean(OtlpMetricsConnectionDetails.class) + @ConditionalOnMissingBean OtlpMetricsConnectionDetails otlpMetricsConnectionDetails() { return new PropertiesOtlpMetricsConnectionDetails(this.properties); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java index eb136aac211..492e43792d0 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java @@ -33,16 +33,13 @@ import org.springframework.context.annotation.Configuration; * * @author Moritz Halbritter */ -final class OtlpTracingConfigurations { - - private OtlpTracingConfigurations() { - } +class OtlpTracingConfigurations { @Configuration(proxyBeanMethods = false) static class ConnectionDetails { @Bean - @ConditionalOnMissingBean(OtlpTracingConnectionDetails.class) + @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "management.otlp.tracing", name = "endpoint") OtlpTracingConnectionDetails otlpTracingConnectionDetails(OtlpProperties properties) { return new PropertiesOtlpTracingConnectionDetails(properties); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java index fb73b615bb8..a84b11d64da 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConnectionDetails.java @@ -19,7 +19,7 @@ package org.springframework.boot.actuate.autoconfigure.tracing.otlp; import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails; /** - * Details required to establish a connection to a OpenTelemetry service. + * Details required to establish a connection to an OpenTelemetry service. * * @author Eddú Meléndez * @since 3.2.0 @@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.service.connection.ConnectionDetai public interface OtlpTracingConnectionDetails extends ConnectionDetails { /** - * Address to where metrics will be published. - * @return the address to where metrics will be published + * Address to where tracing will be published. + * @return the address to where tracing will be published */ String getUrl(); diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java index 2df408c968d..49913297040 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java @@ -23,7 +23,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC /** * {@link DockerComposeConnectionDetailsFactory} to create - * {@link OtlpMetricsConnectionDetails} for a {@code OTLP} service. + * {@link OtlpMetricsConnectionDetails} for an OTLP service. * * @author Eddú Meléndez */ @@ -39,17 +39,17 @@ class OpenTelemetryMetricsDockerComposeConnectionDetailsFactory @Override protected OtlpMetricsConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) { - return new OpenTelemetryContainerMetricsConnectionDetails(source.getRunningService()); + return new OpenTelemetryMetricsDockerComposeConnectionDetails(source.getRunningService()); } - private static final class OpenTelemetryContainerMetricsConnectionDetails extends DockerComposeConnectionDetails + private static final class OpenTelemetryMetricsDockerComposeConnectionDetails extends DockerComposeConnectionDetails implements OtlpMetricsConnectionDetails { private final String host; private final int port; - private OpenTelemetryContainerMetricsConnectionDetails(RunningService source) { + private OpenTelemetryMetricsDockerComposeConnectionDetails(RunningService source) { super(source); this.host = source.host(); this.port = source.ports().get(OTLP_PORT); diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java index 359f4df1938..20e5b06b3da 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java @@ -23,7 +23,7 @@ import org.springframework.boot.docker.compose.service.connection.DockerComposeC /** * {@link DockerComposeConnectionDetailsFactory} to create - * {@link OtlpTracingConnectionDetails} for a {@code OTLP} service. + * {@link OtlpTracingConnectionDetails} for an OTLP service. * * @author Eddú Meléndez */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java index b2fa3e93e78..7f303d5082f 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Eddú Meléndez */ -public class OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests +class OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests { OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests() { diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java index 7afae26469f..720b90a014f 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Eddú Meléndez */ -public class OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests +class OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests { OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests() { diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactory.java similarity index 87% rename from spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactory.java rename to spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactory.java index a200750e1b1..8dd417ccd1b 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactory.java @@ -32,10 +32,10 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect * * @author Eddú Meléndez */ -class OpenTelemetryMetricsConnectionDetailsFactory +class OpenTelemetryMetricsContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory, OtlpMetricsConnectionDetails> { - OpenTelemetryMetricsConnectionDetailsFactory() { + OpenTelemetryMetricsContainerConnectionDetailsFactory() { super("otel/opentelemetry-collector-contrib", "org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsExportAutoConfiguration"); } @@ -43,13 +43,13 @@ class OpenTelemetryMetricsConnectionDetailsFactory @Override protected OtlpMetricsConnectionDetails getContainerConnectionDetails( ContainerConnectionSource> source) { - return new OpenTelemetryContainerMetricsConnectionDetails(source); + return new OpenTelemetryMetricsContainerConnectionDetails(source); } - private static final class OpenTelemetryContainerMetricsConnectionDetails + private static final class OpenTelemetryMetricsContainerConnectionDetails extends ContainerConnectionDetails> implements OtlpMetricsConnectionDetails { - private OpenTelemetryContainerMetricsConnectionDetails(ContainerConnectionSource> source) { + private OpenTelemetryMetricsContainerConnectionDetails(ContainerConnectionSource> source) { super(source); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactory.java similarity index 81% rename from spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactory.java rename to spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactory.java index 4f4a394cd3a..6c3e72ac797 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactory.java @@ -32,10 +32,10 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect * * @author Eddú Meléndez */ -class OpenTelemetryTracingConnectionDetailsFactory +class OpenTelemetryTracingContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory, OtlpTracingConnectionDetails> { - OpenTelemetryTracingConnectionDetailsFactory() { + OpenTelemetryTracingContainerConnectionDetailsFactory() { super("otel/opentelemetry-collector-contrib", "org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpAutoConfiguration"); } @@ -43,13 +43,13 @@ class OpenTelemetryTracingConnectionDetailsFactory @Override protected OtlpTracingConnectionDetails getContainerConnectionDetails( ContainerConnectionSource> source) { - return new OpenTelemetryTracingConnectionDetails(source); + return new OpenTelemetryTracingContainerConnectionDetails(source); } - private static final class OpenTelemetryTracingConnectionDetails extends ContainerConnectionDetails> - implements OtlpTracingConnectionDetails { + private static final class OpenTelemetryTracingContainerConnectionDetails + extends ContainerConnectionDetails> implements OtlpTracingConnectionDetails { - private OpenTelemetryTracingConnectionDetails(ContainerConnectionSource> source) { + private OpenTelemetryTracingContainerConnectionDetails(ContainerConnectionSource> source) { super(source); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories index ae8435cb3f7..53afedfc51e 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories @@ -19,8 +19,8 @@ org.springframework.boot.testcontainers.service.connection.kafka.KafkaContainerC org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.neo4j.Neo4jContainerConnectionDetailsFactory,\ -org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryMetricsConnectionDetailsFactory,\ -org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryTracingConnectionDetailsFactory,\ +org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryMetricsContainerConnectionDetailsFactory,\ +org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryTracingContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.pulsar.PulsarContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.r2dbc.MariaDbR2dbcContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.r2dbc.MySqlR2dbcContainerConnectionDetailsFactory,\ diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java similarity index 96% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index c1a88d38df5..b1194f0ca6b 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.matchesPattern; /** - * Tests for {@link OpenTelemetryMetricsConnectionDetailsFactory}. + * Tests for {@link OpenTelemetryMetricsContainerConnectionDetailsFactory}. * * @author Eddú Meléndez * @author Jonatan Ivanov @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.matchesPattern; @TestPropertySource(properties = { "management.otlp.metrics.export.resource-attributes.service.name=test", "management.otlp.metrics.export.step=1s" }) @Testcontainers(disabledWithoutDocker = true) -class OpenTelemetryMetricsConnectionDetailsFactoryIntegrationTests { +class OpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { private static final String OPENMETRICS_001 = "application/openmetrics-text; version=0.0.1; charset=utf-8"; diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java similarity index 93% rename from spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java index 4367967b5a7..ab41e680c55 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java @@ -33,13 +33,13 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link OpenTelemetryTracingConnectionDetailsFactory}. + * Tests for {@link OpenTelemetryTracingContainerConnectionDetailsFactory}. * * @author Eddú Meléndez */ @SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) -class OpenTelemetryTracingConnectionDetailsFactoryIntegrationTests { +class OpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java index 2d005f007b8..3e6feccdaa4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java @@ -158,8 +158,9 @@ public final class DockerImageNames { } /** - * Return a {@link DockerImageName} suitable for running the Oracle database. - * @return a docker image name for running the Oracle database + * Return a {@link DockerImageName} suitable for running OpenTelemetry. + * @return a docker image name for running OpenTelemetry + * @since 3.2.0 */ public static DockerImageName opentelemetry() { return DockerImageName.parse("otel/opentelemetry-collector-contrib").withTag(OPENTELEMETRY_VERSION);