From 2046ec050ed8b582b63c5cc87efd705aed951c7a Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 3 Nov 2020 13:54:43 -0800 Subject: [PATCH] Move testing-internal artifact to sdk-testing (#1987) * Move testing-internal artifact to sdk-testing Signed-off-by: Bogdan Drutu * Fix missed usage of TestSpanData Signed-off-by: Bogdan Drutu --- exporters/inmemory/build.gradle | 2 +- .../inmemory/InMemorySpanExporterTest.java | 2 +- exporters/jaeger-thrift/build.gradle | 2 +- .../opentelemetry/exporters/jaeger/AdapterTest.java | 2 +- .../jaeger/JaegerThriftSpanExporterTest.java | 2 +- exporters/jaeger/build.gradle | 2 +- .../opentelemetry/exporters/jaeger/AdapterTest.java | 2 +- .../jaeger/JaegerGrpcSpanExporterTest.java | 2 +- exporters/logging/build.gradle | 4 ++-- .../exporters/logging/LoggingSpanExporterTest.java | 2 +- exporters/otlp/build.gradle | 2 +- .../exporters/otlp/OtlpGrpcSpanExporterTest.java | 2 +- .../exporters/otlp/SpanAdapterTest.java | 2 +- exporters/zipkin/build.gradle | 2 +- .../zipkin/ZipkinSpanExporterEndToEndHttpTest.java | 2 +- .../exporters/zipkin/ZipkinSpanExporterTest.java | 2 +- sdk-extensions/tracing-incubator/build.gradle | 2 +- .../trace/data/DelegatingSpanDataTest.java | 2 +- .../incubator/trace/data/SpanDataBuilderTest.java | 2 +- sdk/all/build.gradle | 4 ++-- .../trace/export/MultiSpanExporterBenchmark.java | 2 +- sdk/common/build.gradle | 2 +- sdk/metrics/build.gradle | 2 +- sdk/testing/build.gradle | 3 ++- .../sdk/testing}/trace/TestSpanData.java | 2 +- .../sdk/testing}/trace/TestSpanDataTest.java | 2 +- sdk/tracing/build.gradle | 2 +- .../java/io/opentelemetry/sdk/trace/TestUtils.java | 1 + settings.gradle | 1 - testing-internal/build.gradle | 13 ------------- .../io/opentelemetry/sdk/trace/package-info.java | 10 ---------- 31 files changed, 31 insertions(+), 53 deletions(-) rename {testing-internal/src/main/java/io/opentelemetry/sdk => sdk/testing/src/main/java/io/opentelemetry/sdk/testing}/trace/TestSpanData.java (99%) rename {testing-internal/src/test/java/io/opentelemetry/sdk => sdk/testing/src/test/java/io/opentelemetry/sdk/testing}/trace/TestSpanDataTest.java (98%) delete mode 100644 testing-internal/build.gradle delete mode 100644 testing-internal/src/main/java/io/opentelemetry/sdk/trace/package-info.java diff --git a/exporters/inmemory/build.gradle b/exporters/inmemory/build.gradle index 8836140090..0cdeca5446 100644 --- a/exporters/inmemory/build.gradle +++ b/exporters/inmemory/build.gradle @@ -13,7 +13,7 @@ dependencies { annotationProcessor libraries.auto_value - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') signature "org.codehaus.mojo.signature:java18:1.0@signature" signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" diff --git a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java b/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java index 715efe1547..01f2de0597 100644 --- a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java +++ b/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java @@ -11,7 +11,7 @@ import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.api.trace.Tracer; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.TracerSdkProvider; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; diff --git a/exporters/jaeger-thrift/build.gradle b/exporters/jaeger-thrift/build.gradle index 1d21c22ee0..9f09282e2d 100644 --- a/exporters/jaeger-thrift/build.gradle +++ b/exporters/jaeger-thrift/build.gradle @@ -19,7 +19,7 @@ dependencies { libraries.testcontainers, libraries.okhttp - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') signature "org.codehaus.mojo.signature:java18:1.0@signature" signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" diff --git a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java index e14f305635..78540f7b95 100644 --- a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java +++ b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java @@ -31,7 +31,7 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import io.opentelemetry.sdk.trace.data.SpanData.Link; diff --git a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java index eeb8902561..46ae8f8b45 100644 --- a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java +++ b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java @@ -24,7 +24,7 @@ import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; import java.net.InetAddress; diff --git a/exporters/jaeger/build.gradle b/exporters/jaeger/build.gradle index 9a90415f67..147d272a32 100644 --- a/exporters/jaeger/build.gradle +++ b/exporters/jaeger/build.gradle @@ -25,7 +25,7 @@ dependencies { libraries.testcontainers, libraries.okhttp - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java index f5eb904b67..0b551f63af 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java @@ -28,7 +28,7 @@ import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import io.opentelemetry.sdk.trace.data.SpanData.Link; diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java index 69359dd66d..74eba92e33 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java @@ -35,7 +35,7 @@ import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils; import io.opentelemetry.sdk.resources.Resource; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; import java.net.InetAddress; diff --git a/exporters/logging/build.gradle b/exporters/logging/build.gradle index b98c257a03..e38ca34a35 100644 --- a/exporters/logging/build.gradle +++ b/exporters/logging/build.gradle @@ -11,8 +11,8 @@ ext.moduleName = "io.opentelemetry.exporters.logging" dependencies { api project(':opentelemetry-sdk') - testImplementation project(':opentelemetry-testing-internal') - + testImplementation project(':opentelemetry-sdk-testing') + signature "org.codehaus.mojo.signature:java18:1.0@signature" signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" } diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java index 66d3281da6..ac9dfd3901 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java @@ -14,7 +14,7 @@ import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import io.opentelemetry.sdk.trace.data.SpanData.Status; diff --git a/exporters/otlp/build.gradle b/exporters/otlp/build.gradle index af5aec0102..c93c8844a6 100644 --- a/exporters/otlp/build.gradle +++ b/exporters/otlp/build.gradle @@ -18,7 +18,7 @@ dependencies { libraries.protobuf, libraries.protobuf_util - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation "io.grpc:grpc-testing:${grpcVersion}" testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}" diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java index 30d053a53d..00b5e7b311 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java @@ -23,7 +23,7 @@ import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse; import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc; import io.opentelemetry.proto.trace.v1.ResourceSpans; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import java.io.IOException; import java.util.ArrayList; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java index 38684c9ea8..2a4cbabe82 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java @@ -32,7 +32,7 @@ import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.common.v1.KeyValue; import io.opentelemetry.proto.trace.v1.Span; import io.opentelemetry.proto.trace.v1.Status; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import io.opentelemetry.sdk.trace.data.SpanData.Link; diff --git a/exporters/zipkin/build.gradle b/exporters/zipkin/build.gradle index a92b800540..9b99dae7d2 100644 --- a/exporters/zipkin/build.gradle +++ b/exporters/zipkin/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation libraries.zipkin_reporter, libraries.zipkin_okhttp - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.guava, libraries.zipkin_junit diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java index 315de0c118..7bc9e80847 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableList; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import java.util.Collections; diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java index 4b7f058ca4..46e1920f86 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java @@ -29,7 +29,7 @@ import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.resources.ResourceAttributes; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; import java.io.IOException; diff --git a/sdk-extensions/tracing-incubator/build.gradle b/sdk-extensions/tracing-incubator/build.gradle index d370822697..7233cb2492 100644 --- a/sdk-extensions/tracing-incubator/build.gradle +++ b/sdk-extensions/tracing-incubator/build.gradle @@ -16,7 +16,7 @@ dependencies { annotationProcessor libraries.auto_value - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" } \ No newline at end of file diff --git a/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/DelegatingSpanDataTest.java b/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/DelegatingSpanDataTest.java index a331669adf..ac367bb643 100644 --- a/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/DelegatingSpanDataTest.java +++ b/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/DelegatingSpanDataTest.java @@ -16,7 +16,7 @@ import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.api.trace.attributes.SemanticAttributes; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; import org.junit.jupiter.api.Test; diff --git a/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/SpanDataBuilderTest.java b/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/SpanDataBuilderTest.java index 010a9cfba1..4403b9f038 100644 --- a/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/SpanDataBuilderTest.java +++ b/sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extensions/incubator/trace/data/SpanDataBuilderTest.java @@ -11,7 +11,7 @@ import com.google.common.testing.EqualsTester; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; import org.junit.jupiter.api.Test; diff --git a/sdk/all/build.gradle b/sdk/all/build.gradle index 88cbfb9c58..7f5faf6f13 100644 --- a/sdk/all/build.gradle +++ b/sdk/all/build.gradle @@ -23,10 +23,10 @@ dependencies { testAnnotationProcessor libraries.auto_value testCompileOnly libraries.auto_value_annotation - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer - jmh(project(':opentelemetry-testing-internal')) { + jmh(project(':opentelemetry-sdk-testing')) { // JMH doesn't handle dependencies that are duplicated between the main and jmh // configurations properly, but luckily here it's simple enough to just exclude transitive // dependencies. diff --git a/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/MultiSpanExporterBenchmark.java b/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/MultiSpanExporterBenchmark.java index 362f83e2ac..218e656810 100644 --- a/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/MultiSpanExporterBenchmark.java +++ b/sdk/all/src/jmh/java/io/opentelemetry/sdk/trace/export/MultiSpanExporterBenchmark.java @@ -9,7 +9,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.sdk.common.CompletableResultCode; -import io.opentelemetry.sdk.trace.TestSpanData; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.data.SpanData; import java.util.Arrays; import java.util.Collection; diff --git a/sdk/common/build.gradle b/sdk/common/build.gradle index 8c46725561..3e338d4880 100644 --- a/sdk/common/build.gradle +++ b/sdk/common/build.gradle @@ -19,7 +19,7 @@ dependencies { testAnnotationProcessor libraries.auto_value testCompileOnly libraries.auto_value_annotation - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" diff --git a/sdk/metrics/build.gradle b/sdk/metrics/build.gradle index 6f428d4f51..9ce36bc9b8 100644 --- a/sdk/metrics/build.gradle +++ b/sdk/metrics/build.gradle @@ -23,7 +23,7 @@ dependencies { testCompile project(path: ':opentelemetry-sdk-common', configuration: 'testClasses') - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" diff --git a/sdk/testing/build.gradle b/sdk/testing/build.gradle index b7887dec9f..d1ef556731 100644 --- a/sdk/testing/build.gradle +++ b/sdk/testing/build.gradle @@ -9,8 +9,9 @@ ext.moduleName = 'io.opentelemetry.sdk.testing' dependencies { api project(':opentelemetry-api') api project(':opentelemetry-sdk') - api libraries.junit_jupiter_api + annotationProcessor libraries.auto_value + implementation project(':opentelemetry-exporters-inmemory') } diff --git a/testing-internal/src/main/java/io/opentelemetry/sdk/trace/TestSpanData.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java similarity index 99% rename from testing-internal/src/main/java/io/opentelemetry/sdk/trace/TestSpanData.java rename to sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java index bb287acf38..9d5890dcac 100644 --- a/testing-internal/src/main/java/io/opentelemetry/sdk/trace/TestSpanData.java +++ b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/trace/TestSpanData.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.trace; +package io.opentelemetry.sdk.testing.trace; import com.google.auto.value.AutoValue; import io.opentelemetry.api.common.Attributes; diff --git a/testing-internal/src/test/java/io/opentelemetry/sdk/trace/TestSpanDataTest.java b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/trace/TestSpanDataTest.java similarity index 98% rename from testing-internal/src/test/java/io/opentelemetry/sdk/trace/TestSpanDataTest.java rename to sdk/testing/src/test/java/io/opentelemetry/sdk/testing/trace/TestSpanDataTest.java index 38fa5893b2..79533827ef 100644 --- a/testing-internal/src/test/java/io/opentelemetry/sdk/trace/TestSpanDataTest.java +++ b/sdk/testing/src/test/java/io/opentelemetry/sdk/testing/trace/TestSpanDataTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.trace; +package io.opentelemetry.sdk.testing.trace; import static java.util.Collections.emptyList; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk/tracing/build.gradle b/sdk/tracing/build.gradle index 45e182fa83..7b290e1b04 100644 --- a/sdk/tracing/build.gradle +++ b/sdk/tracing/build.gradle @@ -23,7 +23,7 @@ dependencies { testCompile project(path: ':opentelemetry-sdk-common', configuration: 'testClasses') - testImplementation project(':opentelemetry-testing-internal') + testImplementation project(':opentelemetry-sdk-testing') testImplementation libraries.junit_pioneer signature "net.sf.androidscents.signature:android-api-level-24:7.0_r2@signature" diff --git a/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java index 122fdae180..3c05309ca3 100644 --- a/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/TestUtils.java @@ -13,6 +13,7 @@ import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.sdk.testing.trace.TestSpanData; import io.opentelemetry.sdk.trace.config.TraceConfig; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Status; diff --git a/settings.gradle b/settings.gradle index fdcb3194e0..e4e1e7835a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -54,7 +54,6 @@ include ":opentelemetry-all", ":opentelemetry-sdk-extension-zpages", ":opentelemetry-sdk-testing", ":opentelemetry-bom", - ":opentelemetry-testing-internal", ":opentelemetry-perf-harness" rootProject.children.each { diff --git a/testing-internal/build.gradle b/testing-internal/build.gradle deleted file mode 100644 index 968b224833..0000000000 --- a/testing-internal/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id "java" -} - -description = 'Internal testing utilities' -ext.moduleName = 'io.opentelemetry.testing-internal' - -dependencies { - api project(':opentelemetry-api') - api project(':opentelemetry-sdk') - - annotationProcessor libraries.auto_value -} diff --git a/testing-internal/src/main/java/io/opentelemetry/sdk/trace/package-info.java b/testing-internal/src/main/java/io/opentelemetry/sdk/trace/package-info.java deleted file mode 100644 index 3f43bb0f22..0000000000 --- a/testing-internal/src/main/java/io/opentelemetry/sdk/trace/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -/** Testing utilities for OpenTelemetry for internal use. */ -@ParametersAreNonnullByDefault -package io.opentelemetry.sdk.trace; - -import javax.annotation.ParametersAreNonnullByDefault;