Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
commons
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DevOps
commons
Commits
7be203a3
Commit
7be203a3
authored
Jun 15, 2020
by
郑航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加入FeignReplaceWithOkhttp
支持Feign自动替换Client为OkHttp,支持调用链跟踪 加入Feign使用OkHttp时的日志打印,无需单独配置Feign日志打印
parent
c86ff641
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
1 deletion
+63
-1
pom.xml
brave-spring-boot-starter/pom.xml
+19
-0
BraveAutoConfiguration.java
...roup/tech/brave/configuration/BraveAutoConfiguration.java
+44
-1
No files found.
brave-spring-boot-starter/pom.xml
View file @
7be203a3
...
...
@@ -18,6 +18,7 @@
<zipkin.version>
2.6.1
</zipkin.version>
<okhttp.version>
3.10.0
</okhttp.version>
<elastic.job.version>
2.1.5
</elastic.job.version>
<feign-http.version>
9.5.1
</feign-http.version>
</properties>
<dependencyManagement>
...
...
@@ -36,6 +37,18 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>
io.github.openfeign
</groupId>
<artifactId>
feign-okhttp
</artifactId>
<version>
${feign-http.version}
</version>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
<version>
1.4.0.RELEASE
</version>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
...
...
@@ -63,6 +76,12 @@
<version>
${okhttp.version}
</version>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
com.squareup.okhttp3
</groupId>
<artifactId>
logging-interceptor
</artifactId>
<version>
${okhttp.version}
</version>
<optional>
true
</optional>
</dependency>
<dependency>
<groupId>
org.springframework.amqp
</groupId>
...
...
brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java
View file @
7be203a3
...
...
@@ -16,9 +16,12 @@ import cn.quantgroup.tech.brave.service.*;
import
cn.quantgroup.tech.brave.service.impl.*
;
import
cn.quantgroup.tech.brave.slf4j.MDCCurrentTraceContext
;
import
com.dangdang.ddframe.job.api.ElasticJob
;
import
feign.Client
;
import
lombok.extern.slf4j.Slf4j
;
import
okhttp3.ConnectionPool
;
import
okhttp3.Dispatcher
;
import
okhttp3.OkHttpClient
;
import
okhttp3.logging.HttpLoggingInterceptor
;
import
org.apache.http.client.HttpClient
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.aspectj.lang.ProceedingJoinPoint
;
...
...
@@ -26,9 +29,13 @@ import org.aspectj.lang.annotation.Around;
import
org.aspectj.lang.annotation.Aspect
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.*
;
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.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.cloud.netflix.feign.EnableFeignClients
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
...
...
@@ -45,6 +52,7 @@ import zipkin2.reporter.kafka11.KafkaSender;
import
javax.servlet.Filter
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
/**
* 注册brave
...
...
@@ -285,6 +293,41 @@ public class BraveAutoConfiguration {
}
}
@Configuration
@ConditionalOnClass
(
EnableFeignClients
.
class
)
@ConditionalOnProperty
(
prefix
=
"tech.brave"
,
name
=
"enabled"
,
havingValue
=
"true"
,
matchIfMissing
=
true
)
public
static
class
FeignReplaceWithOkhttp
{
@Autowired
private
ITechOkHttpClient
techOkHttpClient
;
/**
* FeignReplaceWithOkhttp 替换Feign默认客户端为OKHTTP 支持调用链跟踪
*
* @return
*/
@Bean
public
Client
feignClient
()
{
log
.
info
(
"开始注册FeignClient,使用OkHttp替换FeignClient"
);
return
new
feign
.
okhttp
.
OkHttpClient
(
okHttpClient
());
}
@Bean
public
OkHttpClient
okHttpClient
()
{
okhttp3
.
OkHttpClient
.
Builder
okHttpClientBuilder
=
techOkHttpClient
.
createOkHttpClientBuilder
();
HttpLoggingInterceptor
httpLoggingInterceptor
=
new
HttpLoggingInterceptor
();
httpLoggingInterceptor
.
setLevel
(
HttpLoggingInterceptor
.
Level
.
BODY
);
okHttpClientBuilder
.
addInterceptor
(
httpLoggingInterceptor
)
.
connectionPool
(
new
ConnectionPool
(
100
,
5
,
TimeUnit
.
MINUTES
))
.
readTimeout
(
1
,
TimeUnit
.
SECONDS
)
.
writeTimeout
(
1
,
TimeUnit
.
SECONDS
)
.
connectTimeout
(
1
,
TimeUnit
.
SECONDS
)
.
retryOnConnectionFailure
(
true
);
return
okHttpClientBuilder
.
build
();
}
}
@Deprecated
@Configuration
@ConditionalOnClass
(
HttpClient
.
class
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment