修改common-spring的依赖和解决log冲突

brave-spring-boot-starter/pom.xml

@@ -129,25 +129,9 @@
 
         <dependency>
             <groupId>io.zipkin.brave</groupId>
-            <artifactId>brave-context-log4j2</artifactId>
+            <artifactId>brave-context-slf4j</artifactId>
             <version>${brave.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jul</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
 
     </dependencies>
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java

 package cn.quantgroup.tech.brave.configuration;
 
 import brave.Tracing;
-import brave.context.log4j2.ThreadContextCurrentTraceContext;
+import brave.context.slf4j.MDCCurrentTraceContext;
 import brave.http.HttpTracing;
 import brave.httpclient.TracingHttpClientBuilder;
 import brave.okhttp3.TracingInterceptor;
@@ -24,6 +24,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -71,11 +72,11 @@ public class BraveAutoConfiguration {
     }
 
     @Configuration
-    @EnableConfigurationProperties( BraveProperties.class )
     @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
     public static class BraveUntEnabled {
         @Configuration
         @ConditionalOnClass( RabbitTemplate.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
         public static class RabbitTemplateEnable {
             /**
              * 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
@@ -90,6 +91,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( HttpClient.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
         public static class HttpClientEnable {
             /**
              * 提供HttpClientBuilderBean
@@ -99,12 +101,13 @@ public class BraveAutoConfiguration {
             @Bean( name = "techHttpClientBuilder" )
             public HttpClientBuilder httpClientBuilder() {
                 log.info("注册HttpClientBuilder");
-                return TracingHttpClientBuilder.create();
+                return HttpClientBuilder.create();
             }
         }
 
         @Configuration
         @ConditionalOnClass( OkHttpClient.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
         public static class OkHttpClientEnable {
 
             /**
@@ -121,6 +124,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( RestTemplate.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
         public static class RestTemplateEnable {
             /**
              * 提供RestTemplate
@@ -153,26 +157,30 @@ public class BraveAutoConfiguration {
         private SpanCustomizingAsyncHandlerInterceptor spanCustomizingAsyncHandlerInterceptor;
 
         @Bean
+        @ConditionalOnMissingBean
         Sender sender() {
             return KafkaSender.newBuilder().bootstrapServers(braveProperties.getKafkaBootstrapServers()).topic(braveProperties.getKafkaTopic()).encoding(Encoding.JSON).build();
         }
 
         @Bean
+        @ConditionalOnMissingBean
         AsyncReporter<Span> spanReporter() {
             return AsyncReporter.create(sender());
         }
 
         @Bean
+        @ConditionalOnMissingBean
         Tracing tracing() {
             return Tracing.newBuilder()
                     .sampler(brave.sampler.Sampler.create(braveProperties.getSample()))
                     .localServiceName(serviceProperties.getName())
                     .propagationFactory(ExtraFieldPropagation.newFactory(B3Propagation.FACTORY, "user-name"))
-                    .currentTraceContext(ThreadContextCurrentTraceContext.create())
+                    .currentTraceContext(MDCCurrentTraceContext.create())
                     .spanReporter(spanReporter()).build();
         }
 
         @Bean
+        @ConditionalOnMissingBean
         public HttpTracing httpTracing(Tracing tracing) {
             return HttpTracing.create(tracing);
         }
@@ -196,6 +204,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( RabbitTemplate.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
         public static class RabbitTemplateEnable {
             /**
              * 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
@@ -211,6 +220,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( HttpClient.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
         public static class HttpClientEnable {
             /**
              * 提供HttpClientBuilderBean
@@ -227,6 +237,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( OkHttpClient.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
         public static class OkHttpClientEnable {
             /**
              * 提供OkHttpClientBean
@@ -246,6 +257,7 @@ public class BraveAutoConfiguration {
 
         @Configuration
         @ConditionalOnClass( RestTemplate.class )
+        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
         @Import( TracingClientHttpRequestInterceptor.class )
         public static class RestTemplateEnable {
             @Autowired

commons-spring/pom.xml

@@ -90,18 +90,19 @@
             <artifactId>lombok</artifactId>
             <version>1.16.16</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>