Skip to content

Commit af7d4de

Browse files
committed
rename class to align with SDK
1 parent 3483976 commit af7d4de

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.opentelemetry.api.trace.TracerProvider;
1010
import io.opentelemetry.context.propagation.ContextPropagators;
1111
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpExporterProperties;
12-
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration;
12+
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration;
1313
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration;
1414
import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration;
1515
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.MapConverter;
@@ -72,7 +72,7 @@ public static class OpenTelemetrySdkConfig {
7272
@ConfigurationPropertiesBinding
7373
@ConditionalOnBean({
7474
OtelResourceAutoConfiguration.class,
75-
OtlpLoggerExporterAutoConfiguration.class,
75+
OtlpLogRecordExporterAutoConfiguration.class,
7676
OtlpSpanExporterAutoConfiguration.class,
7777
OtlpMetricExporterAutoConfiguration.class
7878
})
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.springframework.context.annotation.Conditional;
2121

2222
@AutoConfigureBefore(OpenTelemetryAutoConfiguration.class)
23-
@Conditional(OtlpLoggerExporterAutoConfiguration.CustomCondition.class)
23+
@Conditional(OtlpLogRecordExporterAutoConfiguration.CustomCondition.class)
2424
@ConditionalOnClass(OtlpGrpcLogRecordExporter.class)
25-
public class OtlpLoggerExporterAutoConfiguration {
25+
public class OtlpLogRecordExporterAutoConfiguration {
2626

2727
@Bean(destroyMethod = "") // SDK components are shutdown from the OpenTelemetry instance
2828
@ConditionalOnMissingBean({OtlpGrpcLogRecordExporter.class, OtlpHttpLogRecordExporter.class})

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
22
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration,\
33
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingMetricExporterAutoConfiguration,\
44
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration,\
5-
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration,\
5+
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration,\
66
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration,\
77
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration,\
88
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.zipkin.ZipkinSpanExporterAutoConfiguration,\

instrumentation/spring/spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration
22
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingMetricExporterAutoConfiguration
33
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging.LoggingSpanExporterAutoConfiguration
4-
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLoggerExporterAutoConfiguration
4+
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpLogRecordExporterAutoConfiguration
55
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpMetricExporterAutoConfiguration
66
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.otlp.OtlpSpanExporterAutoConfiguration
77
io.opentelemetry.instrumentation.spring.autoconfigure.exporters.zipkin.ZipkinSpanExporterAutoConfiguration

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/otlp/OtlpLogExporterAutoConfigurationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class OtlpLogExporterAutoConfigurationTest {
1919
new ApplicationContextRunner()
2020
.withConfiguration(
2121
AutoConfigurations.of(
22-
OpenTelemetryAutoConfiguration.class, OtlpLoggerExporterAutoConfiguration.class));
22+
OpenTelemetryAutoConfiguration.class,
23+
OtlpLogRecordExporterAutoConfiguration.class));
2324

2425
@Test
2526
void otlpEnabled() {

0 commit comments

Comments
 (0)