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

Merge pull request #1565 from spring-cloud/adjust-sleuth-to-lb-changes-in-commons

Browse Source 
Adjust to changes in FeignBlockingLoadBalancer client constructor.
This commit is contained in:
Olga Maciaszek-Sharma
2020-02-22 14:39:53 +01:00
committed by GitHub
parent b34e04666d 4634585c35
commit 8f4d7dd8d8
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

8
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java
View File

@@ -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;
}

5
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java
View File

@@ -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(

6
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java
View File

@@ -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);
}