Migrating micrometer-tracing to micrometer-tracing-api; fixes gh-7

micrometer-metrics · Feb 17, 2022 · 03006ac · 03006ac
1 parent 1d9ea86
commit 03006ac
Show file tree

Hide file tree

Showing 55 changed files with 6 additions and 6 deletions.
diff --git a/micrometer-tracing/build.gradle → micrometer-tracing-api/build.gradle b/micrometer-tracing/build.gradle → micrometer-tracing-api/build.gradle
diff --git a/...io/micrometer/tracing/BaggageInScope.java → ...io/micrometer/tracing/BaggageInScope.java b/...io/micrometer/tracing/BaggageInScope.java → ...io/micrometer/tracing/BaggageInScope.java
diff --git a/...io/micrometer/tracing/BaggageManager.java → ...io/micrometer/tracing/BaggageManager.java b/...io/micrometer/tracing/BaggageManager.java → ...io/micrometer/tracing/BaggageManager.java
diff --git a/...crometer/tracing/CurrentTraceContext.java → ...crometer/tracing/CurrentTraceContext.java b/...crometer/tracing/CurrentTraceContext.java → ...crometer/tracing/CurrentTraceContext.java
diff --git a/...o/micrometer/tracing/SamplerFunction.java → ...o/micrometer/tracing/SamplerFunction.java b/...o/micrometer/tracing/SamplerFunction.java → ...o/micrometer/tracing/SamplerFunction.java
diff --git a/...ava/io/micrometer/tracing/ScopedSpan.java → ...ava/io/micrometer/tracing/ScopedSpan.java b/...ava/io/micrometer/tracing/ScopedSpan.java → ...ava/io/micrometer/tracing/ScopedSpan.java
diff --git a/...main/java/io/micrometer/tracing/Span.java → ...main/java/io/micrometer/tracing/Span.java b/...main/java/io/micrometer/tracing/Span.java → ...main/java/io/micrometer/tracing/Span.java
diff --git a/...a/io/micrometer/tracing/SpanAndScope.java → ...a/io/micrometer/tracing/SpanAndScope.java b/...a/io/micrometer/tracing/SpanAndScope.java → ...a/io/micrometer/tracing/SpanAndScope.java
diff --git a/...io/micrometer/tracing/SpanCustomizer.java → ...io/micrometer/tracing/SpanCustomizer.java b/...io/micrometer/tracing/SpanCustomizer.java → ...io/micrometer/tracing/SpanCustomizer.java
diff --git a/.../java/io/micrometer/tracing/SpanName.java → .../java/io/micrometer/tracing/SpanName.java b/.../java/io/micrometer/tracing/SpanName.java → .../java/io/micrometer/tracing/SpanName.java
diff --git a/...java/io/micrometer/tracing/SpanNamer.java → ...java/io/micrometer/tracing/SpanNamer.java b/...java/io/micrometer/tracing/SpanNamer.java → ...java/io/micrometer/tracing/SpanNamer.java
diff --git a/...o/micrometer/tracing/ThreadLocalSpan.java → ...o/micrometer/tracing/ThreadLocalSpan.java b/...o/micrometer/tracing/ThreadLocalSpan.java → ...o/micrometer/tracing/ThreadLocalSpan.java
diff --git a/...a/io/micrometer/tracing/TraceContext.java → ...a/io/micrometer/tracing/TraceContext.java b/...a/io/micrometer/tracing/TraceContext.java → ...a/io/micrometer/tracing/TraceContext.java
diff --git a/...in/java/io/micrometer/tracing/Tracer.java → ...in/java/io/micrometer/tracing/Tracer.java b/...in/java/io/micrometer/tracing/Tracer.java → ...in/java/io/micrometer/tracing/Tracer.java
diff --git a/...eter/tracing/annotation/ContinueSpan.java → ...eter/tracing/annotation/ContinueSpan.java b/...eter/tracing/annotation/ContinueSpan.java → ...eter/tracing/annotation/ContinueSpan.java
diff --git a/...icrometer/tracing/annotation/NewSpan.java → ...icrometer/tracing/annotation/NewSpan.java b/...icrometer/tracing/annotation/NewSpan.java → ...icrometer/tracing/annotation/NewSpan.java
diff --git a/...ter/tracing/annotation/NewSpanParser.java → ...ter/tracing/annotation/NewSpanParser.java b/...ter/tracing/annotation/NewSpanParser.java → ...ter/tracing/annotation/NewSpanParser.java
diff --git a/...cing/annotation/NoOpTagValueResolver.java → ...cing/annotation/NoOpTagValueResolver.java b/...cing/annotation/NoOpTagValueResolver.java → ...cing/annotation/NoOpTagValueResolver.java
diff --git a/...tion/SleuthMethodInvocationProcessor.java → ...tion/SleuthMethodInvocationProcessor.java b/...tion/SleuthMethodInvocationProcessor.java → ...tion/SleuthMethodInvocationProcessor.java
diff --git a/...icrometer/tracing/annotation/SpanTag.java → ...icrometer/tracing/annotation/SpanTag.java b/...icrometer/tracing/annotation/SpanTag.java → ...icrometer/tracing/annotation/SpanTag.java
diff --git a/...nnotation/TagValueExpressionResolver.java → ...nnotation/TagValueExpressionResolver.java b/...nnotation/TagValueExpressionResolver.java → ...nnotation/TagValueExpressionResolver.java
diff --git a/.../tracing/annotation/TagValueResolver.java → .../tracing/annotation/TagValueResolver.java b/.../tracing/annotation/TagValueResolver.java → .../tracing/annotation/TagValueResolver.java
diff --git a/...crometer/tracing/docs/DocumentedSpan.java → ...crometer/tracing/docs/DocumentedSpan.java b/...crometer/tracing/docs/DocumentedSpan.java → ...crometer/tracing/docs/DocumentedSpan.java
diff --git a/...o/micrometer/tracing/docs/EventValue.java → ...o/micrometer/tracing/docs/EventValue.java b/...o/micrometer/tracing/docs/EventValue.java → ...o/micrometer/tracing/docs/EventValue.java
diff --git a/...ometer/tracing/exporter/FinishedSpan.java → ...ometer/tracing/exporter/FinishedSpan.java b/...ometer/tracing/exporter/FinishedSpan.java → ...ometer/tracing/exporter/FinishedSpan.java
diff --git a/...crometer/tracing/exporter/SpanFilter.java → ...crometer/tracing/exporter/SpanFilter.java b/...crometer/tracing/exporter/SpanFilter.java → ...crometer/tracing/exporter/SpanFilter.java
diff --git a/...cing/exporter/SpanIgnoringSpanFilter.java → ...cing/exporter/SpanIgnoringSpanFilter.java b/...cing/exporter/SpanIgnoringSpanFilter.java → ...cing/exporter/SpanIgnoringSpanFilter.java
diff --git a/...ometer/tracing/exporter/SpanReporter.java → ...ometer/tracing/exporter/SpanReporter.java b/...ometer/tracing/exporter/SpanReporter.java → ...ometer/tracing/exporter/SpanReporter.java
diff --git a/...ler/DefaultTracingObservationHandler.java → ...ler/DefaultTracingObservationHandler.java b/...ler/DefaultTracingObservationHandler.java → ...ler/DefaultTracingObservationHandler.java
diff --git a/.../HttpClientTracingObservationHandler.java → .../HttpClientTracingObservationHandler.java b/.../HttpClientTracingObservationHandler.java → .../HttpClientTracingObservationHandler.java
diff --git a/.../HttpServerTracingObservationHandler.java → .../HttpServerTracingObservationHandler.java b/.../HttpServerTracingObservationHandler.java → .../HttpServerTracingObservationHandler.java
diff --git a/...andler/HttpTracingObservationHandler.java → ...andler/HttpTracingObservationHandler.java b/...andler/HttpTracingObservationHandler.java → ...andler/HttpTracingObservationHandler.java
diff --git a/...ng/handler/TracingObservationHandler.java → ...ng/handler/TracingObservationHandler.java b/...ng/handler/TracingObservationHandler.java → ...ng/handler/TracingObservationHandler.java
diff --git a/...meter/tracing/http/HttpClientHandler.java → ...meter/tracing/http/HttpClientHandler.java b/...meter/tracing/http/HttpClientHandler.java → ...meter/tracing/http/HttpClientHandler.java
diff --git a/...meter/tracing/http/HttpRequestParser.java → ...meter/tracing/http/HttpRequestParser.java b/...meter/tracing/http/HttpRequestParser.java → ...meter/tracing/http/HttpRequestParser.java
diff --git a/...eter/tracing/http/HttpResponseParser.java → ...eter/tracing/http/HttpResponseParser.java b/...eter/tracing/http/HttpResponseParser.java → ...eter/tracing/http/HttpResponseParser.java
diff --git a/...meter/tracing/http/HttpServerHandler.java → ...meter/tracing/http/HttpServerHandler.java b/...meter/tracing/http/HttpServerHandler.java → ...meter/tracing/http/HttpServerHandler.java
diff --git a/...er/tracing/internal/DefaultSpanNamer.java → ...er/tracing/internal/DefaultSpanNamer.java b/...er/tracing/internal/DefaultSpanNamer.java → ...er/tracing/internal/DefaultSpanNamer.java
diff --git a/...meter/tracing/internal/EncodingUtils.java → ...meter/tracing/internal/EncodingUtils.java b/...meter/tracing/internal/EncodingUtils.java → ...meter/tracing/internal/EncodingUtils.java
diff --git a/...ometer/tracing/internal/SpanNameUtil.java → ...ometer/tracing/internal/SpanNameUtil.java b/...ometer/tracing/internal/SpanNameUtil.java → ...ometer/tracing/internal/SpanNameUtil.java
diff --git a/...meter/tracing/propagation/Propagator.java → ...meter/tracing/propagation/Propagator.java b/...meter/tracing/propagation/Propagator.java → ...meter/tracing/propagation/Propagator.java
diff --git a/.../micrometer/tracing/util/StringUtils.java → .../micrometer/tracing/util/StringUtils.java b/.../micrometer/tracing/util/StringUtils.java → .../micrometer/tracing/util/StringUtils.java
diff --git a/...annotation/NoOpTagValueResolverTests.java → ...annotation/NoOpTagValueResolverTests.java b/...annotation/NoOpTagValueResolverTests.java → ...annotation/NoOpTagValueResolverTests.java
diff --git a/...exporter/SpanIgnoringSpanFilterTests.java → ...exporter/SpanIgnoringSpanFilterTests.java b/...exporter/SpanIgnoringSpanFilterTests.java → ...exporter/SpanIgnoringSpanFilterTests.java
diff --git a/...acing/internal/DefaultSpanNamerTests.java → ...acing/internal/DefaultSpanNamerTests.java b/...acing/internal/DefaultSpanNamerTests.java → ...acing/internal/DefaultSpanNamerTests.java
diff --git a/.../tracing/internal/EncodingUtilsTests.java → .../tracing/internal/EncodingUtilsTests.java b/.../tracing/internal/EncodingUtilsTests.java → .../tracing/internal/EncodingUtilsTests.java
diff --git a/...r/tracing/internal/SpanNameUtilTests.java → ...r/tracing/internal/SpanNameUtilTests.java b/...r/tracing/internal/SpanNameUtilTests.java → ...r/tracing/internal/SpanNameUtilTests.java
diff --git a/...ometer/tracing/util/StringUtilsTests.java → ...ometer/tracing/util/StringUtilsTests.java b/...ometer/tracing/util/StringUtilsTests.java → ...ometer/tracing/util/StringUtilsTests.java
diff --git a/...er-tracing/src/test/resources/logback.xml → ...racing-api/src/test/resources/logback.xml b/...er-tracing/src/test/resources/logback.xml → ...racing-api/src/test/resources/logback.xml
diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api project(':micrometer-tracing')
+	api project(':micrometer-tracing-api')
 	api 'org.slf4j:slf4j-api'
 	api 'javax.servlet:javax.servlet-api'
 

diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api project(':micrometer-tracing')
+	api project(':micrometer-tracing-api')
 	api 'org.slf4j:slf4j-api'
 	api 'io.micrometer:micrometer-core'
 

diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api project(':micrometer-tracing')
+	api project(':micrometer-tracing-api')
 	api 'io.micrometer:micrometer-core'
 
 	// Brave

diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api project(':micrometer-tracing')
+	api project(':micrometer-tracing-api')
 	api project(':micrometer-tracing-test')
 	api project(':micrometer-tracing-reporter-wavefront')
 

diff --git a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-	api project(':micrometer-tracing')
+	api project(':micrometer-tracing-api')
 	api 'org.assertj:assertj-core'
 
 	// Tests for tests

diff --git a/settings.gradle b/settings.gradle
@@ -22,7 +22,7 @@ gradleEnterprise {
 	server = 'https://ge.micrometer.io'
 }
 
-include 'micrometer-tracing', 'micrometer-tracing-bom'
+include 'micrometer-tracing-api', 'micrometer-tracing-bom'
 
 ['brave', 'otel'].each { bridge ->
 	include "micrometer-tracing-bridge-$bridge"