Skip to content

Commit 22bcf9d

Browse files
committed
Fix missing @ConditionalOnBean
See spring-projectsgh-30156
1 parent 9046f66 commit 22bcf9d

File tree

1 file changed

+3
-0
lines changed
  • spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics

1 file changed

+3
-0
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/TracingAutoConfiguration.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818

1919
import java.util.List;
2020

21+
import io.micrometer.core.instrument.MeterRegistry;
2122
import io.micrometer.core.instrument.observation.Observation.GlobalTagsProvider;
2223
import io.micrometer.core.instrument.observation.ObservationHandler;
2324
import io.micrometer.core.instrument.observation.ObservationPredicate;
2425
import io.micrometer.tracing.handler.TracingObservationHandler;
2526

2627
import org.springframework.boot.autoconfigure.AutoConfiguration;
2728
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2830
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2931
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3032
import org.springframework.context.annotation.Bean;
@@ -39,6 +41,7 @@
3941
* @since 3.0.0
4042
*/
4143
@AutoConfiguration(after = CompositeMeterRegistryAutoConfiguration.class)
44+
@ConditionalOnBean(MeterRegistry.class)
4245
@ConditionalOnClass(TracingObservationHandler.class)
4346
public class TracingAutoConfiguration {
4447

0 commit comments

Comments
 (0)