From 26c08688a65dc7feba1c47c0c7166b6c6f2a9984 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 18 Jan 2024 13:08:59 +0100 Subject: [PATCH] add @ConditionalOnMissingBean to LoggingMetricExporter --- .../logging/LoggingMetricExporterAutoConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/logging/LoggingMetricExporterAutoConfiguration.java b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/logging/LoggingMetricExporterAutoConfiguration.java index fb24424fa9da..c7c2583333df 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/logging/LoggingMetricExporterAutoConfiguration.java +++ b/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/exporters/logging/LoggingMetricExporterAutoConfiguration.java @@ -6,18 +6,18 @@ package io.opentelemetry.instrumentation.spring.autoconfigure.exporters.logging; import io.opentelemetry.exporter.logging.LoggingMetricExporter; -import io.opentelemetry.exporter.logging.LoggingSpanExporter; import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration; import io.opentelemetry.instrumentation.spring.autoconfigure.exporters.internal.ExporterConfigEvaluator; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; -/** Configures {@link LoggingSpanExporter} bean for tracing. */ +/** Configures {@link LoggingMetricExporter} bean for tracing. */ @Configuration @EnableConfigurationProperties(LoggingExporterProperties.class) @AutoConfigureBefore(OpenTelemetryAutoConfiguration.class) @@ -26,6 +26,7 @@ public class LoggingMetricExporterAutoConfiguration { @Bean + @ConditionalOnMissingBean public LoggingMetricExporter otelLoggingMetricExporter() { return LoggingMetricExporter.create(); }