From 11f8cd7f14926ddb51570c09645e2d6325ad4adb Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 8 May 2017 10:57:20 +0200
Subject: [PATCH] Fixed invalid constructor

---
 .../cloud/sleuth/instrument/web/TraceWebAspect.java   | 11 -----------
 .../instrument/web/TraceWebAutoConfiguration.java     |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
index 7e759d7fc..ccca1a33e 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
@@ -26,10 +26,8 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.cloud.sleuth.NoOpSpanReporter;
 import org.springframework.cloud.sleuth.Span;
 import org.springframework.cloud.sleuth.SpanNamer;
-import org.springframework.cloud.sleuth.SpanReporter;
 import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.cloud.sleuth.instrument.async.TraceContinuingCallable;
 import org.springframework.cloud.sleuth.util.ExceptionUtils;
@@ -76,19 +74,10 @@ public class TraceWebAspect {
 
 	private final Tracer tracer;
 	private final SpanNamer spanNamer;
-	private final SpanReporter spanReporter;
 
-	@Deprecated
 	public TraceWebAspect(Tracer tracer, SpanNamer spanNamer) {
 		this.tracer = tracer;
 		this.spanNamer = spanNamer;
-		this.spanReporter = new NoOpSpanReporter();
-	}
-
-	public TraceWebAspect(Tracer tracer, SpanNamer spanNamer, SpanReporter spanReporter) {
-		this.tracer = tracer;
-		this.spanNamer = spanNamer;
-		this.spanReporter = spanReporter;
 	}
 
 	@Pointcut("@within(org.springframework.web.bind.annotation.RestController)")
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
index 61820cb3f..7b761239c 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
@@ -75,8 +75,8 @@ public class TraceWebAutoConfiguration {
 	}
 
 	@Bean
-	public TraceWebAspect traceWebAspect(Tracer tracer, SpanNamer spanNamer, SpanReporter spanReporter) {
-		return new TraceWebAspect(tracer, spanNamer, spanReporter);
+	public TraceWebAspect traceWebAspect(Tracer tracer, SpanNamer spanNamer) {
+		return new TraceWebAspect(tracer, spanNamer);
 	}
 
 	@Bean