From 1bb544ed4b6b8a3f5979ba0a1b33d594f33df149 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 19 Jan 2018 23:07:43 +0100 Subject: [PATCH] Less flakey tests --- .../cloud/sleuth/instrument/async/TraceCallableTests.java | 2 +- .../cloud/sleuth/instrument/async/TraceRunnableTests.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceCallableTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceCallableTests.java index 940a07431..07853fcb1 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceCallableTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceCallableTests.java @@ -100,7 +100,7 @@ public class TraceCallableTests { return new Callable() { @Override public Span call() throws Exception { - return Tracing.currentTracer().currentSpan(); + return tracer.currentSpan(); } @Override diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceRunnableTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceRunnableTests.java index 404d8e272..f70983f9d 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceRunnableTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/TraceRunnableTests.java @@ -5,6 +5,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicReference; import brave.Span; +import brave.Tracer; import brave.Tracing; import brave.propagation.CurrentTraceContext; import org.junit.After; @@ -27,6 +28,7 @@ public class TraceRunnableTests { .currentTraceContext(CurrentTraceContext.Default.create()) .spanReporter(this.reporter) .build(); + Tracer tracer = this.tracing.tracer(); @After public void clean() { @@ -118,7 +120,7 @@ public class TraceRunnableTests { return new Runnable() { @Override public void run() { - span.set(Tracing.currentTracer().currentSpan()); + span.set(tracer.currentSpan()); } @Override public String toString() {