From 0fe82089a2651877bfc61bcaa40cf1dfaba949d5 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 3 Mar 2016 11:16:57 +0100
Subject: [PATCH] Revert "Updated the code with sc-netflix changes"

This reverts commit 7e7c6a1a8f57e96841b1ee780de428ff77b93008.
---
 .../zuul/TraceRestClientRibbonCommandFactory.java   | 13 +++++--------
 .../instrument/zuul/TraceZuulAutoConfiguration.java | 12 ++----------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
index 001fc0197..f95723c22 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
@@ -22,7 +22,6 @@ import java.net.URISyntaxException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommand;
 import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandFactory;
 import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
@@ -52,13 +51,11 @@ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommand
 	private ApplicationEventPublisher publisher;
 
 	private final SpanAccessor accessor;
-	private final ZuulProperties zuulProperties;
 
 	public TraceRestClientRibbonCommandFactory(SpringClientFactory clientFactory,
-			SpanAccessor accessor, ZuulProperties zuulProperties) {
-		super(clientFactory, zuulProperties);
+			SpanAccessor accessor) {
+		super(clientFactory);
 		this.accessor = accessor;
-		this.zuulProperties = zuulProperties;
 	}
 
 	@Override
@@ -75,7 +72,7 @@ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommand
 			return new TraceRestClientRibbonCommand(context.getServiceId(), restClient,
 					getVerb(context.getVerb()), context.getUri(), context.getRetryable(),
 					context.getHeaders(), context.getParams(), context.getRequestEntity(),
-					this.publisher, this.accessor, this.zuulProperties);
+					this.publisher, this.accessor);
 		}
 		catch (URISyntaxException e) {
 			log.error("Exception occurred while trying to create the TraceRestClientRibbonCommand", e);
@@ -94,10 +91,10 @@ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommand
 				HttpRequest.Verb verb, String uri, Boolean retryable,
 				MultiValueMap<String, String> headers,
 				MultiValueMap<String, String> params, InputStream requestEntity,
-				ApplicationEventPublisher publisher, SpanAccessor accessor, ZuulProperties zuulProperties)
+				ApplicationEventPublisher publisher, SpanAccessor accessor)
 						throws URISyntaxException {
 			super(commandKey, restClient, verb, uri, retryable, headers, params,
-					requestEntity, zuulProperties);
+					requestEntity);
 			this.publisher = publisher;
 			this.accessor = accessor;
 		}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
index 32f3ba572..e03dd7b9c 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
@@ -22,7 +22,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.netflix.zuul.filters.ZuulProperties;
 import org.springframework.cloud.sleuth.SpanAccessor;
 import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
@@ -54,15 +53,8 @@ public class TraceZuulAutoConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnMissingBean
-	public ZuulProperties zuulProperties() {
-		return new ZuulProperties();
-	}
-
-	@Bean
-	public TraceRestClientRibbonCommandFactory traceRestClientRibbonCommandFactory(SpringClientFactory factory,
-			SpanAccessor accessor, ZuulProperties zuulProperties) {
-		return new TraceRestClientRibbonCommandFactory(factory, accessor, zuulProperties);
+	public TraceRestClientRibbonCommandFactory traceRestClientRibbonCommandFactory(SpringClientFactory factory, SpanAccessor accessor) {
+		return new TraceRestClientRibbonCommandFactory(factory, accessor);
 	}
 
 	@Bean