diff --git a/all/build.gradle b/all/build.gradle index 0bb5b52db5..6fcf0d6a62 100644 --- a/all/build.gradle +++ b/all/build.gradle @@ -29,7 +29,6 @@ def subprojects = [ project(':opentelemetry-sdk-extension-logging'), project(':opentelemetry-sdk-extension-otproto'), project(':opentelemetry-sdk-extension-resources'), - project(':opentelemetry-sdk-extension-testbed'), project(':opentelemetry-sdk-extension-tracing-incubator'), project(':opentelemetry-sdk-extension-zpages'), ] diff --git a/sdk-extensions/testbed/README.md b/sdk-extensions/testbed/README.md deleted file mode 100644 index d43415e771..0000000000 --- a/sdk-extensions/testbed/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# OpenTelemetry SDK Testbed - -Testbed for OpenTelemetry API and SDK. - -* Java 8 compatible. diff --git a/sdk-extensions/testbed/build.gradle b/sdk-extensions/testbed/build.gradle deleted file mode 100644 index f25c53efad..0000000000 --- a/sdk-extensions/testbed/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -plugins { - id "java" - - id "ru.vyarus.animalsniffer" -} - -description = 'OpenTelemetry SDK Testbed' -ext.moduleName = 'io.opentelemetry.sdk.extension.trace.testbed' - -dependencies { - testImplementation project(':opentelemetry-api'), - project(':opentelemetry-sdk'), - project(':opentelemetry-sdk-testing'), - libraries.guava -} diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/TestUtils.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java similarity index 98% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/TestUtils.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java index c946302636..970368dccf 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/TestUtils.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/TestUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed; +package io.opentelemetry.sdk.trace.testbed; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java similarity index 93% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java index 46021bd5f4..e7a7fd823f 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/activespanreplacement/ActiveSpanReplacementTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.activespanreplacement; +package io.opentelemetry.sdk.trace.testbed.activespanreplacement; -import static io.opentelemetry.sdk.extensions.trace.testbed.TestUtils.sleep; +import static io.opentelemetry.sdk.trace.testbed.TestUtils.sleep; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; import static org.hamcrest.core.IsEqual.equalTo; @@ -14,9 +14,9 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/Actor.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/Actor.java similarity index 97% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/Actor.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/Actor.java index 7b004d4130..d0b01178c4 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/Actor.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/Actor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.actorpropagation; +package io.opentelemetry.sdk.trace.testbed.actorpropagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/ActorPropagationTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/ActorPropagationTest.java similarity index 96% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/ActorPropagationTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/ActorPropagationTest.java index 8dd41db5db..dd5755d26e 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/actorpropagation/ActorPropagationTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/actorpropagation/ActorPropagationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.actorpropagation; +package io.opentelemetry.sdk.trace.testbed.actorpropagation; import static org.assertj.core.api.Assertions.assertThat; @@ -11,9 +11,9 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Client.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Client.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Client.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Client.java index e42b140d78..777b522632 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Client.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Client.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.clientserver; +package io.opentelemetry.sdk.trace.testbed.clientserver; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Message.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Message.java similarity index 71% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Message.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Message.java index 685583d40d..c398f40d44 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Message.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Message.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.clientserver; +package io.opentelemetry.sdk.trace.testbed.clientserver; import java.util.HashMap; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Server.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Server.java similarity index 96% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Server.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Server.java index e7a691bf6b..36cdbe509c 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/Server.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/Server.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.clientserver; +package io.opentelemetry.sdk.trace.testbed.clientserver; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/TestClientServerTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/TestClientServerTest.java similarity index 93% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/TestClientServerTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/TestClientServerTest.java index ea5197b6e2..3a766d3f9b 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/clientserver/TestClientServerTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/clientserver/TestClientServerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.clientserver; +package io.opentelemetry.sdk.trace.testbed.clientserver; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -13,9 +13,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; import io.opentelemetry.api.trace.Tracer; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/Client.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/Client.java similarity index 88% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/Client.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/Client.java index 8676a3533a..f4fd7efbd2 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/Client.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/Client.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.concurrentcommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.concurrentcommonrequesthandler; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java similarity index 96% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java index 62356aa7ca..f562d7e766 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/HandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.concurrentcommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.concurrentcommonrequesthandler; import static org.assertj.core.api.Assertions.assertThat; @@ -12,9 +12,9 @@ import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java index f61f216649..bdb26e8b09 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.concurrentcommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.concurrentcommonrequesthandler; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java similarity index 68% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java index 149516f51a..912115e583 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/concurrentcommonrequesthandler/RequestHandlerContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.concurrentcommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.concurrentcommonrequesthandler; import java.util.HashMap; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/errorreporting/ErrorReportingTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/errorreporting/ErrorReportingTest.java similarity index 97% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/errorreporting/ErrorReportingTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/errorreporting/ErrorReportingTest.java index 2d7fa48781..4f4dbdde36 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/errorreporting/ErrorReportingTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/errorreporting/ErrorReportingTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.errorreporting; +package io.opentelemetry.sdk.trace.testbed.errorreporting; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -14,10 +14,10 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/latespanfinish/LateSpanFinishTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/latespanfinish/LateSpanFinishTest.java similarity index 95% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/latespanfinish/LateSpanFinishTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/latespanfinish/LateSpanFinishTest.java index 8431a9cc89..7504491c04 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/latespanfinish/LateSpanFinishTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/latespanfinish/LateSpanFinishTest.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.latespanfinish; +package io.opentelemetry.sdk.trace.testbed.latespanfinish; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/Client.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/Client.java similarity index 93% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/Client.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/Client.java index 3bcf09d8bb..203b553e91 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/Client.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/Client.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.listenerperrequest; +package io.opentelemetry.sdk.trace.testbed.listenerperrequest; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ListenerTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ListenerTest.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ListenerTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ListenerTest.java index 9f34766dc0..e6a8a30881 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ListenerTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ListenerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.listenerperrequest; +package io.opentelemetry.sdk.trace.testbed.listenerperrequest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ResponseListener.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ResponseListener.java similarity index 86% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ResponseListener.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ResponseListener.java index 31d3d38c80..68b16da63d 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/listenerperrequest/ResponseListener.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/listenerperrequest/ResponseListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.listenerperrequest; +package io.opentelemetry.sdk.trace.testbed.listenerperrequest; import io.opentelemetry.api.trace.Span; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/Client.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/Client.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/Client.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/Client.java index 2ebd813750..a54c90e049 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/Client.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/Client.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.multiplecallbacks; +package io.opentelemetry.sdk.trace.testbed.multiplecallbacks; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java index feffa57709..9c91cf3f5f 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/multiplecallbacks/MultipleCallbacksTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.multiplecallbacks; +package io.opentelemetry.sdk.trace.testbed.multiplecallbacks; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -12,9 +12,9 @@ import static org.hamcrest.core.IsEqual.equalTo; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/nestedcallbacks/NestedCallbacksTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/nestedcallbacks/NestedCallbacksTest.java similarity index 95% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/nestedcallbacks/NestedCallbacksTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/nestedcallbacks/NestedCallbacksTest.java index 5186a53529..7d756e21d0 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/nestedcallbacks/NestedCallbacksTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/nestedcallbacks/NestedCallbacksTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.nestedcallbacks; +package io.opentelemetry.sdk.trace.testbed.nestedcallbacks; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; @@ -14,9 +14,9 @@ import io.opentelemetry.api.common.ReadableAttributes; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/Promise.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/Promise.java similarity index 96% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/Promise.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/Promise.java index c7c74e97fa..ebe73b6245 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/Promise.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/Promise.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.promisepropagation; +package io.opentelemetry.sdk.trace.testbed.promisepropagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromiseContext.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromiseContext.java similarity index 91% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromiseContext.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromiseContext.java index c2aa018dae..0471d9625e 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromiseContext.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromiseContext.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.promisepropagation; +package io.opentelemetry.sdk.trace.testbed.promisepropagation; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromisePropagationTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromisePropagationTest.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromisePropagationTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromisePropagationTest.java index edc242b11e..b9bcd6f6e5 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/promisepropagation/PromisePropagationTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/promisepropagation/PromisePropagationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.promisepropagation; +package io.opentelemetry.sdk.trace.testbed.promisepropagation; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; @@ -13,10 +13,10 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; -import io.opentelemetry.sdk.extensions.trace.testbed.nestedcallbacks.NestedCallbacksTest; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.TestUtils; +import io.opentelemetry.sdk.trace.testbed.nestedcallbacks.NestedCallbacksTest; import java.util.List; import java.util.concurrent.Phaser; import java.util.concurrent.atomic.AtomicReference; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/Client.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/Client.java similarity index 84% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/Client.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/Client.java index 1cf14fe5e1..49b9476199 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/Client.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/Client.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.statelesscommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.statelesscommonrequesthandler; -import io.opentelemetry.sdk.extensions.trace.testbed.TestUtils; +import io.opentelemetry.sdk.trace.testbed.TestUtils; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/HandlerTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/HandlerTest.java similarity index 94% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/HandlerTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/HandlerTest.java index 5e5cc3e6b6..ffdf5dddf5 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/HandlerTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/HandlerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.statelesscommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.statelesscommonrequesthandler; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/RequestHandler.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/RequestHandler.java similarity index 93% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/RequestHandler.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/RequestHandler.java index a7c0ad90b0..4dd129fb01 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/statelesscommonrequesthandler/RequestHandler.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/statelesscommonrequesthandler/RequestHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.statelesscommonrequesthandler; +package io.opentelemetry.sdk.trace.testbed.statelesscommonrequesthandler; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResume.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResume.java similarity index 89% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResume.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResume.java index 3ff70cd41b..01ad51d7f3 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResume.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResume.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.suspendresumepropagation; +package io.opentelemetry.sdk.trace.testbed.suspendresumepropagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; diff --git a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java similarity index 91% rename from sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java rename to sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java index 5a6a4c9c63..df80a4bdc9 100644 --- a/sdk-extensions/testbed/src/test/java/io/opentelemetry/sdk/extensions/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java +++ b/sdk/tracing/src/test/java/io/opentelemetry/sdk/trace/testbed/suspendresumepropagation/SuspendResumePropagationTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.sdk.extensions.trace.testbed.suspendresumepropagation; +package io.opentelemetry.sdk.trace.testbed.suspendresumepropagation; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.Tracer; -import io.opentelemetry.sdk.extensions.trace.testbed.statelesscommonrequesthandler.HandlerTest; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.SpanData; +import io.opentelemetry.sdk.trace.testbed.statelesscommonrequesthandler.HandlerTest; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/settings.gradle b/settings.gradle index 2057209e57..cd56bc2dba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -47,7 +47,6 @@ include ":opentelemetry-all", ":opentelemetry-sdk-extension-logging", ":opentelemetry-sdk-extension-otproto", ":opentelemetry-sdk-extension-resources", - ":opentelemetry-sdk-extension-testbed", ":opentelemetry-sdk-extension-tracing-incubator", ":opentelemetry-sdk-extension-jaeger-remote-sampler", ":opentelemetry-sdk-extension-zpages",