From 7454ef936dfb918821fe3b691bf5fe97f402da35 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 1 Oct 2018 12:38:10 +0200 Subject: [PATCH] Fixed formatting --- .../springframework/cloud/sleuth/SpanAdjuster.java | 1 - .../cloud/sleuth/annotation/ContinueSpan.java | 9 +++------ .../cloud/sleuth/annotation/NewSpan.java | 12 +++++------- .../cloud/sleuth/annotation/NewSpanParser.java | 1 - .../sleuth/annotation/SleuthAnnotationUtils.java | 1 - .../cloud/sleuth/annotation/SpanTag.java | 8 +++----- .../sleuth/instrument/async/LazyTraceExecutor.java | 4 ++++ .../cloud/sleuth/instrument/async/TraceCallable.java | 3 ++- .../sleuth/instrument/hystrix/TraceCommand.java | 3 ++- .../messaging/MessageHeaderPropagation.java | 9 ++++++--- .../messaging/TraceMessagingAutoConfiguration.java | 3 +++ .../messaging/TracingChannelInterceptor.java | 7 +++++++ .../rxjava/SleuthRxJavaSchedulersHook.java | 1 + .../sleuth/instrument/web/SleuthWebProperties.java | 4 ++++ .../cloud/sleuth/instrument/web/TraceWebFilter.java | 6 ++++++ .../web/client/TraceWebClientAutoConfiguration.java | 6 ++++++ .../web/client/TraceWebClientBeanPostProcessor.java | 7 +++++++ .../web/client/feign/LazyTracingFeignClient.java | 4 ++++ .../web/client/feign/TraceFeignObjectWrapper.java | 2 ++ .../web/client/feign/TracingFeignClient.java | 4 ++++ .../cloud/sleuth/log/Slf4jCurrentTraceContext.java | 1 + .../cloud/sleuth/log/Slf4jScopeDecorator.java | 5 +++-- .../sleuth/sampler/ProbabilityBasedSampler.java | 1 - .../cloud/sleuth/util/SpanNameUtil.java | 3 ++- 24 files changed, 75 insertions(+), 30 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAdjuster.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAdjuster.java index 72eb3ba21..67c1fb2fd 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAdjuster.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanAdjuster.java @@ -36,7 +36,6 @@ public interface SpanAdjuster { * this interface can be used to alter then name. Example: * * {@code span -> span.toBuilder().name(scrub(span.getName())).build();} - * * @param - span to adjust * @return - adjusted span */ diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/ContinueSpan.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/ContinueSpan.java index 8b36b7877..5652d3bdc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/ContinueSpan.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/ContinueSpan.java @@ -31,16 +31,13 @@ import java.lang.annotation.Target; */ @Retention(RetentionPolicy.RUNTIME) @Inherited -@Target(value = { - ElementType.METHOD -}) +@Target(value = { ElementType.METHOD }) public @interface ContinueSpan { /** * Log statement to be appended to the span. - * - * @return - the value passed to the annotation will be used and the framework will create two - * events with the {@code .start} and {@code .end} suffixes. + * @return - the value passed to the annotation will be used and the framework will + * create two events with the {@code .start} and {@code .end} suffixes. */ String log() default ""; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpan.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpan.java index af5e215bf..c19cecb4c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpan.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpan.java @@ -38,21 +38,19 @@ import org.springframework.core.annotation.AliasFor; */ @Retention(RetentionPolicy.RUNTIME) @Inherited -@Target(value = { - ElementType.METHOD -}) +@Target(value = { ElementType.METHOD }) public @interface NewSpan { /** - * @return - The name of the span which will be created. Default is the annotated method's name - * separated by hyphens. + * @return - The name of the span which will be created. Default is the annotated + * method's name separated by hyphens. */ @AliasFor("value") String name() default ""; /** - * @return - The name of the span which will be created. Default is the annotated method's name - * separated by hyphens. + * @return - The name of the span which will be created. Default is the annotated + * method's name separated by hyphens. */ @AliasFor("name") String value() default ""; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpanParser.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpanParser.java index 68d93fc0f..2cc8705c3 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpanParser.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/NewSpanParser.java @@ -29,7 +29,6 @@ public interface NewSpanParser { /** * Override to control the name and tags on an annotation-based span. - * * @param methodInvocation * @param newSpan * @param span diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationUtils.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationUtils.java index 07b3aad53..2a743bb38 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationUtils.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAnnotationUtils.java @@ -68,7 +68,6 @@ class SleuthAnnotationUtils { /** * Searches for an annotation either on a method or inside the method parameters. - * * @param - annotation * @param clazz - class with annotation * @param method - annotated method diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SpanTag.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SpanTag.java index 6e536b582..885fdd2b5 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SpanTag.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SpanTag.java @@ -40,9 +40,7 @@ import org.springframework.core.annotation.AliasFor; */ @Retention(RetentionPolicy.RUNTIME) @Inherited -@Target(value = { - ElementType.PARAMETER -}) +@Target(value = { ElementType.PARAMETER }) public @interface SpanTag { /** @@ -58,8 +56,8 @@ public @interface SpanTag { String key() default ""; /** - * @return - Execute this SPEL expression to calculate the tag value. Will be analyzed if no - * value of the {@link SpanTag#resolver()} was set. + * @return - Execute this SPEL expression to calculate the tag value. Will be analyzed + * if no value of the {@link SpanTag#resolver()} was set. */ String expression() default ""; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceExecutor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceExecutor.java index f18de2c42..f8e911b90 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceExecutor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/LazyTraceExecutor.java @@ -35,9 +35,13 @@ import org.springframework.cloud.sleuth.SpanNamer; public class LazyTraceExecutor implements Executor { private static final Log log = LogFactory.getLog(LazyTraceExecutor.class); + private final BeanFactory beanFactory; + private final Executor delegate; + private Tracing tracing; + private SpanNamer spanNamer; public LazyTraceExecutor(BeanFactory beanFactory, Executor delegate) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/TraceCallable.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/TraceCallable.java index 6f92f1579..415ca1d21 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/TraceCallable.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/TraceCallable.java @@ -36,7 +36,8 @@ import org.springframework.cloud.sleuth.SpanNamer; public class TraceCallable implements Callable { /** - * Since we don't know the exact operation name we provide a default name for the Span. + * Since we don't know the exact operation name we provide a default name for the + * Span. */ private static final String DEFAULT_SPAN_NAME = "async"; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommand.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommand.java index 76561e261..69a0e3baf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommand.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/TraceCommand.java @@ -23,7 +23,8 @@ import brave.Tracer; import com.netflix.hystrix.HystrixCommand; /** - * Abstraction over {@code HystrixCommand} that wraps command execution with Trace setting. + * Abstraction over {@code HystrixCommand} that wraps command execution with Trace + * setting. * * @param - return type of Hystrix Command * @author Tomasz Nurkiewicz, 4financeIT diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagation.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagation.java index c2fe78f58..ce8f098ed 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagation.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagation.java @@ -85,7 +85,8 @@ enum MessageHeaderPropagation nativeAccessor.removeNativeHeader(keyToRemove); } else { - Object nativeHeaders = accessor.getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); + Object nativeHeaders = accessor + .getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); if (nativeHeaders instanceof Map) { ((Map) nativeHeaders).remove(keyToRemove); } @@ -117,7 +118,8 @@ enum MessageHeaderPropagation nativeAccessor.setNativeHeader(key, value); } else { - Object nativeHeaders = accessor.getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); + Object nativeHeaders = accessor + .getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); if (nativeHeaders == null) { accessor.setHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS, nativeHeaders = new LinkedMultiValueMap<>()); @@ -162,7 +164,8 @@ enum MessageHeaderPropagation } } else { - Object nativeHeaders = accessor.getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); + Object nativeHeaders = accessor + .getHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS); if (nativeHeaders instanceof Map) { Object result = ((Map) nativeHeaders).get(key); if (result instanceof List && !((List) result).isEmpty()) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java index e6d2a60c7..5cd0b4fe0 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java @@ -199,8 +199,11 @@ class SleuthRabbitBeanPostProcessor implements BeanPostProcessor { class SleuthKafkaAspect { private static final Log log = LogFactory.getLog(SleuthKafkaAspect.class); + final Field recordMessageConverter; + private final KafkaTracing kafkaTracing; + private final Tracer tracer; SleuthKafkaAspect(KafkaTracing kafkaTracing, Tracer tracer) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java index e658ceaba..31452b698 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java @@ -80,12 +80,19 @@ public final class TracingChannelInterceptor extends ChannelInterceptorAdapter * "http.route". */ private static final String REMOTE_SERVICE_NAME = "broker"; + final Tracing tracing; + final Tracer tracer; + final ThreadLocalSpan threadLocalSpan; + final TraceContext.Injector injector; + final TraceContext.Extractor extractor; + final boolean integrationObjectSupportPresent; + private final boolean hasDirectChannelClass; @Autowired diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java index 24a96874d..8125822cd 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaSchedulersHook.java @@ -97,6 +97,7 @@ class SleuthRxJavaSchedulersHook extends RxJavaSchedulersHook { /** * Wrapped Action element. + * * @author Marcin Grzejszczak */ static class TraceAction implements Action0 { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java index a54c52161..745afdf0a 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java @@ -120,6 +120,7 @@ public class SleuthWebProperties { /** * Web client properties. + * * @author Marcin Grzejszczak */ public static class Client { @@ -155,6 +156,7 @@ public class SleuthWebProperties { /** * Async computing properties. + * * @author Marcin Grzejszczak */ public static class Async { @@ -174,6 +176,7 @@ public class SleuthWebProperties { /** * Async client properties. + * * @author Marcin Grzejszczak */ public static class AsyncClient { @@ -207,6 +210,7 @@ public class SleuthWebProperties { /** * Async Rest Template properties. + * * @author Marcin Grzejszczak */ public static class Template { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java index c47dbbcdf..a67627843 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFilter.java @@ -54,6 +54,7 @@ public final class TraceWebFilter implements WebFilter, Ordered { * logs will not get correlated. */ public static final int ORDER = TraceHttpAutoConfiguration.TRACING_FILTER_ORDER; + protected static final String TRACE_REQUEST_ATTR = TraceWebFilter.class.getName() + ".TRACE"; static final String MVC_CONTROLLER_CLASS_KEY = "mvc.controller.class"; @@ -70,11 +71,16 @@ public final class TraceWebFilter implements WebFilter, Ordered { return "HttpHeaders::getFirst"; } }; + private static final Log log = LogFactory.getLog(TraceWebFilter.class); + private static final String STATUS_CODE_KEY = "http.status_code"; + private static final String TRACE_SPAN_WITHOUT_PARENT = TraceWebFilter.class.getName() + ".SPAN_WITH_NO_PARENT"; + private final BeanFactory beanFactory; + Tracer tracer; HttpServerHandler handler; 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 68d93dddf..f37575f01 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 @@ -376,11 +376,16 @@ class TracingHttpClientInstrumentation { return "HttpHeaders::get"; } }; + private static final Log log = LogFactory .getLog(TracingHttpClientInstrumentation.class); + final Tracer tracer; + final HttpClientHandler handler; + final TraceContext.Injector injector; + final HttpTracing httpTracing; TracingHttpClientInstrumentation(HttpTracing httpTracing) { @@ -462,6 +467,7 @@ class TracingHttpClientInstrumentation { static class TracedHttpClientRequest implements HttpClientRequest { private final io.netty.handler.codec.http.HttpHeaders addedHeaders; + private HttpClientRequest delegate; TracedHttpClientRequest(HttpClientRequest delegate, HttpHeaders addedHeaders) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java index e5541705d..4bfa9dbbf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientBeanPostProcessor.java @@ -109,12 +109,19 @@ class TraceExchangeFilterFunction implements ExchangeFilterFunction { return "HttpHeaders::getFirst"; } }; + private static final Log log = LogFactory.getLog(TraceExchangeFilterFunction.class); + private static final String CLIENT_SPAN_KEY = "sleuth.webclient.clientSpan"; + final BeanFactory beanFactory; + Tracer tracer; + HttpTracing httpTracing; + HttpClientHandler handler; + TraceContext.Injector injector; TraceExchangeFilterFunction(BeanFactory beanFactory) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyTracingFeignClient.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyTracingFeignClient.java index c8f72103a..1bee39d8f 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyTracingFeignClient.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/LazyTracingFeignClient.java @@ -35,9 +35,13 @@ import org.springframework.beans.factory.BeanFactory; class LazyTracingFeignClient implements Client { private static final Log log = LogFactory.getLog(LazyTracingFeignClient.class); + private final BeanFactory beanFactory; + private final Client delegate; + private Client tracingFeignClient; + private HttpTracing httpTracing; LazyTracingFeignClient(BeanFactory beanFactory, Client delegate) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java index 42644ce6f..20fd3e278 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignObjectWrapper.java @@ -43,7 +43,9 @@ final class TraceFeignObjectWrapper { } private final BeanFactory beanFactory; + private CachingSpringLoadBalancerFactory cachingSpringLoadBalancerFactory; + private Object springClientFactory; TraceFeignObjectWrapper(BeanFactory beanFactory) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClient.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClient.java index 0cf1e944f..4b64ff696 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClient.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClient.java @@ -67,9 +67,13 @@ final class TracingFeignClient implements Client { return "Map::set"; } }; + final Tracer tracer; + final Client delegate; + final HttpClientHandler handler; + final TraceContext.Injector>> injector; TracingFeignClient(HttpTracing httpTracing, Client delegate) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jCurrentTraceContext.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jCurrentTraceContext.java index a069544c1..afb9af85e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jCurrentTraceContext.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jCurrentTraceContext.java @@ -123,6 +123,7 @@ public final class Slf4jCurrentTraceContext extends CurrentTraceContext { /** * Thread context scope. + * * @author Adrian Cole */ class ThreadContextCurrentTraceContextScope implements Scope { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java index b6b935379..12ea96c37 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/Slf4jScopeDecorator.java @@ -100,8 +100,8 @@ final class Slf4jScopeDecorator implements CurrentTraceContext.ScopeDecorator { log.trace("With parent: {}", currentSpan.parentId()); } } - whitelistedBaggageKeys(currentSpan) - .forEach((s) -> MDC.put(s, ExtraFieldPropagation.get(currentSpan, s))); + whitelistedBaggageKeys(currentSpan).forEach( + (s) -> MDC.put(s, ExtraFieldPropagation.get(currentSpan, s))); } else { MDC.remove("traceId"); @@ -117,6 +117,7 @@ final class Slf4jScopeDecorator implements CurrentTraceContext.ScopeDecorator { /** * Thread context scope. + * * @author Adrian Cole */ class ThreadContextCurrentTraceContextScope implements CurrentTraceContext.Scope { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java index 48dd687d1..3abdec633 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/ProbabilityBasedSampler.java @@ -80,7 +80,6 @@ public class ProbabilityBasedSampler extends Sampler { * Reservoir sampling algorithm borrowed from Stack Overflow. * * http://stackoverflow.com/questions/12817946/generate-a-random-bitset-with-n-1s - * * @param size * @param cardinality * @param rnd diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/util/SpanNameUtil.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/util/SpanNameUtil.java index 263620e38..6bf043af1 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/util/SpanNameUtil.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/util/SpanNameUtil.java @@ -36,7 +36,8 @@ public final class SpanNameUtil { if (StringUtils.isEmpty(name)) { return name; } - int maxLength = name.length() > MAX_NAME_LENGTH ? (MAX_NAME_LENGTH) : (name.length()); + int maxLength = name.length() > MAX_NAME_LENGTH ? (MAX_NAME_LENGTH) + : (name.length()); return name.substring(0, maxLength); }