From cf6e0ab65cea89f29ad77a9aa6be855e47294be6 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Wed, 3 Jul 2019 20:50:32 +0200
Subject: [PATCH] Tweaking the logging levels; fixes gh-1390

---
 .../sleuth/instrument/reactor/SpanSubscriberTests.java   | 9 +++------
 .../src/test/resources/application.yml                   | 1 +
 spring-cloud-sleuth-core/src/test/resources/logback.xml  | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
index d7ba4e343..9a8278f6c 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
@@ -306,13 +306,10 @@ public class SpanSubscriberTests {
 		final AtomicReference<Span> spanInOperation = new AtomicReference<>();
 
 		try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
-			Flux
-					.range(0, 5)
-					.flatMap(it -> Mono
-							.delay(Duration.ofMillis(1))
+			Flux.range(0, 5)
+					.flatMap(it -> Mono.delay(Duration.ofMillis(1))
 							.map(context -> this.tracer.currentSpan())
-							.doOnNext(spanInOperation::set)
-					)
+							.doOnNext(spanInOperation::set))
 					.blockFirst();
 		}
 		finally {
diff --git a/spring-cloud-sleuth-core/src/test/resources/application.yml b/spring-cloud-sleuth-core/src/test/resources/application.yml
index 1f284518b..640a92c98 100644
--- a/spring-cloud-sleuth-core/src/test/resources/application.yml
+++ b/spring-cloud-sleuth-core/src/test/resources/application.yml
@@ -17,6 +17,7 @@ spring.sleuth.scheduled.skipPattern: "^org.*TestBeanWithScheduledMethodToBeIgnor
 spring.sleuth.rxjava.schedulers.ignoredthreads: HystixMetricPoller,^MyCustomThread.*$,^RxComputation.*$
 
 logging.level.org.springframework.cloud: DEBUG
+logging.level.com.netflix.discovery.InstanceInfoReplicator: ERROR
 logging.level.org.springframework.cloud.sleuth.instrument.web.client.feign: TRACE
 
 #disable hibernate by default
diff --git a/spring-cloud-sleuth-core/src/test/resources/logback.xml b/spring-cloud-sleuth-core/src/test/resources/logback.xml
index 72ccc0216..a7061973e 100644
--- a/spring-cloud-sleuth-core/src/test/resources/logback.xml
+++ b/spring-cloud-sleuth-core/src/test/resources/logback.xml
@@ -18,6 +18,7 @@
 <configuration>
 	<include resource="org/springframework/boot/logging/logback/base.xml"/>
 	<logger name="feign" level="DEBUG"/>
+	<logger name="com.netflix.discovery.InstanceInfoReplicator" level="ERROR"/>
 	<logger name="org.springframework.cloud.sleuth" level="TRACE"/>
 	<logger name="org.springframework.boot.autoconfigure.logging" level="INFO"/>
 	<logger name="org.springframework.cloud.sleuth.log" level="DEBUG"/>