removed references to correlation id
This commit is contained in:
@@ -10,7 +10,7 @@ import org.springframework.cloud.sleuth.TraceScope;
|
||||
* Abstraction over {@code HystrixCommand} that wraps command execution with Trace setting
|
||||
*
|
||||
* @see HystrixCommand
|
||||
* @see CorrelationIdUpdater
|
||||
* @see Trace
|
||||
*
|
||||
* @author Tomasz Nurkiewicz, 4financeIT
|
||||
* @author Marcin Grzejszczak, 4financeIT
|
||||
|
||||
@@ -8,8 +8,8 @@ import org.springframework.cloud.sleuth.TraceScope;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
|
||||
/**
|
||||
* Aspect that sets correlationId for running threads executing methods annotated with {@link Scheduled} annotation.
|
||||
* For every execution of scheduled method a new, i.e. unique one, value of correlationId will be set.
|
||||
* Aspect that creates a new Span for running threads executing methods annotated with {@link Scheduled} annotation.
|
||||
* For every execution of scheduled method a new trace will be started.
|
||||
*
|
||||
* @author Tomasz Nurkewicz, 4financeIT
|
||||
* @author Michal Chmielarz, 4financeIT
|
||||
@@ -28,7 +28,7 @@ public class TraceSchedulingAspect {
|
||||
}
|
||||
|
||||
@Around("execution (@org.springframework.scheduling.annotation.Scheduled * *.*(..))")
|
||||
public Object setNewCorrelationIdOnThread(final ProceedingJoinPoint pjp) throws Throwable {
|
||||
public Object traceSceduledThread(final ProceedingJoinPoint pjp) throws Throwable {
|
||||
TraceScope scope = trace.startSpan(pjp.toShortString());
|
||||
try {
|
||||
return pjp.proceed();
|
||||
|
||||
@@ -44,7 +44,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
|
||||
public class TraceWebAutoConfiguration {
|
||||
|
||||
/**
|
||||
* Pattern for URLs that should be skipped in correlationID setting
|
||||
* Pattern for URLs that should be skipped in tracing
|
||||
*/
|
||||
@Value("${spring.cloud.sleuth.instrument.web.skipPattern:}")
|
||||
private String skipPattern;
|
||||
@@ -66,7 +66,7 @@ public class TraceWebAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
public FilterRegistrationBean correlationHeaderFilter() {
|
||||
public FilterRegistrationBean traceFilter() {
|
||||
Pattern pattern = StringUtils.hasText(skipPattern) ? Pattern.compile(skipPattern)
|
||||
: TraceFilter.DEFAULT_SKIP_PATTERN;
|
||||
return new FilterRegistrationBean(new TraceFilter(trace, pattern));
|
||||
|
||||
Reference in New Issue
Block a user