From 2d0ff8f436971538cd5a03d2e13b8668c7451f19 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 10 Dec 2015 10:33:21 -0700 Subject: [PATCH] polish --- .../springframework/cloud/sleuth/Trace.java | 2 +- .../sleuth/instrument/TraceDelegate.java | 4 ++-- .../integration/TraceChannelInterceptor.java | 10 ++++----- .../scheduling/TraceSchedulingAspect.java | 10 ++++----- .../TraceSchedulingAutoConfiguration.java | 4 ++-- .../web/TraceHandlerInterceptor.java | 2 +- .../cloud/sleuth/template/TraceCallback.java | 2 +- .../cloud/sleuth/template/TraceTemplate.java | 10 ++++----- .../sleuth/trace/DefaultTraceManager.java | 2 +- .../sleuth/DefaultTraceManagerTests.java | 4 ++-- .../TraceableExecutorServiceTests.java | 8 +++---- .../TraceChannelInterceptorTests.java | 6 ++--- ...extPropagationChannelInterceptorTests.java | 8 +++---- .../instrument/web/TraceFilterTests.java | 22 +++++++++---------- .../web/common/MvcWiremockITest.java | 4 ++-- .../sleuth/template/TraceTemplateTest.java | 2 +- .../main/java/sample/SampleController.java | 4 ++-- .../main/java/sample/SampleController.java | 14 ++++++------ 18 files changed, 59 insertions(+), 59 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java index 6aa5429a3..48a4258b7 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java @@ -45,7 +45,7 @@ public class Trace { SPAN_NAME_NAME, PARENT_ID_NAME, PROCESS_ID_NAME, NOT_SAMPLED_NAME); /** - * the span for this scope + * the span for this trace */ private final Span span; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/TraceDelegate.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/TraceDelegate.java index e19f1d332..ec42dca57 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/TraceDelegate.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/TraceDelegate.java @@ -33,8 +33,8 @@ public abstract class TraceDelegate { private final String name; private final Span parent; - public TraceDelegate(TraceManager trace, T delegate) { - this(trace, delegate, null); + public TraceDelegate(TraceManager traceManager, T delegate) { + this(traceManager, delegate, null); } public TraceDelegate(TraceManager traceManager, T delegate, String name) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java index 0cce639c9..6772d0446 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java @@ -34,7 +34,7 @@ import org.springframework.messaging.support.ChannelInterceptorAdapter; */ public class TraceChannelInterceptor extends ChannelInterceptorAdapter { - private ThreadLocal traceManagerScopeHolder = new ThreadLocal(); + private ThreadLocal traceHolder = new ThreadLocal<>(); private final TraceManager traceManager; @@ -44,9 +44,9 @@ public class TraceChannelInterceptor extends ChannelInterceptorAdapter { @Override public void postSend(Message message, MessageChannel channel, boolean sent) { - Trace traceManagerScope = this.traceManagerScopeHolder.get(); - this.traceManager.close(traceManagerScope); - this.traceManagerScopeHolder.remove(); + Trace trace = this.traceHolder.get(); + this.traceManager.close(trace); + this.traceHolder.remove(); } @Override @@ -83,7 +83,7 @@ public class TraceChannelInterceptor extends ChannelInterceptorAdapter { else { trace = this.traceManager.startSpan(name); } - this.traceManagerScopeHolder.set(trace); + this.traceHolder.set(trace); return SpanMessageHeaders.addSpanHeaders(message, trace.getSpan()); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java index 41c2c3500..5188f7f3d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java @@ -38,20 +38,20 @@ import org.springframework.scheduling.annotation.Scheduled; @Aspect public class TraceSchedulingAspect { - private final TraceManager trace; + private final TraceManager traceManager; - public TraceSchedulingAspect(TraceManager trace) { - this.trace = trace; + public TraceSchedulingAspect(TraceManager traceManager) { + this.traceManager = traceManager; } @Around("execution (@org.springframework.scheduling.annotation.Scheduled * *.*(..))") public Object traceBackgroundThread(final ProceedingJoinPoint pjp) throws Throwable { - Trace scope = this.trace.startSpan(pjp.toShortString()); + Trace trace = this.traceManager.startSpan(pjp.toShortString()); try { return pjp.proceed(); } finally { - this.trace.close(scope); + this.traceManager.close(trace); } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java index caf6b964a..f6b9da8ea 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAutoConfiguration.java @@ -48,8 +48,8 @@ public class TraceSchedulingAutoConfiguration { @ConditionalOnClass(ProceedingJoinPoint.class) @Bean - public TraceSchedulingAspect traceSchedulingAspect(TraceManager trace) { - return new TraceSchedulingAspect(trace); + public TraceSchedulingAspect traceSchedulingAspect(TraceManager traceManager) { + return new TraceSchedulingAspect(traceManager); } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHandlerInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHandlerInterceptor.java index 15ef73878..a1c2a6d14 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHandlerInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHandlerInterceptor.java @@ -29,7 +29,7 @@ import org.springframework.web.servlet.ModelAndView; */ public class TraceHandlerInterceptor implements HandlerInterceptor { - private static final String ATTR_NAME = "__CURRENT_TRACE_HANDLER_TRACE_SCOPE_ATTR___"; + private static final String ATTR_NAME = "__CURRENT_TRACE_HANDLER_TRACE_ATTR___"; private final TraceManager traceManager; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceCallback.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceCallback.java index dbddd14e4..e097577d8 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceCallback.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceCallback.java @@ -19,5 +19,5 @@ package org.springframework.cloud.sleuth.template; import org.springframework.cloud.sleuth.Trace; public interface TraceCallback { - T doInTrace(Trace traceScope); + T doInTrace(Trace trace); } \ No newline at end of file diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceTemplate.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceTemplate.java index ccd93d6e3..71e716429 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceTemplate.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/template/TraceTemplate.java @@ -36,11 +36,11 @@ public class TraceTemplate implements TraceOperations { public T trace(final TraceCallback callback) { if (TraceContextHolder.isTracing()) { DelegateCallback delegate = new DelegateCallback<>(this.traceManager); - Trace traceScope = delegate.startSpan(); + Trace trace = delegate.startSpan(); try { - return callback.doInTrace(traceScope); + return callback.doInTrace(trace); } finally { - this.traceManager.close(traceScope); + this.traceManager.close(trace); } } else { return callback.doInTrace(null); @@ -49,8 +49,8 @@ public class TraceTemplate implements TraceOperations { class DelegateCallback extends TraceDelegate> { - public DelegateCallback(TraceManager trace) { - super(trace, null); + public DelegateCallback(TraceManager traceManager) { + super(traceManager, null); } @Override diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java index d66c50527..9ce5ebbb6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java @@ -165,7 +165,7 @@ public class DefaultTraceManager implements TraceManager { @Override public Trace continueSpan(Span span) { - // Return an empty TraceScope that does nothing on close + // Return an empty Trace that does nothing on close if (span == null) { return NullTrace.INSTANCE; } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java index e3f5e8bb5..deba0548a 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java @@ -55,12 +55,12 @@ public class DefaultTraceManagerTests { DefaultTraceManager traceManager = new DefaultTraceManager(new IsTracingSampler(), new JdkIdGenerator(), publisher); - Trace scope = traceManager.startSpan(CREATE_SIMPLE_TRACE, new AlwaysSampler(), null); + Trace trace = traceManager.startSpan(CREATE_SIMPLE_TRACE, new AlwaysSampler(), null); try { importantWork1(traceManager); } finally { - traceManager.close(scope); + traceManager.close(trace); } verify(publisher, times(NUM_SPANS)).publishEvent(isA(SpanAcquiredEvent.class)); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/executor/TraceableExecutorServiceTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/executor/TraceableExecutorServiceTests.java index 63c460f45..42111d8e2 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/executor/TraceableExecutorServiceTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/executor/TraceableExecutorServiceTests.java @@ -63,7 +63,7 @@ public class TraceableExecutorServiceTests { // https://github.com/spring-cloud/spring-cloud-sleuth/issues/60 comment two final AtomicInteger counter = new AtomicInteger(0); final CountDownLatch latch = new CountDownLatch(this.TOTAL_THREADS); - Trace scope = this.traceManager.startSpan("PARENT"); + Trace trace = this.traceManager.startSpan("PARENT"); for (int i = 0; i < this.TOTAL_THREADS; i++) { this.traceManagerableExecutorService.execute(new MyRunnable(counter, latch)); } @@ -74,7 +74,7 @@ public class TraceableExecutorServiceTests { e.printStackTrace(); } - this.traceManager.close(scope); + this.traceManager.close(trace); verify(this.publisher, times(this.NUM_SPANS)).publishEvent(isA(SpanAcquiredEvent.class)); verify(this.publisher, times(this.NUM_SPANS)).publishEvent(isA(SpanReleasedEvent.class)); @@ -97,7 +97,7 @@ public class TraceableExecutorServiceTests { public void test_whenTraceContextOfWorkerThreadIsClosed_thenNoException() { final AtomicInteger counter = new AtomicInteger(0); final CountDownLatch latch = new CountDownLatch(this.TOTAL_THREADS); - Trace scope = this.traceManager.startSpan("PARENT"); + Trace trace = this.traceManager.startSpan("PARENT"); for (int i = 0; i < this.TOTAL_THREADS; i++) { final Runnable command = new TraceRunnable(this.traceManager, new MyRunnable(counter, latch)); this.executorService.execute(command); @@ -109,7 +109,7 @@ public class TraceableExecutorServiceTests { e.printStackTrace(); } - this.traceManager.close(scope); + this.traceManager.close(trace); verify(this.publisher, times(this.NUM_SPANS)).publishEvent(isA(SpanAcquiredEvent.class)); verify(this.publisher, times(this.NUM_SPANS)).publishEvent(isA(SpanReleasedEvent.class)); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java index d8cb15e93..5c033c8a8 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java @@ -57,7 +57,7 @@ public class TraceChannelInterceptorTests implements MessageHandler { private DirectChannel channel; @Autowired - private TraceManager trace; + private TraceManager traceManager; private Message message; @@ -102,10 +102,10 @@ public class TraceChannelInterceptorTests implements MessageHandler { @Test public void testHeaderCreation() { - Trace traceScope = this.trace.startSpan("testSendMessage", + Trace trace = this.traceManager.startSpan("testSendMessage", new AlwaysSampler(), null); this.channel.send(MessageBuilder.withPayload("hi").build()); - this.trace.close(traceScope); + this.traceManager.close(trace); assertNotNull("message was null", this.message); String spanId = this.message.getHeaders().get(Trace.SPAN_ID_NAME, String.class); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java index deb1a4b1a..fad7f88ba 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java @@ -55,7 +55,7 @@ public class TraceContextPropagationChannelInterceptorTests { private PollableChannel channel; @Autowired - private TraceManager trace; + private TraceManager traceManager; @After public void close() { @@ -65,10 +65,10 @@ public class TraceContextPropagationChannelInterceptorTests { @Test public void testSpanPropagation() { - Trace traceScope = this.trace.startSpan("testSendMessage", new AlwaysSampler(), null); + Trace trace = this.traceManager.startSpan("testSendMessage", new AlwaysSampler(), null); this.channel.send(MessageBuilder.withPayload("hi").build()); - String expectedSpanId = traceScope.getSpan().getSpanId(); - this.trace.close(traceScope); + String expectedSpanId = trace.getSpan().getSpanId(); + this.traceManager.close(trace); Message message = this.channel.receive(0); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java index 2ddbca698..ccee51a5e 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java @@ -55,7 +55,7 @@ public class TraceFilterTests { @Mock private ApplicationEventPublisher publisher; - private TraceManager trace; + private TraceManager traceManager; private Span span; @@ -67,7 +67,7 @@ public class TraceFilterTests { @SneakyThrows public void init() { initMocks(this); - this.trace = new DefaultTraceManager(new AlwaysSampler(), + this.traceManager = new DefaultTraceManager(new AlwaysSampler(), new JdkIdGenerator(), this.publisher) { @Override protected Trace createTrace(Trace trace, Span span) { @@ -88,21 +88,21 @@ public class TraceFilterTests { @Test public void notTraced() throws Exception { - TraceManager trace = Mockito.mock(TraceManager.class); - TraceFilter filter = new TraceFilter(trace); + TraceManager mockTraceManager = Mockito.mock(TraceManager.class); + TraceFilter filter = new TraceFilter(mockTraceManager); this.request = get("/favicon.ico").accept(MediaType.ALL) .buildRequest(new MockServletContext()); filter.doFilter(this.request, this.response, this.filterChain); - verify(trace, never()).startSpan(anyString()); - verify(trace, never()).close(any(Trace.class)); + verify(mockTraceManager, never()).startSpan(anyString()); + verify(mockTraceManager, never()).close(any(Trace.class)); } @Test public void startsNewTrace() throws Exception { - TraceFilter filter = new TraceFilter(this.trace); + TraceFilter filter = new TraceFilter(this.traceManager); filter.doFilter(this.request, this.response, this.filterChain); verifyHttpAnnotations(); assertNull(TraceContextHolder.getCurrentTrace()); @@ -111,10 +111,10 @@ public class TraceFilterTests { @Test public void continuesSpanInRequestAttr() throws Exception { - Trace traceScope = this.trace.startSpan("foo"); - this.request.setAttribute(TraceFilter.TRACE_REQUEST_ATTR, traceScope); + Trace trace = this.traceManager.startSpan("foo"); + this.request.setAttribute(TraceFilter.TRACE_REQUEST_ATTR, trace); - TraceFilter filter = new TraceFilter(this.trace); + TraceFilter filter = new TraceFilter(this.traceManager); filter.doFilter(this.request, this.response, this.filterChain); verifyHttpAnnotations(); @@ -128,7 +128,7 @@ public class TraceFilterTests { .header(Trace.TRACE_ID_NAME, "mytrace") .buildRequest(new MockServletContext()); - TraceFilter filter = new TraceFilter(this.trace); + TraceFilter filter = new TraceFilter(this.traceManager); filter.doFilter(this.request, this.response, this.filterChain); verifyHttpAnnotations(); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java index 822ed8d6e..96017c190 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/common/MvcWiremockITest.java @@ -27,7 +27,7 @@ public abstract class MvcWiremockITest extends MvcITest { protected WireMock wireMock; @Autowired protected HttpMockServer httpMockServer; - @Autowired protected TraceManager trace; + @Autowired protected TraceManager traceManager; @Override @Before @@ -51,6 +51,6 @@ public abstract class MvcWiremockITest extends MvcITest { @Override protected void configureMockMvcBuilder(DefaultMockMvcBuilder mockMvcBuilder) { - mockMvcBuilder.addFilters(new TraceFilter(this.trace)); + mockMvcBuilder.addFilters(new TraceFilter(this.traceManager)); } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java index 02c3832fe..2e26f2697 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/template/TraceTemplateTest.java @@ -30,7 +30,7 @@ public class TraceTemplateTest { private Trace whenTraceCallbackReturningCurrentTraceIsExecuted(TraceTemplate traceTemplate) { return traceTemplate.trace(new TraceCallback() { @Override - public Trace doInTrace(Trace traceScope) { + public Trace doInTrace(Trace trace) { return TraceContextHolder.getCurrentTrace(); } }); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java index d11659994..3183d56ec 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java @@ -96,7 +96,7 @@ ApplicationListener { @SneakyThrows @RequestMapping("/traced") public String traced() { - Trace scope = this.traceManager.startSpan("customTraceEndpoint", + Trace trace = this.traceManager.startSpan("customTraceEndpoint", new AlwaysSampler(), null); final Random random = new Random(); int millis = random.nextInt(1000); @@ -106,7 +106,7 @@ ApplicationListener { String s = this.restTemplate.getForObject("http://localhost:" + this.port + "/call", String.class); - this.traceManager.close(scope); + this.traceManager.close(trace); return "traced/" + s; } diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java index d2354653e..3183d56ec 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java @@ -44,7 +44,7 @@ ApplicationListener { @Autowired private RestTemplate restTemplate; @Autowired - private TraceManager trace; + private TraceManager traceManager; @Autowired private TraceAccessor accessor; @Autowired @@ -70,7 +70,7 @@ ApplicationListener { final Random random = new Random(); int millis = random.nextInt(1000); Thread.sleep(millis); - SampleController.this.trace.addAnnotation("callable-sleep-millis", String.valueOf(millis)); + SampleController.this.traceManager.addAnnotation("callable-sleep-millis", String.valueOf(millis)); Span currentSpan = SampleController.this.accessor.getCurrentSpan(); return "async hi: " + currentSpan; } @@ -89,24 +89,24 @@ ApplicationListener { final Random random = new Random(); int millis = random.nextInt(1000); Thread.sleep(millis); - this.trace.addAnnotation("random-sleep-millis", String.valueOf(millis)); + this.traceManager.addAnnotation("random-sleep-millis", String.valueOf(millis)); return "hi2"; } @SneakyThrows @RequestMapping("/traced") public String traced() { - Trace scope = this.trace.startSpan("customTraceEndpoint", + Trace trace = this.traceManager.startSpan("customTraceEndpoint", new AlwaysSampler(), null); final Random random = new Random(); int millis = random.nextInt(1000); log.info("Sleeping for {} millis", millis); Thread.sleep(millis); - this.trace.addAnnotation("random-sleep-millis", String.valueOf(millis)); + this.traceManager.addAnnotation("random-sleep-millis", String.valueOf(millis)); String s = this.restTemplate.getForObject("http://localhost:" + this.port + "/call", String.class); - this.trace.close(scope); + this.traceManager.close(trace); return "traced/" + s; } @@ -117,7 +117,7 @@ ApplicationListener { int millis = random.nextInt(1000); log.info("Sleeping for {} millis", millis); Thread.sleep(millis); - this.trace.addAnnotation("random-sleep-millis", String.valueOf(millis)); + this.traceManager.addAnnotation("random-sleep-millis", String.valueOf(millis)); String s = this.restTemplate.getForObject("http://localhost:" + this.port + "/call", String.class);