This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 4a4e5451cd9 fix(starters): observation rename conf (#1556)
4a4e5451cd9 is described below
commit 4a4e5451cd9f2b9d146486c1acc6999317c4b22e
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Oct 30 08:26:42 2025 +0100
fix(starters): observation rename conf (#1556)
Needed to avoid potential clashes
Closes CAMEL-22612
---
.../observation/starter/ObservationAutoConfiguration.java | 10 ++++------
1 file changed, 4 insertions(+), 6 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 c14797b1e81..a71939b13ab 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
@@ -24,8 +24,8 @@ 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.ConditionalOnProperty;
@@ -34,10 +34,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(name = {
-
"org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration",
-
"org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration"
-})
+@AutoConfigureAfter(value =
+ {
org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration.class,
MicrometerTracingAutoConfiguration.class})
@EnableConfigurationProperties(ObservationConfigurationProperties.class)
@ConditionalOnProperty(value = "camel.observation.enabled", matchIfMissing =
true)
public class ObservationAutoConfiguration {
@@ -66,7 +64,7 @@ public class ObservationAutoConfiguration {
@Bean
// No-op version to suppress metric creation which may explode the length
// of actuator as seen in CAMEL-22349
- public TracingAwareMeterObservationHandler<Observation.Context>
tracingAwareMeterObservationHandler(ObjectProvider<Tracer> tracer) {
+ public TracingAwareMeterObservationHandler<Observation.Context>
camelTracingAwareMeterObservationHandler(ObjectProvider<Tracer> tracer) {
return new TracingAwareMeterObservationHandler<>(
new MeterObservationHandler<Observation.Context>() {},
tracer.getIfAvailable()