From b3c038b4274eb4b5cd73ac80373df3e298b5e62e Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Mon, 8 Feb 2021 15:40:14 +0100
Subject: [PATCH] Remove ClientException check for
 TraceFeignBlockingLoadBalancerClient and
 TraceRetryableFeignBlockingLoadBalancerClient (#1842)

* Remove ClientException check for TraceFeignBlockingLoadBalancerClient and TraceRetryableFeignBlockingLoadBalancerClient. Fixes gh-1838.

* Trigger Build
---
 .../feign/TraceFeignBlockingLoadBalancerClient.java       | 8 ++------
 .../TraceRetryableFeignBlockingLoadBalancerClient.java    | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
index bf00cf4d4..1a7637636 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import brave.Span;
 import brave.Tracer;
 import brave.http.HttpTracing;
-import com.netflix.client.ClientException;
 import feign.Client;
 import feign.Request;
 import feign.Response;
@@ -83,13 +82,10 @@ public class TraceFeignBlockingLoadBalancerClient
 			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");
+							"IO exception was thrown, so most likely the traced client wasn't called. Falling back to a manual span");
 				}
 				tracingFeignClient().handleSendAndReceive(fallbackSpan, request, response,
 						e);
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceRetryableFeignBlockingLoadBalancerClient.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceRetryableFeignBlockingLoadBalancerClient.java
index fba1c0d20..36c4e9121 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceRetryableFeignBlockingLoadBalancerClient.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceRetryableFeignBlockingLoadBalancerClient.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import brave.Span;
 import brave.Tracer;
 import brave.http.HttpTracing;
-import com.netflix.client.ClientException;
 import feign.Client;
 import feign.Request;
 import feign.Response;
@@ -80,13 +79,10 @@ class TraceRetryableFeignBlockingLoadBalancerClient
 			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");
+							"IO exception was thrown, so most likely the traced client wasn't called. Falling back to a manual span");
 				}
 				tracingFeignClient().handleSendAndReceive(fallbackSpan, request, response,
 						e);