From 7669e42ede150534755d752acf52f0f216c4d567 Mon Sep 17 00:00:00 2001
From: pbakker <pbakker@netflix.com>
Date: Wed, 8 Nov 2023 13:02:53 -0800
Subject: [PATCH] Re-add @ConditionalOnEnabledTracing on BraveAutoConfiguration

---
 .../actuate/autoconfigure/tracing/BraveAutoConfiguration.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java
index 47d65fe69cbc..6bb0528d7db8 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java
@@ -79,6 +79,7 @@
 @AutoConfiguration(before = MicrometerTracingAutoConfiguration.class)
 @ConditionalOnClass({ Tracer.class, BraveTracer.class })
 @EnableConfigurationProperties(TracingProperties.class)
+@ConditionalOnEnabledTracing
 public class BraveAutoConfiguration {
 
 	private static final BraveBaggageManager BRAVE_BAGGAGE_MANAGER = new BraveBaggageManager();