-
Notifications
You must be signed in to change notification settings - Fork 784
Spring Cloud Sleuth 2.0 Migration Guide
Spring Cloud Sleuth 2.0 Migration Guide
IMPORTANT: This migration guide is a work in progress
With Brave instrumentation there are 2 different lifecycles.
- Span creation and stopping and span reporting.
- Span hooking to current context
When brave.Span.finish()
is called the span gets stopped and reported.
In order to hook in the span to current context you need to call the try-with-resources clause via withSpanInScope
. For example:
try (SpanInScope ws = tracer.withSpanInScope(span.start())) {
// do sth with the span
} finally {
span.finish();
}
-
SpanLogger
- Name pattern of Span Logger will not be applicable.
-
Sampler
-
Sampler
from Brave needs to be used
-
-
Metrics
- we delegate to
ReporterMetrics
from Zipkin
- we delegate to
-
SleuthProperties
props:-
supportsJoin
- will come from Brave
-
Before
import org.springframework.cloud.sleuth.Tracer;
Tracer tracer;
After
import brave.Tracer;
Tracer tracer;
In Sleuth whenever you've created a span it got attached to the current context and started. In Brave you have to manage both manually. When the span is created, it's not started. You need to explicitly call start()
if creating a custom span to make it searchable by time Zipkin.
Before
Span child = tracer.createSpan("name");
After
brave.Span span = tracer.nextSpan().name("name").start();
Before
Span child = tracer.createSpan("name");
try {
// do sth
} finally {
tracer.close(child);
}
After
brave.Span span = tracer.nextSpan().name("name");
try (SpanInScope ws = tracer.withSpanInScope(span.start())) { // make sure SLF4J can see trace IDs
// do sth
} finally {
span.finish();
}
Before
tracer.addTag("foo", "bar");
After
import brave.SpanCustomizer;
SpanCustomizer span;
// If only modifying the span name, tags or annotations, you do not need a tracer
// This will safely ignore changes if there's no current span
this.span.tag("foo", "bar");
In Sleuth we used to create headers that had the baggage
prefix. You can do it via 2 properties:
-
spring.sleuth.baggage-keys
- those keys will be prefixed withbaggage-
andbaggage_
. That way we are backward compatible with previous versions of Sleuth. -
spring.sleuth.propagation-keys
- those keys will be whitelisted as they are. No prefix will be set.
Before
org.springframework.cloud.sleuth.util.ArrayListSpanAccumulator
After
org.springframework.cloud.sleuth.util.ArrayListSpanReporter
org.springframework.cloud.brave.sampler.SamplerProperties#percentage
renamed to org.springframework.cloud.brave.sampler.SamplerProperties#probability
and
org.springframework.cloud.sleuth.sampler.PercentageBasedSampler
renamed to org.springframework.cloud.sleuth.sampler.ProbabilityBasedSampler
Related to https://github.com/spring-cloud/spring-cloud-sleuth/issues/397
Before
org.springframework.cloud.sleuth.TraceRunnable
org.springframework.cloud.sleuth.TraceCallable
After
org.springframework.cloud.sleuth.instrument.async.TraceRunnable
org.springframework.cloud.sleuth.instrument.async.TraceCallable
Before
public TraceableExecutorService(final ExecutorService delegate, final Tracer tracer,
TraceKeys traceKeys, SpanNamer spanNamer) {
//...
}
public TraceableExecutorService(BeanFactory beanFactory, final ExecutorService delegate) {
//...
}
public TraceableExecutorService(final ExecutorService delegate, final Tracer tracer,
TraceKeys traceKeys, SpanNamer spanNamer, String spanName) {
//...
}
After
public TraceableExecutorService(BeanFactory beanFactory, final ExecutorService delegate) {
//...
}
public TraceableExecutorService(BeanFactory beanFactory, final ExecutorService delegate, String spanName) {
//...
}
Before
public TraceableScheduledExecutorService(ScheduledExecutorService delegate,
Tracer tracer, TraceKeys traceKeys, SpanNamer spanNamer) {
super(delegate, tracer, traceKeys, spanNamer);
}
After
public TraceableScheduledExecutorService(BeanFactory beanFactory, final ExecutorService delegate) {
super(beanFactory, delegate);
}
Before
@Deprecated
public TraceAsyncAspect(Tracer tracer, TraceKeys traceKeys, BeanFactory beanFactory) {
this.tracer = tracer;
this.traceKeys = traceKeys;
this.beanFactory = beanFactory;
}
public TraceAsyncAspect(Tracer tracer, TraceKeys traceKeys, SpanNamer spanNamer) {
this.tracer = tracer;
this.traceKeys = traceKeys;
this.spanNamer = spanNamer;
this.beanFactory = null;
}
After
public TraceAsyncAspect(Tracer tracer, SpanNamer spanNamer, TraceKeys traceKeys) {
//
}
In Sleuth we were able to rename the async
span coming from a TraceRunnable
. In Brave you can't access the span's name when it's in progress of being created. That's why we will always rename the span.
Before
org.springframework.cloud.sleuth.instrument.web.client.TraceAsyncListenableTaskExecutor
After
org.springframework.cloud.sleuth.instrument.async.TraceAsyncListenableTaskExecutor
It seems that we have overengineered the async trace context passing. It seems that with the async template's interceptor with a wrapper around the ListenableFutureCallback
we don't need to wrap the connection factories anymore.
TODO: Please provide feedback if that's the case. Current tests prove that it's good enough.
Removed classes :
-
TraceAsyncClientHttpRequestFactoryWrapper
- replaced by simple interceptororg.springframework.cloud.brave.instrument.web.client.AsyncTracingClientHttpRequestInterceptor
-
TraceRestTemplateInterceptor
- replaced bybrave.spring.web.TracingClientHttpRequestInterceptor
-
LocalComponentTraceCallable
- replaced byTraceCallable
-
LocalComponentTraceRunnable
- replaced byTraceRunnable
-
SpanContinuingTraceCallable
- replaced byTraceCallable
-
SpanContinuingTraceRunnable
- replaced byTraceRunnable
We've changed the way AsyncRestTemplate
is instrumented. No longer do we instrument in a way that automatically registers an AsyncRestTemplate
bean. That's why you need to provide your own bean.
Before
no AsyncRestTemplate
bean was required
After
@Bean
AsyncRestTemplate myAsyncRestTemplate() {
return new AsyncRestTemplate();
}
Removed classes :
-
TraceAsyncRestTemplate
- replaced by simple interceptororg.springframework.cloud.brave.instrument.web.client.AsyncTracingClientHttpRequestInterceptor
We will use those from Brave.
Before
org.springframework.cloud.sleuth.instrument.web.client.TraceRestTemplateInterceptor
After
brave.spring.web.TracingClientHttpRequestInterceptor
When a request was sent via RestTemplate
it will name the span with the method name e.g. GET
. If you want to have the previous way of naming spans and the default span tags you have turn on the spring.sleuth.http.legacy.enabled=true
flag.
Removed classes :
HttpTraceKeysInjector
The SleuthHystrixConcurrencyStrategy
will always creates a new span. Brave doesn't like continuing spans too much and it makes things more complex. SleuthHystrixConcurrencyStrategy
will also not add any additional tags.
Before
public SleuthHystrixConcurrencyStrategy(Tracing tracing, TraceKeys traceKeys)
After
public SleuthHystrixConcurrencyStrategy(Tracing tracing,
SpanNamer spanNamer, ErrorParser errorParser)
There was a case in Sleuth where one passed the trace id, the debug flag was set to 1
and there was no span id. In that case we continued the span. With Brave, a new trace id will be created.
There was a case in Sleuth where one passed the span id, the debug flag was set to 1
and there was no trace id. In that case we continued the span. With Brave this is an exceptional situation and the debug flag will get ignored. The sampling decision will take place via the provided Sampler
.
For the first span ever we don't set the all the response codes anymore. We're tagging status codes from 100-200 and 400+.
Brave doesn't support a list of values in the header. Since we delegate the header parsing to Brave we don't support those anymore either.
TraceFilter
- removed
addRequestTags
- removed
addResponseTags
TODO: HttpTracing
has parsers that allow this functionality. Do we want to support that?
This feature is completely removed. If you want to send spans via messaging use the zipkin client with kafka or rabbit dependency.
There is no longer CR
, CS
, SS
, SR
logs. We're using Zipkin v2. Now, span.kind
tells you how to interpret span.timestamp
, duration
and remoteEndpoint
. Kind in CLIENT
SERVER
PRODUCER
CONSUMER