From a497befa56e472413398379ff7b003353b679237 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Sat, 4 Apr 2020 09:49:36 +0800
Subject: [PATCH] pulls change back from master

---
 .../instrument/reactor/ReactorSleuth.java     | 22 ++++++++++++-------
 .../cloud/sleuth/log/Slf4JSpanLoggerTest.java |  2 +-
 src/checkstyle/checkstyle-suppressions.xml    |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java
index fa013b7c8..48c70d442 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java
@@ -82,12 +82,15 @@ public abstract class ReactorSleuth {
 			}
 
 			if (!springContext.isActive()) {
-				if (log.isTraceEnabled()) {
-					log.trace("Spring Context [" + springContext
+				boolean assertOn = false;
+				assert assertOn = true; // gives a message in unit test failures
+				if (log.isTraceEnabled() || assertOn) {
+					String message = "Spring Context [" + springContext
 							+ "] is not yet refreshed. This is unexpected. Reactor Context is ["
-							+ sub.currentContext() + "] and name is [" + name(sub) + "]");
+							+ sub.currentContext() + "] and name is [" + name(sub) + "]";
+					log.trace(message);
+					assert false : message; // should never happen, but don't break.
 				}
-				assert false; // should never happen, but don't break.
 				return sub;
 			}
 
@@ -101,12 +104,15 @@ public abstract class ReactorSleuth {
 			// Try to get the current trace context bean, lenient when there are problems
 			CurrentTraceContext currentTraceContext = lazyCurrentTraceContext.get();
 			if (currentTraceContext == null) {
-				if (log.isTraceEnabled()) {
-					log.trace("Spring Context [" + springContext
+				boolean assertOn = false;
+				assert assertOn = true; // gives a message in unit test failures
+				if (log.isTraceEnabled() || assertOn) {
+					String message = "Spring Context [" + springContext
 							+ "] did not return a CurrentTraceContext. Reactor Context is ["
-							+ sub.currentContext() + "] and name is [" + name(sub) + "]");
+							+ sub.currentContext() + "] and name is [" + name(sub) + "]";
+					log.trace(message);
+					assert false : message; // should never happen, but don't break.
 				}
-				assert false; // should never happen, but don't break.
 				return sub;
 			}
 
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
index a3004ad8d..764cbd77e 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/Slf4JSpanLoggerTest.java
@@ -177,7 +177,7 @@ public class Slf4JSpanLoggerTest {
 				.asInstanceOf(InstanceOfAssertFactories.array(CorrelationField[].class))
 				.extracting(CorrelationField::name).containsExactly("traceId", "parentId",
 						"spanId", "spanExportable", "my-baggage", "my-local",
-						"my-propagation"); // my-baggage-two is baggage not in the whitelist
+						"my-propagation"); // my-baggage-two is not in the whitelist
 	}
 
 	@Test
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 228a2c038..80260c2e4 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -4,6 +4,7 @@
 	"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".*/test/.*" checks="JavadocVariable"/>
+	<suppress files=".*ReactorSleuth\.java" checks="InnerAssignment"/>
 	<suppress files=".*FinishedSpanHandlerTests.*" checks="LineLengthCheck"/>
 	<suppress files=".*GrpcTracingIntegrationTests.*" checks="LineLengthCheck"/>
 	<suppress files=".*IgnoreAutoConfiguredSkipPatternsIntegrationTests.*" checks="LineLengthCheck"/>