diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAccessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAccessor.java
similarity index 96%
rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAccessor.java
rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAccessor.java
index f892134ae..13c851967 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAccessor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAccessor.java
@@ -24,7 +24,7 @@ package org.springframework.cloud.sleuth;
* @author Dave Syer
*
*/
-public interface TraceAccessor {
+public interface SpanAccessor {
Span getCurrentSpan();
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Tracer.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Tracer.java
index 8013475b5..b312fc6e6 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Tracer.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Tracer.java
@@ -44,7 +44,7 @@ import java.util.concurrent.Callable;
* Set currentSpan to the previous currentSpan (which may be null).
*
*/
-public interface Tracer extends TraceAccessor {
+public interface Tracer extends SpanAccessor {
/**
* Creates a new Span.
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 922ca9ba7..0b6676b07 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
@@ -21,7 +21,7 @@ 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.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.instrument.TraceCallable;
import org.springframework.web.context.request.async.WebAsyncTask;
@@ -62,9 +62,9 @@ import java.util.concurrent.Callable;
public class TraceWebAspect {
private final Tracer tracer;
- private final TraceAccessor accessor;
+ private final SpanAccessor accessor;
- public TraceWebAspect(Tracer tracer, TraceAccessor accessor) {
+ public TraceWebAspect(Tracer tracer, SpanAccessor accessor) {
this.tracer = tracer;
this.accessor = accessor;
}
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 d98051f85..b035f05ce 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
@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.context.embedded.FilterRegistrationBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.cloud.sleuth.instrument.TraceKeys;
@@ -62,7 +62,7 @@ public class TraceWebAutoConfiguration {
private Tracer tracer;
@Autowired
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
@Autowired
private TraceKeys traceKeys;
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceFeignClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceFeignClientAutoConfiguration.java
index ed2f073d3..12d1a4e18 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceFeignClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceFeignClientAutoConfiguration.java
@@ -36,7 +36,7 @@ import org.springframework.cloud.netflix.feign.FeignAutoConfiguration;
import org.springframework.cloud.netflix.feign.support.ResponseEntityDecoder;
import org.springframework.cloud.netflix.feign.support.SpringDecoder;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.event.ClientReceivedEvent;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
@@ -81,7 +81,7 @@ public class TraceFeignClientAutoConfiguration {
private ApplicationEventPublisher publisher;
@Autowired
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
@Bean
@Scope("prototype")
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceRestTemplateInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceRestTemplateInterceptor.java
index 272f17339..078d5acfb 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceRestTemplateInterceptor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceRestTemplateInterceptor.java
@@ -16,7 +16,7 @@
package org.springframework.cloud.sleuth.instrument.web.client;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientReceivedEvent;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.context.ApplicationEvent;
@@ -35,7 +35,7 @@ import java.io.IOException;
* and sets them if one or both of them are missing.
*
* @see org.springframework.web.client.RestTemplate
- * @see TraceAccessor
+ * @see SpanAccessor
*
* @author Marcin Grzejszczak, 4financeIT
* @author Spencer Gibb
@@ -45,9 +45,9 @@ ApplicationEventPublisherAware {
private ApplicationEventPublisher publisher;
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
- public TraceRestTemplateInterceptor(TraceAccessor accessor) {
+ public TraceRestTemplateInterceptor(SpanAccessor accessor) {
this.accessor = accessor;
}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
index 12f2e2748..8c88cf03f 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
@@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -41,13 +41,13 @@ import org.springframework.web.client.RestTemplate;
@Configuration
@ConditionalOnProperty(value = "spring.sleuth.client.enabled", matchIfMissing = true)
@ConditionalOnClass(RestTemplate.class)
-@ConditionalOnBean(TraceAccessor.class)
+@ConditionalOnBean(SpanAccessor.class)
@AutoConfigureAfter(TraceAutoConfiguration.class)
public class TraceWebClientAutoConfiguration {
@Bean
@ConditionalOnMissingBean
- public TraceRestTemplateInterceptor traceRestTemplateInterceptor(TraceAccessor accessor) {
+ public TraceRestTemplateInterceptor traceRestTemplateInterceptor(SpanAccessor accessor) {
return new TraceRestTemplateInterceptor(accessor);
}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
index 788ecbbe2..2cd936d1c 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePostZuulFilter.java
@@ -17,7 +17,7 @@
package org.springframework.cloud.sleuth.instrument.zuul;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientReceivedEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
@@ -34,9 +34,9 @@ public class TracePostZuulFilter extends ZuulFilter
private ApplicationEventPublisher publisher;
- private final TraceAccessor accessor;
+ private final SpanAccessor accessor;
- public TracePostZuulFilter(TraceAccessor accessor) {
+ public TracePostZuulFilter(SpanAccessor accessor) {
this.accessor = accessor;
}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilter.java
index cdac263c3..1f16b0c70 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilter.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilter.java
@@ -19,7 +19,7 @@ package org.springframework.cloud.sleuth.instrument.zuul;
import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
@@ -37,9 +37,9 @@ ApplicationEventPublisherAware {
private ApplicationEventPublisher publisher;
- private final TraceAccessor accessor;
+ private final SpanAccessor accessor;
- public TracePreZuulFilter(TraceAccessor accessor) {
+ public TracePreZuulFilter(SpanAccessor accessor) {
this.accessor = accessor;
}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
index 29e08177b..fe1dcffd1 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceRestClientRibbonCommandFactory.java
@@ -24,7 +24,7 @@ import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonComm
import org.springframework.cloud.netflix.zuul.filters.route.RestClientRibbonCommandFactory;
import org.springframework.cloud.netflix.zuul.filters.route.RibbonCommandContext;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.event.ClientSentEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
@@ -42,10 +42,10 @@ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommand
private ApplicationEventPublisher publisher;
- private final TraceAccessor accessor;
+ private final SpanAccessor accessor;
public TraceRestClientRibbonCommandFactory(SpringClientFactory clientFactory,
- TraceAccessor accessor) {
+ SpanAccessor accessor) {
super(clientFactory);
this.accessor = accessor;
}
@@ -71,14 +71,14 @@ public class TraceRestClientRibbonCommandFactory extends RestClientRibbonCommand
private ApplicationEventPublisher publisher;
- private final TraceAccessor accessor;
+ private final SpanAccessor accessor;
@SuppressWarnings("deprecation")
public TraceRestClientRibbonCommand(String commandKey, RestClient restClient,
HttpRequest.Verb verb, String uri, Boolean retryable,
MultiValueMap headers,
MultiValueMap params, InputStream requestEntity,
- ApplicationEventPublisher publisher, TraceAccessor accessor)
+ ApplicationEventPublisher publisher, SpanAccessor accessor)
throws URISyntaxException {
super(commandKey, restClient, verb, uri, retryable, headers, params,
requestEntity);
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
index d334c58dd..6da28f402 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TraceZuulAutoConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -45,18 +45,18 @@ public class TraceZuulAutoConfiguration {
@Bean
@ConditionalOnMissingBean
- public TracePreZuulFilter tracePreZuulFilter(TraceAccessor accessor) {
+ public TracePreZuulFilter tracePreZuulFilter(SpanAccessor accessor) {
return new TracePreZuulFilter(accessor);
}
@Bean
- public TraceRestClientRibbonCommandFactory traceRestClientRibbonCommandFactory(SpringClientFactory factory, TraceAccessor accessor) {
+ public TraceRestClientRibbonCommandFactory traceRestClientRibbonCommandFactory(SpringClientFactory factory, SpanAccessor accessor) {
return new TraceRestClientRibbonCommandFactory(factory, accessor);
}
@Bean
@ConditionalOnMissingBean
- public TracePostZuulFilter tracePostZuulFilter(TraceAccessor accessor) {
+ public TracePostZuulFilter tracePostZuulFilter(SpanAccessor accessor) {
return new TracePostZuulFilter(accessor);
}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java
index 9ec8394c0..dcc33055c 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java
@@ -2,7 +2,7 @@ package org.springframework.cloud.sleuth.sampler;
import org.springframework.cloud.sleuth.Sampler;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
/**
* Sampler that based on the given percentage rate will allow sampling.
@@ -23,16 +23,16 @@ import org.springframework.cloud.sleuth.TraceAccessor;
public class PercentageBasedSampler implements Sampler {
private final SamplerConfiguration configuration;
- private final TraceAccessor traceAccessor;
+ private final SpanAccessor spanAccessor;
- public PercentageBasedSampler(SamplerConfiguration configuration, TraceAccessor traceAccessor) {
+ public PercentageBasedSampler(SamplerConfiguration configuration, SpanAccessor spanAccessor) {
this.configuration = configuration;
- this.traceAccessor = traceAccessor;
+ this.spanAccessor = spanAccessor;
}
@Override
public boolean isSampled() {
- Span currentSpan = this.traceAccessor.getCurrentSpan();
+ Span currentSpan = this.spanAccessor.getCurrentSpan();
long threshold = Math.abs(Long.MAX_VALUE * (int) (this.configuration.getPercentage() * 100)); // drops fractional percentage.
if (currentSpan == null || threshold == 0L) {
return false;
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java
index 9a2e03a4a..ddf7366d3 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java
@@ -2,7 +2,7 @@ package org.springframework.cloud.sleuth.sampler;
import org.junit.Test;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import java.util.Random;
@@ -12,7 +12,7 @@ import static org.assertj.core.data.Percentage.withPercentage;
public class PercentageBasedSamplerTests {
SamplerConfiguration samplerConfiguration = new SamplerConfiguration();
- TraceAccessor traceAccessor = traceReturningSpanWithUuid();
+ SpanAccessor spanAccessor = traceReturningSpanWithUuid();
private static Random RANDOM = new Random();
@Test
@@ -20,7 +20,7 @@ public class PercentageBasedSamplerTests {
this.samplerConfiguration.setPercentage(1f);
for (int i = 0; i < 10; i++) {
- then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).isSampled()).isTrue();
+ then(new PercentageBasedSampler(this.samplerConfiguration, this.spanAccessor).isSampled()).isTrue();
}
}
@@ -30,7 +30,7 @@ public class PercentageBasedSamplerTests {
this.samplerConfiguration.setPercentage(0f);
for (int i = 0; i < 10; i++) {
- then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).isSampled()).isFalse();
+ then(new PercentageBasedSampler(this.samplerConfiguration, this.spanAccessor).isSampled()).isFalse();
}
}
@@ -54,8 +54,8 @@ public class PercentageBasedSamplerTests {
return passedCounter;
}
- private TraceAccessor traceReturningSpanWithUuid() {
- return new TraceAccessor() {
+ private SpanAccessor traceReturningSpanWithUuid() {
+ return new SpanAccessor() {
@Override
public Span getCurrentSpan() {
return Span.builder().traceId(RANDOM.nextLong()).build();
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java
index 24dc178c9..aaee6f6e8 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
import org.springframework.context.ApplicationListener;
@@ -44,7 +44,7 @@ ApplicationListener {
@Autowired
private Tracer tracer;
@Autowired
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
@Autowired
private SampleBackground controller;
@Autowired
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 24dc178c9..aaee6f6e8 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
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
import org.springframework.context.ApplicationListener;
@@ -44,7 +44,7 @@ ApplicationListener {
@Autowired
private Tracer tracer;
@Autowired
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
@Autowired
private SampleBackground controller;
@Autowired
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 24dc178c9..aaee6f6e8 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
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.sleuth.Span;
-import org.springframework.cloud.sleuth.TraceAccessor;
+import org.springframework.cloud.sleuth.SpanAccessor;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
import org.springframework.context.ApplicationListener;
@@ -44,7 +44,7 @@ ApplicationListener {
@Autowired
private Tracer tracer;
@Autowired
- private TraceAccessor accessor;
+ private SpanAccessor accessor;
@Autowired
private SampleBackground controller;
@Autowired