Rename OpenTelemetry Logging auto-configuration

It's dealing with OTLP, so the name should reflect that.
It now also mirrors the structure from micrometer-tracing-opentelemetry.

See gh-47954

Author: mhalbritter

module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/GrafanaOpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/GrafanaOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java

@@ -17,22 +17,22 @@
 package org.springframework.boot.opentelemetry.docker.compose;
 
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
 import org.springframework.boot.opentelemetry.autoconfigure.logging.Transport;
 import org.springframework.boot.testsupport.container.TestImage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for {@link OpenTelemetryLoggingDockerComposeConnectionDetailsFactory}
- * using {@link TestImage#GRAFANA_OTEL_LGTM}.
+ * Integration tests for {@link OtlpLoggingDockerComposeConnectionDetailsFactory} using
+ * {@link TestImage#GRAFANA_OTEL_LGTM}.
  *
  * @author Eddú Meléndez
  */
-class GrafanaOpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests {
+class GrafanaOtlpLoggingDockerComposeConnectionDetailsFactoryTests {
 
 	@DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.GRAFANA_OTEL_LGTM)
-	void runCreatesConnectionDetails(OpenTelemetryLoggingConnectionDetails connectionDetails) {
+	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/docker/compose/OpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests.java renamed to module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/docker/compose/OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests.java

@@ -17,22 +17,21 @@
 package org.springframework.boot.opentelemetry.docker.compose;
 
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
 import org.springframework.boot.opentelemetry.autoconfigure.logging.Transport;
 import org.springframework.boot.testsupport.container.TestImage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests for
- * {@link OpenTelemetryLoggingDockerComposeConnectionDetailsFactory}.
+ * Integration tests for {@link OtlpLoggingDockerComposeConnectionDetailsFactory}.
  *
  * @author Eddú Meléndez
  */
-class OpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests {
+class OtelCollectorOtlpLoggingDockerComposeConnectionDetailsFactoryTests {
 
 	@DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OPENTELEMETRY)
-	void runCreatesConnectionDetails(OpenTelemetryLoggingConnectionDetails connectionDetails) {
+	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/GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests.java renamed to module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests.java

@@ -23,8 +23,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingAutoConfiguration;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
 import org.springframework.boot.opentelemetry.autoconfigure.logging.Transport;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -34,20 +34,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactory}.
+ * Tests for {@link GrafanaOtlpLoggingContainerConnectionDetailsFactory}.
  *
  * @author Eddú Meléndez
  */
 @SpringJUnitConfig
 @Testcontainers(disabledWithoutDocker = true)
-class GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests {
+class GrafanaOtlpLoggingContainerConnectionDetailsFactoryTests {
 
 	@Container
 	@ServiceConnection
 	static final LgtmStackContainer container = TestImage.container(LgtmStackContainer.class);
 
 	@Autowired
-	private OpenTelemetryLoggingConnectionDetails connectionDetails;
+	private OtlpLoggingConnectionDetails connectionDetails;
 
 	@Test
 	void connectionCanBeMadeToOpenTelemetryContainer() {
@@ -58,7 +58,7 @@ void connectionCanBeMadeToOpenTelemetryContainer() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(OpenTelemetryLoggingExportAutoConfiguration.class)
+	@ImportAutoConfiguration(OtlpLoggingAutoConfiguration.class)
 	static class TestConfiguration {
 
 	}

module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests.java renamed to module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests.java

@@ -23,8 +23,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails;
-import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingAutoConfiguration;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
 import org.springframework.boot.opentelemetry.autoconfigure.logging.Transport;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.boot.testsupport.container.TestImage;
@@ -34,21 +34,21 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link OpenTelemetryLoggingContainerConnectionDetailsFactory}.
+ * Tests for {@link OtelCollectorOltpLoggingContainerConnectionDetailsFactory}.
  *
  * @author Eddú Meléndez
  */
 @SpringJUnitConfig
 @Testcontainers(disabledWithoutDocker = true)
-class OpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests {
+class OtelCollectorOltpLoggingContainerConnectionDetailsFactoryTests {
 
 	@Container
 	@ServiceConnection
 	static final GenericContainer<?> container = TestImage.OPENTELEMETRY.genericContainer()
 		.withExposedPorts(4317, 4318);
 
 	@Autowired
-	private OpenTelemetryLoggingConnectionDetails connectionDetails;
+	private OtlpLoggingConnectionDetails connectionDetails;
 
 	@Test
 	void connectionCanBeMadeToOpenTelemetryContainer() {
@@ -59,7 +59,7 @@ void connectionCanBeMadeToOpenTelemetryContainer() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ImportAutoConfiguration(OpenTelemetryLoggingExportAutoConfiguration.class)
+	@ImportAutoConfiguration(OtlpLoggingAutoConfiguration.class)
 	static class TestConfiguration {
 
 	}

module/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/autoconfigure/logging/OpenTelemetryLoggingConnectionDetailsConfiguration.java

@@ -24,6 +24,8 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConfigurations.ConnectionDetails;
+import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConfigurations.Exporters;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -35,8 +37,8 @@
 @AutoConfiguration
 @ConditionalOnClass({ ConditionalOnEnabledLoggingExport.class, OpenTelemetry.class, SdkLoggerProvider.class })
 @ConditionalOnEnabledLoggingExport("opentelemetry")
-@EnableConfigurationProperties(OpenTelemetryLoggingExportProperties.class)
-@Import({ OpenTelemetryLoggingConnectionDetailsConfiguration.class, OpenTelemetryLoggingTransportConfiguration.class })
-public final class OpenTelemetryLoggingExportAutoConfiguration {
+@EnableConfigurationProperties(OtlpLoggingProperties.class)
+@Import({ ConnectionDetails.class, Exporters.class })
+public final class OtlpLoggingAutoConfiguration {
 
 }