This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 598b0a98178 Make the observation starter conditional on the spring
actuator dpeendency
598b0a98178 is described below
commit 598b0a98178179c7614d9f5d0ed285cb51cbafea
Author: Croway <[email protected]>
AuthorDate: Tue Nov 4 15:03:52 2025 +0100
Make the observation starter conditional on the spring actuator dpeendency
---
.../camel/observation/starter/ObservationAutoConfiguration.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
index a71939b13ab..5cf01984ffe 100644
---
a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
+++
b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/ObservationAutoConfiguration.java
@@ -25,17 +25,20 @@ import
io.micrometer.tracing.handler.TracingAwareMeterObservationHandler;
import org.apache.camel.CamelContext;
import org.apache.camel.observation.MicrometerObservationTracer;
import org.springframework.beans.factory.ObjectProvider;
-import
org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(value =
- {
org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration.class,
MicrometerTracingAutoConfiguration.class})
+@ConditionalOnMissingClass({
"org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration",
+
"org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration"
})
+@AutoConfigureAfter(name = {
+
"org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration",
+
"org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration"
})
@EnableConfigurationProperties(ObservationConfigurationProperties.class)
@ConditionalOnProperty(value = "camel.observation.enabled", matchIfMissing =
true)
public class ObservationAutoConfiguration {