SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2.x'

Browse Source 
# Conflicts:
#	.github/workflows/maven.yml
#	spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
#	spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceRetryableFeignBlockingLoadBalancerClient.java
This commit is contained in:
Olga Maciaszek-Sharma
2021-02-08 15:58:06 +01:00
parent ae716c745e b3c038b427
commit 3646b786a7
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
View File

@@ -85,16 +85,10 @@ class TraceFeignBlockingLoadBalancerClient extends FeignBlockingLoadBalancerClie
if (LOG.isDebugEnabled()) {
LOG.debug("Exception thrown", e);
}
if (e instanceof IOException/*
* || e.getCause() != null && e.getCause()
* instanceof ClientException &&
* ((ClientException) e.getCause())
* .getErrorType() ==
* ClientException.ErrorType.GENERAL
*/) {
if (e instanceof IOException) {
if (LOG.isDebugEnabled()) {
LOG.debug(
"General exception was thrown, so most likely the traced client wasn't called. Falling back to a manual span");
"IOException was thrown, so most likely the traced client wasn't called. Falling back to a manual span.");
}
tracingFeignClient().handleSendAndReceive(fallbackSpan, request, response, e);
}