From a5f3234bacfec8ec64ea810212257f0ac4c8a3fb Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 23 Jun 2015 20:32:33 -0600 Subject: [PATCH] collapse trace and trace.intercept packages --- .../cloud/sleuth/{trace => }/DefaultTrace.java | 6 ++---- .../cloud/sleuth/{trace => }/MilliSpan.java | 2 +- .../cloud/sleuth/{trace => }/NullScope.java | 2 +- .../cloud/sleuth/{trace => }/Sampler.java | 2 +- .../cloud/sleuth/{trace => }/Span.java | 2 +- .../cloud/sleuth/{trace => }/SpanHolder.java | 2 +- .../cloud/sleuth/{trace => }/SpanReceiver.java | 2 +- .../cloud/sleuth/{trace => }/SpanStartListener.java | 2 +- .../cloud/sleuth/{trace => }/TimelineAnnotation.java | 2 +- .../cloud/sleuth/{trace => }/Trace.java | 2 +- .../sleuth/{trace => }/TraceAutoConfiguration.java | 6 ++---- .../cloud/sleuth/{trace => }/TraceInfo.java | 2 +- .../cloud/sleuth/{trace => }/TraceScope.java | 2 +- .../cloud/sleuth/{trace => }/Utils.java | 2 +- .../intercept => }/circuitbreaker/TraceCommand.java | 6 +++--- .../{trace => }/receiver/ArrayListSpanReceiver.java | 6 +++--- .../sleuth/{trace => }/sampler/AlwaysSampler.java | 4 ++-- .../sleuth/{trace => }/sampler/IsTracingSampler.java | 6 +++--- .../scheduling/TraceSchedulingAspect.java | 8 ++++---- .../scheduling/TraceSchedulingAutoConfiguration.java | 4 ++-- .../cloud/sleuth/slf4j/Slf4jSpanReceiver.java | 6 +++--- .../cloud/sleuth/slf4j/Slf4jSpanStartListener.java | 6 +++--- .../{trace/intercept => }/web/TraceFilter.java | 12 ++++++------ .../{trace/intercept => }/web/TraceWebAspect.java | 8 ++++---- .../web/TraceWebAutoConfiguration.java | 4 ++-- .../web/client/TraceRestTemplateInterceptor.java | 11 ++++++----- .../web/client/TraceWebClientAutoConfiguration.java | 2 +- .../src/main/resources/META-INF/spring.factories | 6 +++--- .../cloud/sleuth/{trace => }/DefaultTraceTests.java | 9 ++++----- .../cloud/sleuth/sample/SampleApplication.java | 6 +++--- 30 files changed, 68 insertions(+), 72 deletions(-) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/DefaultTrace.java (95%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/MilliSpan.java (96%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/NullScope.java (90%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/Sampler.java (95%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/Span.java (97%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/SpanHolder.java (89%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/SpanReceiver.java (85%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/SpanStartListener.java (70%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/TimelineAnnotation.java (75%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/Trace.java (98%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/TraceAutoConfiguration.java (76%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/TraceInfo.java (75%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/TraceScope.java (97%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/Utils.java (81%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/circuitbreaker/TraceCommand.java (89%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/receiver/ArrayListSpanReceiver.java (71%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/sampler/AlwaysSampler.java (58%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace => }/sampler/IsTracingSampler.java (53%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/scheduling/TraceSchedulingAspect.java (81%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/scheduling/TraceSchedulingAutoConfiguration.java (84%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/web/TraceFilter.java (91%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/web/TraceWebAspect.java (93%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/web/TraceWebAutoConfiguration.java (95%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/web/client/TraceRestTemplateInterceptor.java (84%) rename spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/{trace/intercept => }/web/client/TraceWebClientAutoConfiguration.java (93%) rename spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/{trace => }/DefaultTraceTests.java (91%) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTrace.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/DefaultTrace.java similarity index 95% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTrace.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/DefaultTrace.java index 2eff2ffa2..603e33bdc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTrace.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/DefaultTrace.java @@ -1,8 +1,6 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; -import static org.springframework.cloud.sleuth.trace.Utils.error; - -import org.springframework.cloud.sleuth.IdGenerator; +import static org.springframework.cloud.sleuth.Utils.error; import java.util.Collection; import java.util.Collections; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/MilliSpan.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/MilliSpan.java similarity index 96% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/MilliSpan.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/MilliSpan.java index 83124d988..50404f6cc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/MilliSpan.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/MilliSpan.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import java.util.List; import java.util.Map; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/NullScope.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/NullScope.java similarity index 90% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/NullScope.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/NullScope.java index b5941fd77..82bad3bcf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/NullScope.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/NullScope.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Sampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java similarity index 95% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Sampler.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java index 033416eb9..4e00125ce 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Sampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; /** * Extremely simple callback to determine the frequency that an action should be diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Span.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Span.java similarity index 97% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Span.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Span.java index dfd34b9d1..a880e5b8a 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Span.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Span.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import java.util.List; import java.util.Map; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanHolder.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanHolder.java similarity index 89% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanHolder.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanHolder.java index 3b617fe97..2735c7700 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanHolder.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanHolder.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import lombok.extern.apachecommons.CommonsLog; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanReceiver.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanReceiver.java similarity index 85% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanReceiver.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanReceiver.java index 5a42135dd..9d0d54702 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanReceiver.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanReceiver.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import java.io.Closeable; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanStartListener.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanStartListener.java similarity index 70% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanStartListener.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanStartListener.java index 276f2dfa8..2958cbe1c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/SpanStartListener.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/SpanStartListener.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TimelineAnnotation.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TimelineAnnotation.java similarity index 75% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TimelineAnnotation.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TimelineAnnotation.java index b0b18dc3e..7c31d6845 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TimelineAnnotation.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TimelineAnnotation.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import lombok.Data; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Trace.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java similarity index 98% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Trace.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java index 0568118a7..ab1601bdf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Trace.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Trace.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; /** * The Trace class is the primary way to interact with the library. It provides diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAutoConfiguration.java similarity index 76% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceAutoConfiguration.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAutoConfiguration.java index 71dad2f7e..7d7c4cd6b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceAutoConfiguration.java @@ -1,9 +1,7 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.sleuth.IdGenerator; -import org.springframework.cloud.sleuth.RandomUuidGenerator; -import org.springframework.cloud.sleuth.trace.sampler.IsTracingSampler; +import org.springframework.cloud.sleuth.sampler.IsTracingSampler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceInfo.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceInfo.java similarity index 75% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceInfo.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceInfo.java index 31c8e5dab..5f8485eab 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceInfo.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceInfo.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import lombok.Data; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceScope.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceScope.java similarity index 97% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceScope.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceScope.java index 3de9135ad..a7d36434a 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/TraceScope.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceScope.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import java.io.Closeable; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Utils.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Utils.java similarity index 81% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Utils.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Utils.java index 3c8ecc4ac..6c8feaf18 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/Utils.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Utils.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import lombok.extern.apachecommons.CommonsLog; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/circuitbreaker/TraceCommand.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/circuitbreaker/TraceCommand.java similarity index 89% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/circuitbreaker/TraceCommand.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/circuitbreaker/TraceCommand.java index cb8ea6861..cc28a9439 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/circuitbreaker/TraceCommand.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/circuitbreaker/TraceCommand.java @@ -1,10 +1,10 @@ -package org.springframework.cloud.sleuth.trace.intercept.circuitbreaker; +package org.springframework.cloud.sleuth.circuitbreaker; import com.netflix.hystrix.HystrixCommand; import com.netflix.hystrix.HystrixCommandGroupKey; import com.netflix.hystrix.HystrixThreadPoolKey; -import org.springframework.cloud.sleuth.trace.Trace; -import org.springframework.cloud.sleuth.trace.TraceScope; +import org.springframework.cloud.sleuth.Trace; +import org.springframework.cloud.sleuth.TraceScope; /** * Abstraction over {@code HystrixCommand} that wraps command execution with Trace setting diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/receiver/ArrayListSpanReceiver.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/receiver/ArrayListSpanReceiver.java similarity index 71% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/receiver/ArrayListSpanReceiver.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/receiver/ArrayListSpanReceiver.java index 1a50ddbac..167ab3ee9 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/receiver/ArrayListSpanReceiver.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/receiver/ArrayListSpanReceiver.java @@ -1,7 +1,7 @@ -package org.springframework.cloud.sleuth.trace.receiver; +package org.springframework.cloud.sleuth.receiver; -import org.springframework.cloud.sleuth.trace.Span; -import org.springframework.cloud.sleuth.trace.SpanReceiver; +import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.SpanReceiver; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/AlwaysSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java similarity index 58% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/AlwaysSampler.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java index 879371904..087912506 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/AlwaysSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java @@ -1,6 +1,6 @@ -package org.springframework.cloud.sleuth.trace.sampler; +package org.springframework.cloud.sleuth.sampler; -import org.springframework.cloud.sleuth.trace.Sampler; +import org.springframework.cloud.sleuth.Sampler; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/IsTracingSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java similarity index 53% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/IsTracingSampler.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java index be4b27447..72eee8cbe 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/sampler/IsTracingSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java @@ -1,7 +1,7 @@ -package org.springframework.cloud.sleuth.trace.sampler; +package org.springframework.cloud.sleuth.sampler; -import org.springframework.cloud.sleuth.trace.Sampler; -import org.springframework.cloud.sleuth.trace.SpanHolder; +import org.springframework.cloud.sleuth.Sampler; +import org.springframework.cloud.sleuth.SpanHolder; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAspect.java similarity index 81% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAspect.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAspect.java index 41d78ff25..e4943adc5 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAspect.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAspect.java @@ -1,10 +1,10 @@ -package org.springframework.cloud.sleuth.trace.intercept.scheduling; +package org.springframework.cloud.sleuth.scheduling; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.springframework.cloud.sleuth.trace.Trace; -import org.springframework.cloud.sleuth.trace.TraceScope; +import org.springframework.cloud.sleuth.Trace; +import org.springframework.cloud.sleuth.TraceScope; import org.springframework.scheduling.annotation.Scheduled; /** @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled; * @author Marcin Grzejszczak, 4financeIT * @author Spencer Gibb * - * @see org.springframework.cloud.sleuth.trace.Trace + * @see Trace */ @Aspect public class TraceSchedulingAspect { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAutoConfiguration.java similarity index 84% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAutoConfiguration.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAutoConfiguration.java index 590264775..f0e31e71c 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/scheduling/TraceSchedulingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/scheduling/TraceSchedulingAutoConfiguration.java @@ -1,10 +1,10 @@ -package org.springframework.cloud.sleuth.trace.intercept.scheduling; +package org.springframework.cloud.sleuth.scheduling; /** * @author Spencer Gibb */ -import org.springframework.cloud.sleuth.trace.Trace; +import org.springframework.cloud.sleuth.Trace; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanReceiver.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanReceiver.java index 3d1acd172..d46ef23b1 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanReceiver.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanReceiver.java @@ -1,11 +1,11 @@ package org.springframework.cloud.sleuth.slf4j; -import static org.springframework.cloud.sleuth.trace.Trace.SPAN_ID_NAME; +import static org.springframework.cloud.sleuth.Trace.SPAN_ID_NAME; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; -import org.springframework.cloud.sleuth.trace.Span; -import org.springframework.cloud.sleuth.trace.SpanReceiver; +import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.SpanReceiver; import javax.annotation.PostConstruct; import java.io.IOException; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanStartListener.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanStartListener.java index c1ba9a5d0..ebf1c090e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanStartListener.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/slf4j/Slf4jSpanStartListener.java @@ -3,9 +3,9 @@ package org.springframework.cloud.sleuth.slf4j; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; -import org.springframework.cloud.sleuth.trace.Span; -import org.springframework.cloud.sleuth.trace.SpanStartListener; -import org.springframework.cloud.sleuth.trace.Trace; +import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.SpanStartListener; +import org.springframework.cloud.sleuth.Trace; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceFilter.java similarity index 91% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceFilter.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceFilter.java index 7b8972e2b..0faec9184 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceFilter.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceFilter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.sleuth.trace.intercept.web; +package org.springframework.cloud.sleuth.web; -import static org.springframework.cloud.sleuth.trace.Trace.SPAN_ID_NAME; +import static org.springframework.cloud.sleuth.Trace.SPAN_ID_NAME; import static org.springframework.util.StringUtils.hasText; import java.io.IOException; @@ -31,10 +31,10 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; -import org.springframework.cloud.sleuth.trace.MilliSpan; -import org.springframework.cloud.sleuth.trace.Span; -import org.springframework.cloud.sleuth.trace.Trace; -import org.springframework.cloud.sleuth.trace.TraceScope; +import org.springframework.cloud.sleuth.MilliSpan; +import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.Trace; +import org.springframework.cloud.sleuth.TraceScope; import org.springframework.web.filter.OncePerRequestFilter; /** diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAspect.java similarity index 93% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAspect.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAspect.java index adbd8620f..9397c7849 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAspect.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAspect.java @@ -1,6 +1,6 @@ -package org.springframework.cloud.sleuth.trace.intercept.web; +package org.springframework.cloud.sleuth.web; -import static org.springframework.cloud.sleuth.trace.Trace.SPAN_ID_NAME; +import static org.springframework.cloud.sleuth.Trace.SPAN_ID_NAME; import java.util.ArrayList; import java.util.List; @@ -10,8 +10,8 @@ import lombok.extern.apachecommons.CommonsLog; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Pointcut; -import org.springframework.cloud.sleuth.trace.Trace; -import org.springframework.cloud.sleuth.trace.TraceScope; +import org.springframework.cloud.sleuth.Trace; +import org.springframework.cloud.sleuth.TraceScope; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Controller; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAutoConfiguration.java similarity index 95% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAutoConfiguration.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAutoConfiguration.java index 4c0316504..df7719d21 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/TraceWebAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.sleuth.trace.intercept.web; +package org.springframework.cloud.sleuth.web; import java.util.regex.Pattern; @@ -23,7 +23,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.boot.context.embedded.FilterRegistrationBean; -import org.springframework.cloud.sleuth.trace.Trace; +import org.springframework.cloud.sleuth.Trace; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.StringUtils; diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceRestTemplateInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceRestTemplateInterceptor.java similarity index 84% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceRestTemplateInterceptor.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceRestTemplateInterceptor.java index 6e485e912..4dc7b9332 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceRestTemplateInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceRestTemplateInterceptor.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.sleuth.trace.intercept.web.client; +package org.springframework.cloud.sleuth.web.client; -import static org.springframework.cloud.sleuth.trace.Trace.SPAN_ID_NAME; -import static org.springframework.cloud.sleuth.trace.Trace.TRACE_ID_NAME; +import static org.springframework.cloud.sleuth.Trace.SPAN_ID_NAME; +import static org.springframework.cloud.sleuth.Trace.TRACE_ID_NAME; import java.io.IOException; -import org.springframework.cloud.sleuth.trace.SpanHolder; +import org.springframework.cloud.sleuth.SpanHolder; +import org.springframework.cloud.sleuth.Trace; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; @@ -31,7 +32,7 @@ import org.springframework.http.client.ClientHttpResponse; * request and sets them if one or both of them are missing. * * @see org.springframework.web.client.RestTemplate - * @see org.springframework.cloud.sleuth.trace.Trace + * @see Trace * * @author Marcin Grzejszczak, 4financeIT * @author Spencer Gibb diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceWebClientAutoConfiguration.java similarity index 93% rename from spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceWebClientAutoConfiguration.java rename to spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceWebClientAutoConfiguration.java index 96230a482..2fc38fe4d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/intercept/web/client/TraceWebClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/web/client/TraceWebClientAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace.intercept.web.client; +package org.springframework.cloud.sleuth.web.client; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories b/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories index 674340da8..f13ffc5a5 100644 --- a/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.cloud.sleuth.resttemplate.SleuthRestTemplateAutoConfiguration,\ -org.springframework.cloud.sleuth.trace.TraceAutoConfiguration,\ -org.springframework.cloud.sleuth.trace.intercept.web.TraceWebAutoConfiguration,\ -org.springframework.cloud.sleuth.trace.intercept.web.client.TraceWebClientAutoConfiguration,\ +org.springframework.cloud.sleuth.TraceAutoConfiguration,\ +org.springframework.cloud.sleuth.web.TraceWebAutoConfiguration,\ +org.springframework.cloud.sleuth.web.client.TraceWebClientAutoConfiguration,\ org.springframework.cloud.sleuth.slf4j.SleuthSlf4jAutoConfiguration diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/DefaultTraceTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceTests.java similarity index 91% rename from spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/DefaultTraceTests.java rename to spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceTests.java index 05a8b4da7..a85f21995 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/trace/DefaultTraceTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.sleuth.trace; +package org.springframework.cloud.sleuth; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -11,10 +11,9 @@ import java.util.List; import lombok.Data; import org.junit.Test; -import org.springframework.cloud.sleuth.RandomUuidGenerator; -import org.springframework.cloud.sleuth.trace.receiver.ArrayListSpanReceiver; -import org.springframework.cloud.sleuth.trace.sampler.AlwaysSampler; -import org.springframework.cloud.sleuth.trace.sampler.IsTracingSampler; +import org.springframework.cloud.sleuth.receiver.ArrayListSpanReceiver; +import org.springframework.cloud.sleuth.sampler.AlwaysSampler; +import org.springframework.cloud.sleuth.sampler.IsTracingSampler; /** * @author Spencer Gibb diff --git a/spring-cloud-sleuth-sample/src/main/java/org/springframework/cloud/sleuth/sample/SampleApplication.java b/spring-cloud-sleuth-sample/src/main/java/org/springframework/cloud/sleuth/sample/SampleApplication.java index 1abd724c2..f235a9cdf 100644 --- a/spring-cloud-sleuth-sample/src/main/java/org/springframework/cloud/sleuth/sample/SampleApplication.java +++ b/spring-cloud-sleuth-sample/src/main/java/org/springframework/cloud/sleuth/sample/SampleApplication.java @@ -9,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; -import org.springframework.cloud.sleuth.trace.Trace; -import org.springframework.cloud.sleuth.trace.TraceScope; -import org.springframework.cloud.sleuth.trace.sampler.AlwaysSampler; +import org.springframework.cloud.sleuth.Trace; +import org.springframework.cloud.sleuth.TraceScope; +import org.springframework.cloud.sleuth.sampler.AlwaysSampler; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Configuration; import org.springframework.web.bind.annotation.RequestMapping;