Skip to content

Commit 0f0cd51

Browse files
committed
Mirror code structore from tracing in logging
1 parent 7ea15d5 commit 0f0cd51

File tree

10 files changed

+214
-246
lines changed

10 files changed

+214
-246
lines changed

module/spring-boot-opentelemetry/src/dockerTest/java/org/springframework/boot/opentelemetry/testcontainers/GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
26-
import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration;
2726
import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
27+
import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingExportAutoConfiguration;
2828
import org.springframework.boot.opentelemetry.autoconfigure.otlp.Transport;
2929
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
3030
import org.springframework.boot.testsupport.container.TestImage;
@@ -58,7 +58,7 @@ void connectionCanBeMadeToOpenTelemetryContainer() {
5858
}
5959

6060
@Configuration(proxyBeanMethods = false)
61-
@ImportAutoConfiguration(OpenTelemetryLoggingExportAutoConfiguration.class)
61+
@ImportAutoConfiguration(OtlpLoggingExportAutoConfiguration.class)
6262
static class TestConfiguration {
6363

6464
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
26-
import org.springframework.boot.opentelemetry.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration;
2726
import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingConnectionDetails;
27+
import org.springframework.boot.opentelemetry.autoconfigure.logging.OtlpLoggingExportAutoConfiguration;
2828
import org.springframework.boot.opentelemetry.autoconfigure.otlp.Transport;
2929
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
3030
import org.springframework.boot.testsupport.container.TestImage;
@@ -59,7 +59,7 @@ void connectionCanBeMadeToOpenTelemetryContainer() {
5959
}
6060

6161
@Configuration(proxyBeanMethods = false)
62-
@ImportAutoConfiguration(OpenTelemetryLoggingExportAutoConfiguration.class)
62+
@ImportAutoConfiguration(OtlpLoggingExportAutoConfiguration.class)
6363
static class TestConfiguration {
6464

6565
}

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

Lines changed: 0 additions & 103 deletions
This file was deleted.

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

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)