Skip to content

Adjust to changes in FeignBlockingLoadBalancer client constructor. #1565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2020
Merged

Adjust to changes in FeignBlockingLoadBalancer client constructor. #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...mework/cloud/sleuth/instrument/web/client/feign/TraceFeignBlockingLoadBalancerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
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;

/**
Expand All @@ -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;
}
Expand Down
8 changes: 4 additions & 4 deletions ...org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

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;
Expand Down Expand Up @@ -80,7 +80,7 @@ private Object instrumentedFeignLoadBalancerClient(Object bean) {
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);
Expand All @@ -96,13 +96,13 @@ private Object instrumentedFeignLoadBalancerClient(Object bean) {
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;
}
Expand Down
5 changes: 3 additions & 2 deletions ...ingframework/cloud/sleuth/instrument/web/client/feign/TracingFeignObjectWrapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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;

Expand Down Expand Up @@ -63,7 +64,7 @@ public void should_wrap_feign_loadbalancer_client() {
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
Expand All @@ -78,7 +79,7 @@ public void should_wrap_subclass_of_feign_loadbalancer_client() {
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(
Expand Down
6 changes: 3 additions & 3 deletions ...sleuth/instrument/feign/issues/issue1125/ManuallyCreatedLoadBalancerFeignClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
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;
Expand Down Expand Up @@ -110,7 +110,7 @@ public void span_captured() {
class Application {

@Bean
public Client client(BlockingLoadBalancerClient blockingLoadBalancerClient) {
public Client client(LoadBalancerClient blockingLoadBalancerClient) {
return new MyBlockingClient(new MyDelegateClient(), blockingLoadBalancerClient);
}

Expand All @@ -128,7 +128,7 @@ public Reporter<Span> spanReporter() {

class MyBlockingClient extends FeignBlockingLoadBalancerClient {

MyBlockingClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient) {
MyBlockingClient(Client delegate, LoadBalancerClient loadBalancerClient) {
super(delegate, loadBalancerClient);
}

Expand Down