rename class to align with SDK

open-telemetry · Jan 30, 2024 · af7d4de · af7d4de
1 parent 3483976
commit af7d4de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/...io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java b/...io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpExporterProperties;
-import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration;
+import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter;
@@ -72,7 +72,7 @@ public static class OpenTelemetrySdkConfig {
     @ConfigurationPropertiesBinding
     @ConditionalOnBean({
       OtelResourceAutoConfiguration.class,
-      OtlpLoggerExporterAutoConfiguration.class,
+      OtlpLogRecordExporterAutoConfiguration.class,
       OtlpSpanExporterAutoConfiguration.class,
       OtlpMetricExporterAutoConfiguration.class
     })

diff --git a/.../OtlpLoggerExporterAutoConfiguration.java → ...lpLogRecordExporterAutoConfiguration.java b/.../OtlpLoggerExporterAutoConfiguration.java → ...lpLogRecordExporterAutoConfiguration.java
@@ -20,9 +20,9 @@
 import org.springframework.context.annotation.Conditional;
 
 @AutoConfigureBefore(OpenTelemetryAutoConfiguration.class)
-@Conditional(OtlpLoggerExporterAutoConfiguration.CustomCondition.class)
+@Conditional(OtlpLogRecordExporterAutoConfiguration.CustomCondition.class)
 @ConditionalOnClass(OtlpGrpcLogRecordExporter.class)
-public class OtlpLoggerExporterAutoConfiguration {
+public class OtlpLogRecordExporterAutoConfiguration {
 
   @Bean(destroyMethod = "") // SDK components are shutdown from the OpenTelemetry instance
   @ConditionalOnMissingBean({OtlpGrpcLogRecordExporter.class, OtlpHttpLogRecordExporter.class})

diff --git a/...rumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/...rumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
@@ -2,7 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingMetricExporterAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration,\
-io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration,\
+io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration,\
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.zipkin.ZipkinSpanExporterAutoConfiguration,\

diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,7 +1,7 @@
 io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingMetricExporterAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration
-io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration
+io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration
 io.opentelemetry.instrumentation.spring.autoconfigure.exporters.zipkin.ZipkinSpanExporterAutoConfiguration

diff --git a/...rumentation/spring/autoconfigure/exporters/otlp/OtlpLogExporterAutoConfigurationTest.java b/...rumentation/spring/autoconfigure/exporters/otlp/OtlpLogExporterAutoConfigurationTest.java
@@ -19,7 +19,8 @@ class OtlpLogExporterAutoConfigurationTest {
       new ApplicationContextRunner()
           .withConfiguration(
               AutoConfigurations.of(
-                  OpenTelemetryAutoConfiguration.class, OtlpLoggerExporterAutoConfiguration.class));
+                  OpenTelemetryAutoConfiguration.class,
+                  OtlpLogRecordExporterAutoConfiguration.class));
 
   @Test
   void otlpEnabled() {