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

Verifies if Ribbon is on the classpath; fixes gh-975

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-05-07 21:09:33 +02:00
parent caaa3731b4
commit 5ca9080dab
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.openfeign.ribbon.CachingSpringLoadBalancerFactory;
import org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
import org.springframework.util.ClassUtils;
/**
* Class that wraps Feign related classes into their Trace representative
@@ -33,7 +34,13 @@ final class TraceFeignObjectWrapper {
private final BeanFactory beanFactory;
private CachingSpringLoadBalancerFactory cachingSpringLoadBalancerFactory;
private SpringClientFactory springClientFactory;
private Object springClientFactory;
private static final boolean hasLoadBalancerFeignClientClass;
static {
hasLoadBalancerFeignClientClass =
ClassUtils.isPresent("org.springframework.cloud.openfeign.ribbon.LoadBalancerFeignClient", null);
}
TraceFeignObjectWrapper(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
@@ -41,13 +48,15 @@ final class TraceFeignObjectWrapper {
Object wrap(Object bean) {
if (bean instanceof Client && !(bean instanceof TracingFeignClient)) {
if (bean instanceof LoadBalancerFeignClient && !(bean instanceof TraceLoadBalancerFeignClient)) {
if (hasLoadBalancerFeignClientClass &&
bean instanceof LoadBalancerFeignClient && !(bean instanceof TraceLoadBalancerFeignClient)) {
LoadBalancerFeignClient client = ((LoadBalancerFeignClient) bean);
return new TraceLoadBalancerFeignClient(
(Client) new TraceFeignObjectWrapper(this.beanFactory)
.wrap(client.getDelegate()),
factory(), clientFactory(), this.beanFactory);
} else if (bean instanceof TraceLoadBalancerFeignClient) {
} else if (hasLoadBalancerFeignClientClass &&
bean instanceof TraceLoadBalancerFeignClient) {
return bean;
}
return new LazyTracingFeignClient(this.beanFactory, (Client) bean);
@@ -68,7 +77,7 @@ final class TraceFeignObjectWrapper {
this.springClientFactory = this.beanFactory
.getBean(SpringClientFactory.class);
}
return this.springClientFactory;
return (SpringClientFactory) this.springClientFactory;
}
}