fix : 去除对 spring-webmvc 的依赖

brave-spring-boot-starter/pom.xml

@@ -15,6 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <brave.version>4.19.1</brave.version>
         <zipkin-reporter2.version>2.5.0</zipkin-reporter2.version>
+        <okhttp.version>3.10.0</okhttp.version>
     </properties>
 
     <dependencies>
@@ -28,11 +29,10 @@
             <artifactId>httpclient</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.10.0</version>
+            <version>${okhttp.version}</version>
             <optional>true</optional>
         </dependency>
 

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

@@ -22,21 +22,16 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 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.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Condition;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import zipkin2.Span;
@@ -57,48 +52,35 @@ import java.util.List;
  */
 @Slf4j
 @Configuration
-@AutoConfigureOrder
-@Conditional( BraveAutoConfiguration.BraveSet.class )
 public class BraveAutoConfiguration {
-    static final class BraveSet implements Condition {
-        @Override
-        public boolean matches(ConditionContext context, AnnotatedTypeMetadata a) {
-            return !isEmpty(context.getEnvironment().getProperty("tech.brave.enabled"));
-        }
-
-        private static boolean isEmpty(String s) {
-            return s == null || s.isEmpty();
-        }
-    }
 
     @Configuration
-    @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
     public static class BraveUntEnabled {
         @Configuration
-        @ConditionalOnClass( RabbitTemplate.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
+        @ConditionalOnClass(RabbitTemplate.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "false", matchIfMissing = true)
         public static class RabbitTemplateEnable {
             /**
              * 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
              *
              * @return
              */
-            @Bean( name = "techRabbitTemplateBuilder" )
-            public ITechRabbitBuilder rabbitTemplateBuilder() {
+            @Bean(name = "techRabbitBuilder")
+            public ITechRabbitBuilder techRabbitBuilder() {
                 return new TechRabbitBuilderNoTrace();
             }
         }
 
         @Configuration
-        @ConditionalOnClass( HttpClient.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
+        @ConditionalOnClass(HttpClient.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "false", matchIfMissing = true)
         public static class HttpClientEnable {
             /**
              * 提供HttpClientBuilderBean
              *
              * @return
              */
-            @Bean( name = "techHttpClientBuilder" )
+            @Bean(name = "techHttpClientBuilder")
             public HttpClientBuilder httpClientBuilder() {
                 log.info("注册HttpClientBuilder");
                 return HttpClientBuilder.create();
@@ -106,8 +88,8 @@ public class BraveAutoConfiguration {
         }
 
         @Configuration
-        @ConditionalOnClass( OkHttpClient.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
+        @ConditionalOnClass(OkHttpClient.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "false", matchIfMissing = true)
         public static class OkHttpClientEnable {
 
             /**
@@ -115,7 +97,7 @@ public class BraveAutoConfiguration {
              *
              * @return
              */
-            @Bean( name = "techOkHttpClientBuilder" )
+            @Bean(name = "techOkHttpClientBuilder")
             public OkHttpClient.Builder okHttpClientBuilder() {
                 log.info("注册OkHttpClient.Builder");
                 return new OkHttpClient.Builder();
@@ -123,15 +105,15 @@ public class BraveAutoConfiguration {
         }
 
         @Configuration
-        @ConditionalOnClass( RestTemplate.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
+        @ConditionalOnClass(RestTemplate.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "false", matchIfMissing = true)
         public static class RestTemplateEnable {
             /**
              * 提供RestTemplate
              *
              * @return
              */
-            @Bean( name = "techRestTemplate" )
+            @Bean(name = "techRestTemplate")
             public RestTemplate restTemplate() {
                 log.info("添加restTemplate拦截器");
                 return new RestTemplate();
@@ -141,11 +123,9 @@ public class BraveAutoConfiguration {
     }
 
     @Configuration
-    @EnableWebMvc
-    @EnableConfigurationProperties( {BraveProperties.class, ServiceProperties.class} )
-    @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
-    @Import( SpanCustomizingAsyncHandlerInterceptor.class )
-    public static class BraveEnabled extends WebMvcConfigurerAdapter {
+    @EnableConfigurationProperties({BraveProperties.class, ServiceProperties.class})
+    @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
+    public static class BraveEnabled {
         @Autowired
         private BraveProperties braveProperties;
 
@@ -153,9 +133,6 @@ public class BraveAutoConfiguration {
         private ServiceProperties serviceProperties;
 
 
-        @Autowired
-        private SpanCustomizingAsyncHandlerInterceptor spanCustomizingAsyncHandlerInterceptor;
-
         @Bean
         @ConditionalOnMissingBean
         Sender sender() {
@@ -185,26 +162,46 @@ public class BraveAutoConfiguration {
             return HttpTracing.create(tracing);
         }
 
+
+        @Configuration
+        @ConditionalOnWebApplication
+        @ConditionalOnClass({Filter.class})
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
+        public static class ServletEnable {
             /**
              * 创建一个bean
              *
              * @return
              */
-        @Bean( name = "techDelegatingTracingFilter" )
+            @Bean(name = "techDelegatingTracingFilter")
             public Filter delegatingTracingFilter() {
                 log.info("注册DelegatingTracingFilter");
                 return new DelegatingTracingFilter();
             }
 
+        }
+
+        @Configuration
+        @ConditionalOnClass({WebMvcConfigurerAdapter.class})
+        @Import(SpanCustomizingAsyncHandlerInterceptor.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
+        public static class WebMvcEnable extends WebMvcConfigurerAdapter {
+
+            @Autowired
+            private SpanCustomizingAsyncHandlerInterceptor spanCustomizingAsyncHandlerInterceptor;
+
+
             @Override
             public void addInterceptors(InterceptorRegistry registry) {
                 log.info("添加braveWebmvc拦截器");
                 registry.addInterceptor(spanCustomizingAsyncHandlerInterceptor);
             }
 
+        }
+
         @Configuration
-        @ConditionalOnClass( RabbitTemplate.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
+        @ConditionalOnClass(RabbitTemplate.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
         public static class RabbitTemplateEnable {
             /**
              * 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
@@ -212,15 +209,15 @@ public class BraveAutoConfiguration {
              * @param tracing
              * @return
              */
-            @Bean( name = "techRabbitBuilder" )
+            @Bean(name = "techRabbitBuilder")
             public ITechRabbitBuilder rabbitTemplateBuilder(Tracing tracing) {
                 return new TechRabbitBuilderTrace(tracing);
             }
         }
 
         @Configuration
-        @ConditionalOnClass( HttpClient.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
+        @ConditionalOnClass(HttpClient.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
         public static class HttpClientEnable {
             /**
              * 提供HttpClientBuilderBean
@@ -228,7 +225,7 @@ public class BraveAutoConfiguration {
              * @param tracing
              * @return
              */
-            @Bean( name = "techHttpClientBuilder" )
+            @Bean(name = "techHttpClientBuilder")
             public HttpClientBuilder httpClientBuilder(Tracing tracing) {
                 log.info("注册braveHttpClientBuilder");
                 return TracingHttpClientBuilder.create(tracing);
@@ -236,8 +233,8 @@ public class BraveAutoConfiguration {
         }
 
         @Configuration
-        @ConditionalOnClass( OkHttpClient.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
+        @ConditionalOnClass(OkHttpClient.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
         public static class OkHttpClientEnable {
             /**
              * 提供OkHttpClientBean
@@ -245,7 +242,7 @@ public class BraveAutoConfiguration {
              * @param httpTracing
              * @return
              */
-            @Bean( name = "techOkHttpClientBuilder" )
+            @Bean(name = "techOkHttpClientBuilder")
             public OkHttpClient.Builder okHttpClientBuilder(HttpTracing httpTracing) {
                 log.info("注册braveOkHttpClient.Builder");
                 return new OkHttpClient.Builder()
@@ -256,9 +253,9 @@ public class BraveAutoConfiguration {
 
 
         @Configuration
-        @ConditionalOnClass( RestTemplate.class )
-        @ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
-        @Import( TracingClientHttpRequestInterceptor.class )
+        @ConditionalOnClass(RestTemplate.class)
+        @ConditionalOnProperty(prefix = "tech.brave", name = "enabled", havingValue = "true", matchIfMissing = true)
+        @Import(TracingClientHttpRequestInterceptor.class)
         public static class RestTemplateEnable {
             @Autowired
             private TracingClientHttpRequestInterceptor clientInterceptor;
@@ -268,7 +265,7 @@ public class BraveAutoConfiguration {
              *
              * @return
              */
-            @Bean( name = "techRestTemplate" )
+            @Bean(name = "techRestTemplate")
             public RestTemplate restTemplate() {
                 log.info("添加braveRestTemplate拦截器");
                 RestTemplate restTemplate = new RestTemplate();