Skip to content

C
commons
Commit f87b6c77 authored by 技术部-高工-张恒's avatar 技术部-高工-张恒
Browse files
Options

增加对httpclient、okhttpclient、rabbittemplate的依赖判断

parent e9b87212
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 94 deletions
brave-spring-boot-starter/pom.xml
View file @ f87b6c77
......@@ -46,17 +46,20 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>3.10.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<optional>true</optional>
</dependency>
<dependency>
......
brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java
View file @ f87b6c77
......@@ -18,9 +18,12 @@ import cn.quantgroup.tech.brave.service.TechRabbitBuilderTrace;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Dispatcher;
import okhttp3.OkHttpClient;
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.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
......@@ -54,7 +57,7 @@ import java.util.List;
@Slf4j
@Configuration
@AutoConfigureOrder
@Conditional(BraveAutoConfiguration.BraveSet.class)
@Conditional( BraveAutoConfiguration.BraveSet.class )
public class BraveAutoConfiguration {
static final class BraveSet implements Condition {
@Override
......@@ -71,55 +74,73 @@ public class BraveAutoConfiguration {
@EnableConfigurationProperties( BraveProperties.class )
@ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "false" )
public static class BraveUntEnabled {
/**
* 提供HttpClientBuilderBean
*
* @return
*/
@Bean( name = "techHttpClientBuilder" )
public HttpClientBuilder httpClientBuilder() {
log.info("注册HttpClientBuilder");
return TracingHttpClientBuilder.create();
@Configuration
@ConditionalOnClass( RabbitTemplate.class )
public static class RabbitTemplateEnable {
/**
* 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
*
* @return
*/
@Bean( name = "techRabbitTemplateBuilder" )
public ITechRabbitBuilder rabbitTemplateBuilder() {
return new TechRabbitBuilderNoTrace();
}
}
/**
* 提供OkHttpClientBean
*
* @return
*/
@Bean( name = "techOkHttpClientBuilder" )
public OkHttpClient.Builder okHttpClientBuilder() {
log.info("注册OkHttpClient.Builder");
return new OkHttpClient.Builder();
@Configuration
@ConditionalOnClass( HttpClient.class )
public static class HttpClientEnable {
/**
* 提供HttpClientBuilderBean
*
* @return
*/
@Bean( name = "techHttpClientBuilder" )
public HttpClientBuilder httpClientBuilder() {
log.info("注册HttpClientBuilder");
return TracingHttpClientBuilder.create();
}
}
/**
* 提供RestTemplate
*
* @return
*/
@Bean( name = "techRestTemplate" )
public RestTemplate restTemplate() {
log.info("添加restTemplate拦截器");
return new RestTemplate();
@Configuration
@ConditionalOnClass( OkHttpClient.class )
public static class OkHttpClientEnable {
/**
* 提供OkHttpClientBean
*
* @return
*/
@Bean( name = "techOkHttpClientBuilder" )
public OkHttpClient.Builder okHttpClientBuilder() {
log.info("注册OkHttpClient.Builder");
return new OkHttpClient.Builder();
}
}
/**
* 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
*
* @return
*/
@Bean( name = "techRabbitTemplateBuilder" )
public ITechRabbitBuilder rabbitTemplateBuilder() {
return new TechRabbitBuilderNoTrace();
@Configuration
@ConditionalOnClass( RestTemplate.class )
public static class RestTemplateEnable {
/**
* 提供RestTemplate
*
* @return
*/
@Bean( name = "techRestTemplate" )
public RestTemplate restTemplate() {
log.info("添加restTemplate拦截器");
return new RestTemplate();
}
}
}
@Configuration
@EnableWebMvc
@EnableConfigurationProperties( {BraveProperties.class, ServiceProperties.class} )
@ConditionalOnProperty( prefix = "tech.brave", name = "enabled", havingValue = "true" )
@Import( {TracingClientHttpRequestInterceptor.class, SpanCustomizingAsyncHandlerInterceptor.class} )
@Import( SpanCustomizingAsyncHandlerInterceptor.class )
public static class BraveEnabled extends WebMvcConfigurerAdapter {
@Autowired
private BraveProperties braveProperties;
......@@ -127,9 +148,6 @@ public class BraveAutoConfiguration {
@Autowired
private ServiceProperties serviceProperties;
@Autowired
private TracingClientHttpRequestInterceptor clientInterceptor;
@Autowired
private SpanCustomizingAsyncHandlerInterceptor spanCustomizingAsyncHandlerInterceptor;
......@@ -159,44 +177,6 @@ public class BraveAutoConfiguration {
return HttpTracing.create(tracing);
}
/**
* 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
*
* @param tracing
* @return
*/
@Bean( name = "techRabbitBuilder" )
public ITechRabbitBuilder rabbitTemplateBuilder(Tracing tracing) {
return new TechRabbitBuilderTrace(tracing);
}
/**
* 提供HttpClientBuilderBean
*
* @param tracing
* @return
*/
@Bean( name = "techHttpClientBuilder" )
public HttpClientBuilder httpClientBuilder(Tracing tracing) {
log.info("注册braveHttpClientBuilder");
return TracingHttpClientBuilder.create(tracing);
}
/**
* 提供OkHttpClientBean
*
* @param httpTracing
* @return
*/
@Bean( name = "techOkHttpClientBuilder" )
public OkHttpClient.Builder okHttpClientBuilder(HttpTracing httpTracing) {
log.info("注册braveOkHttpClient.Builder");
return new OkHttpClient.Builder()
.dispatcher(new Dispatcher(httpTracing.tracing().currentTraceContext().executorService(new Dispatcher().executorService())))
.addNetworkInterceptor(TracingInterceptor.create(httpTracing));
}
/**
* 创建一个bean
*
......@@ -208,27 +188,86 @@ public class BraveAutoConfiguration {
return new DelegatingTracingFilter();
}
/**
* 提供RestTemplate
*
* @return
*/
@Bean( name = "techRestTemplate" )
public RestTemplate restTemplate() {
log.info("添加braveRestTemplate拦截器");
RestTemplate restTemplate = new RestTemplate();
List<ClientHttpRequestInterceptor> interceptors =
new ArrayList<>(restTemplate.getInterceptors());
interceptors.add(clientInterceptor);
restTemplate.setInterceptors(interceptors);
return restTemplate;
}
@Override
public void addInterceptors(InterceptorRegistry registry) {
log.info("添加braveWebmvc拦截器");
registry.addInterceptor(spanCustomizingAsyncHandlerInterceptor);
}
@Configuration
@ConditionalOnClass( RabbitTemplate.class )
public static class RabbitTemplateEnable {
/**
* 提供RabbitTemplateBuilder,业务系统需要使用该Builder生成RabbitTemplate
*
* @param tracing
* @return
*/
@Bean( name = "techRabbitBuilder" )
public ITechRabbitBuilder rabbitTemplateBuilder(Tracing tracing) {
return new TechRabbitBuilderTrace(tracing);
}
}
@Configuration
@ConditionalOnClass( HttpClient.class )
public static class HttpClientEnable {
/**
* 提供HttpClientBuilderBean
*
* @param tracing
* @return
*/
@Bean( name = "techHttpClientBuilder" )
public HttpClientBuilder httpClientBuilder(Tracing tracing) {
log.info("注册braveHttpClientBuilder");
return TracingHttpClientBuilder.create(tracing);
}
}
@Configuration
@ConditionalOnClass( OkHttpClient.class )
public static class OkHttpClientEnable {
/**
* 提供OkHttpClientBean
*
* @param httpTracing
* @return
*/
@Bean( name = "techOkHttpClientBuilder" )
public OkHttpClient.Builder okHttpClientBuilder(HttpTracing httpTracing) {
log.info("注册braveOkHttpClient.Builder");
return new OkHttpClient.Builder()
.dispatcher(new Dispatcher(httpTracing.tracing().currentTraceContext().executorService(new Dispatcher().executorService())))
.addNetworkInterceptor(TracingInterceptor.create(httpTracing));
}
}
@Configuration
@ConditionalOnClass( RestTemplate.class )
@Import( TracingClientHttpRequestInterceptor.class )
public static class RestTemplateEnable {
@Autowired
private TracingClientHttpRequestInterceptor clientInterceptor;
/**
* 提供RestTemplate
*
* @return
*/
@Bean( name = "techRestTemplate" )
public RestTemplate restTemplate() {
log.info("添加braveRestTemplate拦截器");
RestTemplate restTemplate = new RestTemplate();
List<ClientHttpRequestInterceptor> interceptors =
new ArrayList<>(restTemplate.getInterceptors());
interceptors.add(clientInterceptor);
restTemplate.setInterceptors(interceptors);
return restTemplate;
}
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment