Remove testbed artifact, add testbed tests to trace sdk (#1999)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

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'),
 ]

sdk-extensions/testbed/README.md

@@ -1,5 +0,0 @@
-# OpenTelemetry SDK Testbed
-
-Testbed for OpenTelemetry API and SDK.
-
-* Java 8 compatible.

sdk-extensions/testbed/build.gradle

@@ -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
-}

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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",