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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-22 10:17:51 +01:00
parent 8a93262cb4 82cff6e9e9
commit 345cfc8b50
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,8 @@ class TraceFeignAspect {
@Around("execution (* feign.Client.*(..)) && !within(is(FinalType))")
public Object feignClientWasCalled(final ProceedingJoinPoint pjp) throws Throwable {
Object bean = pjp.getTarget();
if (!(bean instanceof TraceFeignClient) && !(bean instanceof TraceLoadBalancerFeignClient)) {
Object wrappedBean = new TraceFeignObjectWrapper(this.beanFactory).wrap(bean);
if (bean != wrappedBean) {
return executeTraceFeignClient(bean, pjp);
}
return pjp.proceed();
@@ -54,6 +55,6 @@ class TraceFeignAspect {
Object[] args = pjp.getArgs();
Request request = (Request) args[0];
Request.Options options = (Request.Options) args[1];
return new TraceFeignClient(this.beanFactory, (Client) bean).execute(request, options);
return ((Client) bean).execute(request, options);
}
}