From 4634585c351a3ad3e44d478431d077a27265353b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 20 Feb 2020 13:45:44 +0100 Subject: [PATCH] Adjust to changes in FeignBlockingLoadBalancer client constructor. --- .../feign/TraceFeignBlockingLoadBalancerClient.java | 4 ++-- .../web/client/feign/TraceFeignObjectWrapper.java | 8 ++++---- .../web/client/feign/TracingFeignObjectWrapperTests.java | 5 +++-- .../ManuallyCreatedLoadBalancerFeignClientTests.java | 6 +++--- 4 files changed, 12 insertions(+), 11 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 150bbeefd..585a560e4 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 @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; -import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; /** @@ -54,7 +54,7 @@ public class TraceFeignBlockingLoadBalancerClient TracingFeignClient tracingFeignClient; TraceFeignBlockingLoadBalancerClient(Client delegate, - BlockingLoadBalancerClient loadBalancerClient, BeanFactory beanFactory) { + LoadBalancerClient loadBalancerClient, BeanFactory beanFactory) { super(delegate, loadBalancerClient); this.beanFactory = beanFactory; } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java index c88b6a863..6fc4f51e9 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanFactory; -import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; import org.springframework.cloud.util.ProxyUtils; import org.springframework.util.ClassUtils; @@ -80,7 +80,7 @@ final class TraceFeignObjectWrapper { return new TraceFeignBlockingLoadBalancerClient( (Client) new TraceFeignObjectWrapper(this.beanFactory) .wrap(client.getDelegate()), - (BlockingLoadBalancerClient) loadBalancerClient(), this.beanFactory); + (LoadBalancerClient) loadBalancerClient(), this.beanFactory); } else { FeignBlockingLoadBalancerClient client = ProxyUtils.getTargetObject(bean); @@ -96,13 +96,13 @@ final class TraceFeignObjectWrapper { log.warn(EXCEPTION_WARNING, e); } return new TraceFeignBlockingLoadBalancerClient(client, - (BlockingLoadBalancerClient) loadBalancerClient(), this.beanFactory); + (LoadBalancerClient) loadBalancerClient(), this.beanFactory); } } private Object loadBalancerClient() { if (loadBalancerClient == null) { - loadBalancerClient = beanFactory.getBean(BlockingLoadBalancerClient.class); + loadBalancerClient = beanFactory.getBean(LoadBalancerClient.class); } return loadBalancerClient; } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java index de2b9a50e..c08c6e33e 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java @@ -24,6 +24,7 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; @@ -63,7 +64,7 @@ public class TracingFeignObjectWrapperTests { Client delegate = mock(Client.class); BlockingLoadBalancerClient loadBalancerClient = mock( BlockingLoadBalancerClient.class); - when(beanFactory.getBean(BlockingLoadBalancerClient.class)) + when(beanFactory.getBean(LoadBalancerClient.class)) .thenReturn(loadBalancerClient); Object wrapped = traceFeignObjectWrapper @@ -78,7 +79,7 @@ public class TracingFeignObjectWrapperTests { Client delegate = mock(Client.class); BlockingLoadBalancerClient loadBalancerClient = mock( BlockingLoadBalancerClient.class); - when(beanFactory.getBean(BlockingLoadBalancerClient.class)) + when(beanFactory.getBean(LoadBalancerClient.class)) .thenReturn(loadBalancerClient); Object wrapped = traceFeignObjectWrapper.wrap( diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java index da1c890ce..996931a1b 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java @@ -36,7 +36,7 @@ import zipkin2.reporter.Reporter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient; @@ -110,7 +110,7 @@ public class ManuallyCreatedLoadBalancerFeignClientTests { class Application { @Bean - public Client client(BlockingLoadBalancerClient blockingLoadBalancerClient) { + public Client client(LoadBalancerClient blockingLoadBalancerClient) { return new MyBlockingClient(new MyDelegateClient(), blockingLoadBalancerClient); } @@ -128,7 +128,7 @@ class Application { class MyBlockingClient extends FeignBlockingLoadBalancerClient { - MyBlockingClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient) { + MyBlockingClient(Client delegate, LoadBalancerClient loadBalancerClient) { super(delegate, loadBalancerClient); }