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

Simplified TraceZuulHandlerMapping

Browse Source 
without this change we were wrapping the ZuulHandlerMapping in its tracing representation.

with this change we are simplifing that by adding interceptors

fixes #399
This commit is contained in:
Marcin Grzejszczak
2016-09-13 10:16:13 +02:00
parent 9ebd9184ca
commit 4c3ca67235
1 changed files with 5 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulHandlerMappingBeanPostProcessor.java
View File

@@ -17,16 +17,12 @@
package org.springframework.cloud.sleuth.instrument.zuul;
import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.autoconfigure.web.ErrorController;
import org.springframework.cloud.netflix.zuul.filters.RouteLocator;
import org.springframework.cloud.netflix.zuul.web.ZuulController;
import org.springframework.cloud.netflix.zuul.web.ZuulHandlerMapping;
import org.springframework.cloud.sleuth.instrument.web.TraceHandlerInterceptor;
@@ -42,9 +38,6 @@ class TraceZuulHandlerMappingBeanPostProcessor implements BeanPostProcessor {
private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
private final BeanFactory beanFactory;
private RouteLocator routeLocator;
private ZuulController zuul;
private ErrorController errorController;
public TraceZuulHandlerMappingBeanPostProcessor(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
@@ -53,13 +46,13 @@ class TraceZuulHandlerMappingBeanPostProcessor implements BeanPostProcessor {
@Override
public Object postProcessBeforeInitialization(Object bean, String beanName)
throws BeansException {
if (bean instanceof ZuulHandlerMapping && !(bean instanceof TraceZuulHandlerMapping)) {
if (bean instanceof ZuulHandlerMapping) {
if (log.isDebugEnabled()) {
log.debug("Wrapping bean [" + beanName + "] of type [" + bean.getClass().getSimpleName() +
"] in its trace representation");
log.debug("Attaching trace interceptor to bean [" + beanName + "] of type [" + bean.getClass().getSimpleName() + "]");
}
return new TraceZuulHandlerMapping(this.beanFactory, routeLocator(), zuulController(),
errorController());
ZuulHandlerMapping zuulHandlerMapping = (ZuulHandlerMapping) bean;
zuulHandlerMapping.setInterceptors(
new Object[] { new TraceHandlerInterceptor(this.beanFactory) });
}
return bean;
}
@@ -69,46 +62,4 @@ class TraceZuulHandlerMappingBeanPostProcessor implements BeanPostProcessor {
throws BeansException {
return bean;
}
private static class TraceZuulHandlerMapping extends ZuulHandlerMapping {
private final BeanFactory beanFactory;
public TraceZuulHandlerMapping(BeanFactory beanFactory, RouteLocator routeLocator,
ZuulController zuulController, ErrorController errorController) {
super(routeLocator, zuulController);
this.beanFactory = beanFactory;
setErrorController(errorController);
}
@Override
protected void extendInterceptors(List<Object> interceptors) {
interceptors.add(new TraceHandlerInterceptor(this.beanFactory));
}
}
private RouteLocator routeLocator() {
if (this.routeLocator == null) {
this.routeLocator = this.beanFactory.getBean(RouteLocator.class);
}
return this.routeLocator;
}
private ZuulController zuulController() {
if (this.zuul == null) {
this.zuul = this.beanFactory.getBean(ZuulController.class);
}
return this.zuul;
}
private ErrorController errorController() {
if (this.errorController == null) {
try {
this.errorController = this.beanFactory.getBean(ErrorController.class);
} catch (BeansException b) {
return null;
}
}
return this.errorController;
}
}