Merge remote-tracking branch 'upstream/1.3.x'

pom.xml

@@ -18,7 +18,7 @@
         <java.version>1.7</java.version>
         <main.basedir>${basedir}</main.basedir>
         <spring-boot.version>1.4.0.M3</spring-boot.version>
-        <spring-cloud.version>Brixton.SR1</spring-cloud.version>
+        <spring-cloud.version>Brixton.SR2</spring-cloud.version>
         <build-plugin.jacoco.version>0.7.7.201606060606</build-plugin.jacoco.version>
         <build-plugin.coveralls.version>4.2.0</build-plugin.coveralls.version>
         <build-plugin.gpg.version>1.6</build-plugin.gpg.version>

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/config/RevereseZuulProxyConfiguration.java

@@ -25,6 +25,7 @@ import org.springframework.cloud.netflix.zuul.RoutesEndpoint;
 import org.springframework.cloud.netflix.zuul.ZuulConfiguration;
 import org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper;
 import org.springframework.cloud.netflix.zuul.filters.RouteLocator;
+import org.springframework.cloud.netflix.zuul.filters.TraceProxyRequestHelper;
 import org.springframework.cloud.netflix.zuul.filters.pre.PreDecorationFilter;
 import org.springframework.cloud.netflix.zuul.filters.route.SimpleHostRoutingFilter;
 import org.springframework.cloud.netflix.zuul.web.ZuulHandlerMapping;
@@ -64,7 +65,7 @@ public class RevereseZuulProxyConfiguration extends ZuulConfiguration {
 
 	@Bean
 	public ProxyRequestHelper proxyRequestHelper() {
-		ProxyRequestHelper helper = new ProxyRequestHelper();
+		TraceProxyRequestHelper helper = new TraceProxyRequestHelper();
 		if (this.traces != null) {
 			helper.setTraces(this.traces);
 		}