This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new ac6704d532 Update BraveAutoConfiguration.java (#14631)
ac6704d532 is described below

commit ac6704d532ca814dbf989dd20ea31716eabc6990
Author: The True HOOHA <[email protected]>
AuthorDate: Fri Sep 6 09:37:18 2024 +0800

    Update BraveAutoConfiguration.java (#14631)
    
    The bean 'correlationFieldsCorrelationScopeCustomizer', defined in class 
path resource 
[org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration$BraveBaggageConfiguration.class],
 could not be registered. A bean with that name has already been defined in 
class path resource 
[org/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations$PropagationWithBaggage.class]
 and overriding is disabled.
---
 .../boot/observability/autoconfigure/brave/BraveAutoConfiguration.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
 
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
index b3134e7576..b80166c0dd 100644
--- 
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
+++ 
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
@@ -272,6 +272,7 @@ public class BraveAutoConfiguration {
                 prefix = ObservabilityUtils.DUBBO_TRACING_BAGGAGE_CORRELATION,
                 name = "enabled",
                 matchIfMissing = true)
+        @ConditionalOnMissingBean
         brave.baggage.CorrelationScopeCustomizer 
correlationFieldsCorrelationScopeCustomizer() {
             return (builder) -> {
                 List<String> correlationFields = this.dubboConfigProperties

Reply via email to