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

Use new LoadBalancerClientsProperties class

Browse Source
This commit is contained in:
Jonatan Ivanov
2021-10-28 13:18:43 -07:00
parent fd45548d76
commit 3c3fca3b61
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
import org.springframework.cloud.sleuth.CurrentTraceContext;
@@ -56,7 +56,7 @@ class TraceFeignBlockingLoadBalancerClient extends FeignBlockingLoadBalancerClie
TracingFeignClient tracingFeignClient;
TraceFeignBlockingLoadBalancerClient(Client delegate, LoadBalancerClient loadBalancerClient,
LoadBalancerProperties loadBalancerProperties, LoadBalancerClientFactory loadBalancerClientFactory,
LoadBalancerClientsProperties loadBalancerProperties, LoadBalancerClientFactory loadBalancerClientFactory,
BeanFactory beanFactory) {
super(delegate, loadBalancerClient, loadBalancerProperties, loadBalancerClientFactory);
this.beanFactory = beanFactory;

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

@@ -26,7 +26,7 @@ import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
@@ -64,7 +64,7 @@ final class TraceFeignObjectWrapper {
private Object loadBalancerClient;
private LoadBalancerProperties loadBalancerProperties;
private LoadBalancerClientsProperties loadBalancerProperties;
private Object loadBalancerRetryFactory;
@@ -98,7 +98,7 @@ final class TraceFeignObjectWrapper {
FeignBlockingLoadBalancerClient client = ProxyUtils.getTargetObject(bean);
return new TraceFeignBlockingLoadBalancerClient(
(Client) new TraceFeignObjectWrapper(this.beanFactory).wrap(client.getDelegate()),
(LoadBalancerClient) loadBalancerClient(), loadBalancerProperties(),
(LoadBalancerClient) loadBalancerClient(), loadBalancerClientsProperties(),
(LoadBalancerClientFactory) loadBalancerClientFactory(), this.beanFactory);
}
else {
@@ -112,7 +112,7 @@ final class TraceFeignObjectWrapper {
log.warn(EXCEPTION_WARNING, e);
}
return new TraceFeignBlockingLoadBalancerClient(client, (LoadBalancerClient) loadBalancerClient(),
loadBalancerProperties(), (LoadBalancerClientFactory) loadBalancerClientFactory(),
loadBalancerClientsProperties(), (LoadBalancerClientFactory) loadBalancerClientFactory(),
this.beanFactory);
}
}
@@ -123,7 +123,7 @@ final class TraceFeignObjectWrapper {
return new TraceRetryableFeignBlockingLoadBalancerClient(
(Client) new TraceFeignObjectWrapper(beanFactory).wrap(client.getDelegate()),
(BlockingLoadBalancerClient) loadBalancerClient(),
(LoadBalancedRetryFactory) loadBalancerRetryFactory(), loadBalancerProperties(),
(LoadBalancedRetryFactory) loadBalancerRetryFactory(), loadBalancerClientsProperties(),
(LoadBalancerClientFactory) loadBalancerClientFactory(), beanFactory);
}
else {
@@ -138,7 +138,7 @@ final class TraceFeignObjectWrapper {
}
return new TraceRetryableFeignBlockingLoadBalancerClient(client,
(BlockingLoadBalancerClient) loadBalancerClient(),
(LoadBalancedRetryFactory) loadBalancerRetryFactory(), loadBalancerProperties(),
(LoadBalancedRetryFactory) loadBalancerRetryFactory(), loadBalancerClientsProperties(),
(LoadBalancerClientFactory) loadBalancerClientFactory(), beanFactory);
}
}
@@ -150,9 +150,9 @@ final class TraceFeignObjectWrapper {
return loadBalancerClient;
}
private LoadBalancerProperties loadBalancerProperties() {
private LoadBalancerClientsProperties loadBalancerClientsProperties() {
if (loadBalancerProperties == null) {
loadBalancerProperties = beanFactory.getBean(LoadBalancerProperties.class);
loadBalancerProperties = beanFactory.getBean(LoadBalancerClientsProperties.class);
}
return loadBalancerProperties;
}

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

@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.loadbalancer.RetryableFeignBlockingLoadBalancerClient;
@@ -58,7 +58,7 @@ class TraceRetryableFeignBlockingLoadBalancerClient extends RetryableFeignBlocki
TracingFeignClient tracingFeignClient;
TraceRetryableFeignBlockingLoadBalancerClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient,
LoadBalancedRetryFactory retryFactory, LoadBalancerProperties properties,
LoadBalancedRetryFactory retryFactory, LoadBalancerClientsProperties properties,
LoadBalancerClientFactory loadBalancerClientFactory, BeanFactory beanFactory) {
super(delegate, loadBalancerClient, retryFactory, properties, loadBalancerClientFactory);
this.beanFactory = beanFactory;

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

@@ -28,7 +28,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.loadbalancer.FeignBlockingLoadBalancerClient;
@@ -82,7 +82,7 @@ public class TracingFeignObjectWrapperTests {
Mockito.when(beanFactory.getBean(LoadBalancerClient.class)).thenReturn(loadBalancerClient);
Object wrapped = traceFeignObjectWrapper.wrap(new FeignBlockingLoadBalancerClient(delegate, loadBalancerClient,
new LoadBalancerProperties(), loadBalancerClientFactory));
new LoadBalancerClientsProperties(), loadBalancerClientFactory));
assertThat(wrapped).isInstanceOf(TraceFeignBlockingLoadBalancerClient.class);
}
@@ -97,7 +97,7 @@ public class TracingFeignObjectWrapperTests {
Mockito.when(beanFactory.getBean(LoadBalancerClient.class)).thenReturn(loadBalancerClient);
Object wrapped = traceFeignObjectWrapper.wrap(new RetryableFeignBlockingLoadBalancerClient(delegate,
loadBalancerClient, retryFactory, new LoadBalancerProperties(), loadBalancerClientFactory));
loadBalancerClient, retryFactory, new LoadBalancerClientsProperties(), loadBalancerClientFactory));
assertThat(wrapped).isInstanceOf(TraceRetryableFeignBlockingLoadBalancerClient.class);
}
@@ -155,7 +155,7 @@ public class TracingFeignObjectWrapperTests {
TestFeignBlockingLoadBalancerClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient,
LoadBalancerClientFactory loadBalancerClientFactory) {
super(delegate, loadBalancerClient, new LoadBalancerProperties(), loadBalancerClientFactory);
super(delegate, loadBalancerClient, new LoadBalancerClientsProperties(), loadBalancerClientFactory);
}
}
@@ -164,7 +164,8 @@ public class TracingFeignObjectWrapperTests {
TestRetryableFeignBlockingLoadBalancerClient(Client delegate, BlockingLoadBalancerClient loadBalancerClient,
LoadBalancedRetryFactory retryFactory, LoadBalancerClientFactory loadBalancerClientFactory) {
super(delegate, loadBalancerClient, retryFactory, new LoadBalancerProperties(), loadBalancerClientFactory);
super(delegate, loadBalancerClient, retryFactory, new LoadBalancerClientsProperties(),
loadBalancerClientFactory);
}
}

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

@@ -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.client.loadbalancer.LoadBalancerClient;
import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
import org.springframework.cloud.client.loadbalancer.LoadBalancerClientsProperties;
import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FeignClient;
@@ -102,7 +102,7 @@ public class ManuallyCreatedLoadBalancerFeignClientTests {
class Application {
@Bean
public Client client(LoadBalancerClient blockingLoadBalancerClient, LoadBalancerProperties properties,
public Client client(LoadBalancerClient blockingLoadBalancerClient, LoadBalancerClientsProperties properties,
LoadBalancerClientFactory loadBalancerClientFactory) {
return new MyBlockingClient(new MyDelegateClient(), blockingLoadBalancerClient, properties,
loadBalancerClientFactory);
@@ -128,7 +128,7 @@ class Application {
class MyBlockingClient extends FeignBlockingLoadBalancerClient {
MyBlockingClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancerProperties properties,
MyBlockingClient(Client delegate, LoadBalancerClient loadBalancerClient, LoadBalancerClientsProperties properties,
LoadBalancerClientFactory loadBalancerClientFactory) {
super(delegate, loadBalancerClient, properties, loadBalancerClientFactory);
}