Update rxjava instrumentation and package names (#5984)

* Update rxjava instrumentation and package names

* Spotless

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseBucketInstrumentation.java

@@ -14,7 +14,7 @@ import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import com.couchbase.client.java.CouchbaseCluster;
-import io.opentelemetry.instrumentation.rxjava.TracedOnSubscribe;
+import io.opentelemetry.instrumentation.rxjava.v1_0.TracedOnSubscribe;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClusterInstrumentation.java

@@ -14,7 +14,7 @@ import static net.bytebuddy.matcher.ElementMatchers.not;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import com.couchbase.client.java.CouchbaseCluster;
-import io.opentelemetry.instrumentation.rxjava.TracedOnSubscribe;
+import io.opentelemetry.instrumentation.rxjava.v1_0.TracedOnSubscribe;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

instrumentation/hystrix-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixCommandInstrumentation.java

@@ -13,7 +13,7 @@ import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
 import com.netflix.hystrix.HystrixInvokableInfo;
-import io.opentelemetry.instrumentation.rxjava.TracedOnSubscribe;
+import io.opentelemetry.instrumentation.rxjava.v1_0.TracedOnSubscribe;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;

instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/SpanFinishingSubscription.java → instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/SpanFinishingSubscription.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava;
+package io.opentelemetry.instrumentation.rxjava.v1_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;

instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/TracedOnSubscribe.java → instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedOnSubscribe.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava;
+package io.opentelemetry.instrumentation.rxjava.v1_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/TracedSubscriber.java → instrumentation/rxjava/rxjava-1.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v1_0/TracedSubscriber.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava;
+package io.opentelemetry.instrumentation.rxjava.v1_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/RxJava2IgnoredTypesConfigurer.java → instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2IgnoredTypesConfigurer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava2;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v2_0;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.instrumentation.api.config.Config;

instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/RxJava2InstrumentationModule.java → instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJava2InstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava2;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v2_0;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -15,7 +15,7 @@ import java.util.List;
 public class RxJava2InstrumentationModule extends InstrumentationModule {
 
   public RxJava2InstrumentationModule() {
-    super("rxjava2");
+    super("rxjava", "rxjava-2.0");
   }
 
   @Override

instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/RxJavaPluginsInstrumentation.java → instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/RxJavaPluginsInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava2;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v2_0;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava2/TracingAssemblyActivation.java → instrumentation/rxjava/rxjava-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v2_0/TracingAssemblyActivation.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava2;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.instrumentation.api.config.Config;
-import io.opentelemetry.instrumentation.rxjava2.TracingAssembly;
+import io.opentelemetry.instrumentation.rxjava.v2_0.TracingAssembly;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class TracingAssemblyActivation {

instrumentation/rxjava/rxjava-2.0/javaagent/src/test/groovy/RxJava2SubscriptionTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava2.AbstractRxJava2SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v2_0.AbstractRxJava2SubscriptionTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava2SubscriptionTest extends AbstractRxJava2SubscriptionTest implements AgentTestTrait {

instrumentation/rxjava/rxjava-2.0/javaagent/src/test/groovy/RxJava2Test.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava2.AbstractRxJava2Test
+import io.opentelemetry.instrumentation.rxjava.v2_0.AbstractRxJava2Test
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava2Test extends AbstractRxJava2Test implements AgentTestTrait {

instrumentation/rxjava/rxjava-2.0/javaagent/src/test/groovy/RxJava2WithSpanInstrumentationTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava2.TracedWithSpan
+import io.opentelemetry.instrumentation.rxjava.v2_0.TracedWithSpan
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.reactivex.Completable
 import io.reactivex.Flowable

instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/rxjava2/TracedWithSpan.java → instrumentation/rxjava/rxjava-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracedWithSpan.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.extension.annotations.WithSpan;
 import io.reactivex.Completable;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategy.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategy.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import static io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport.tryToGetResponse;
 

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/RxJava2AsyncOperationEndStrategyBuilder.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2AsyncOperationEndStrategyBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 public final class RxJava2AsyncOperationEndStrategyBuilder {
 

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssembly.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingAssembly.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingAssemblyBuilder.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingAssemblyBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 public final class TracingAssemblyBuilder {
   private boolean captureExperimentalSpanAttributes;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingCompletableObserver.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingCompletableObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingConditionalSubscriber.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingConditionalSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingMaybeObserver.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingMaybeObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingObserver.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingParallelFlowable.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingParallelFlowable.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingSingleObserver.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingSingleObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava2/TracingSubscriber.java → instrumentation/rxjava/rxjava-2.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v2_0/TracingSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2AsyncOperationEndStrategyTest.groovy

@@ -6,7 +6,7 @@
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.context.Context
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
-import io.opentelemetry.instrumentation.rxjava2.RxJava2AsyncOperationEndStrategy
+import io.opentelemetry.instrumentation.rxjava.v2_0.RxJava2AsyncOperationEndStrategy
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Maybe

instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2SubscriptionTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava2.AbstractRxJava2SubscriptionTest
-import io.opentelemetry.instrumentation.rxjava2.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v2_0.AbstractRxJava2SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v2_0.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared
 

instrumentation/rxjava/rxjava-2.0/library/src/test/groovy/RxJava2Test.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava2.AbstractRxJava2Test
-import io.opentelemetry.instrumentation.rxjava2.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v2_0.AbstractRxJava2Test
+import io.opentelemetry.instrumentation.rxjava.v2_0.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared
 

instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava2/AbstractRxJava2SubscriptionTest.groovy → instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v2_0/AbstractRxJava2SubscriptionTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2
+package io.opentelemetry.instrumentation.rxjava.v2_0
 
 import io.opentelemetry.api.GlobalOpenTelemetry
 import io.opentelemetry.api.trace.SpanKind

instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava2/AbstractRxJava2Test.groovy → instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v2_0/AbstractRxJava2Test.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2
+package io.opentelemetry.instrumentation.rxjava.v2_0
 
 import com.google.common.collect.Lists
 import io.opentelemetry.api.common.AttributeKey

instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava2/RxJava2ConcurrencyTestHelper.java → instrumentation/rxjava/rxjava-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v2_0/RxJava2ConcurrencyTestHelper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava2;
+package io.opentelemetry.instrumentation.rxjava.v2_0;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;

instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategy.java → instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import static io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport.tryToGetResponse;
 

instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/RxJava3AsyncOperationEndStrategyBuilder.java → instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 public final class RxJava3AsyncOperationEndStrategyBuilder {
 

instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingCompletableObserver.java → instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingMaybeObserver.java → instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingSingleObserver.java → instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3-common/library/src/test/groovy/RxJava3AsyncOperationEndStrategyTest.groovy

@@ -6,7 +6,7 @@
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.context.Context
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
-import io.opentelemetry.instrumentation.rxjava3.RxJava3AsyncOperationEndStrategy
+import io.opentelemetry.instrumentation.rxjava.v3.common.RxJava3AsyncOperationEndStrategy
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe

instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava3/AbstractRxJava3SubscriptionTest.groovy → instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3
+package io.opentelemetry.instrumentation.rxjava.v3.common
 
 import io.opentelemetry.api.GlobalOpenTelemetry
 import io.opentelemetry.api.trace.SpanKind

instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava3/AbstractRxJava3Test.groovy → instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3
+package io.opentelemetry.instrumentation.rxjava.v3.common
 
 import com.google.common.collect.Lists
 import io.opentelemetry.api.common.AttributeKey

instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava3/AbstractRxJava3WithSpanInstrumentationTest.groovy → instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanInstrumentationTest.groovy

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3
+package io.opentelemetry.instrumentation.rxjava.v3.common
+
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
 import io.reactivex.rxjava3.core.Completable

instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava3/RxJava3ConcurrencyTestHelper.java → instrumentation/rxjava/rxjava-3-common/testing/src/main/groovy/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;

instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracedWithSpan.java → instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracedWithSpan.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3.common;
 
 import io.opentelemetry.extension.annotations.WithSpan;
 import io.reactivex.rxjava3.core.Completable;

instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/RxJava3InstrumentationModule.java → instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJava3InstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_0;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 
@@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 public class RxJava3InstrumentationModule extends InstrumentationModule {
 
   public RxJava3InstrumentationModule() {
-    super("rxjava3");
+    super("rxjava", "rxjava-3.0");
   }
 
   @Override

instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/RxJavaPluginsInstrumentation.java → instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/RxJavaPluginsInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_0;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/TracingAssemblyActivation.java → instrumentation/rxjava/rxjava-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_0/TracingAssemblyActivation.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.instrumentation.api.config.Config;
-import io.opentelemetry.instrumentation.rxjava3.TracingAssembly;
+import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class TracingAssemblyActivation {

instrumentation/rxjava/rxjava-3.0/javaagent/src/test/groovy/RxJava3SubscriptionTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava3SubscriptionTest extends AbstractRxJava3SubscriptionTest implements AgentTestTrait {

instrumentation/rxjava/rxjava-3.0/javaagent/src/test/groovy/RxJava3Test.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3Test
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava3Test extends AbstractRxJava3Test implements AgentTestTrait {

instrumentation/rxjava/rxjava-3.0/javaagent/src/test/groovy/RxJava3WithSpanInstrumentationTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3WithSpanInstrumentationTest
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanInstrumentationTest
 
 class RxJava3WithSpanInstrumentationTest extends AbstractRxJava3WithSpanInstrumentationTest {
 }

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssembly.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssembly.java

@@ -20,12 +20,16 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
 import io.opentelemetry.instrumentation.api.internal.GuardedBy;
+import io.opentelemetry.instrumentation.rxjava.v3.common.RxJava3AsyncOperationEndStrategy;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingCompletableObserver;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingMaybeObserver;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingSingleObserver;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableObserver;
 import io.reactivex.rxjava3.core.Flowable;

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingAssemblyBuilder.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssemblyBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 public final class TracingAssemblyBuilder {
   private boolean captureExperimentalSpanAttributes;

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingConditionalSubscriber.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingConditionalSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingObserver.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingParallelFlowable.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingParallelFlowable.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/TracingSubscriber.java → instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3;
+package io.opentelemetry.instrumentation.rxjava.v3_0;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3SubscriptionTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3SubscriptionTest
-import io.opentelemetry.instrumentation.rxjava3.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared
 

instrumentation/rxjava/rxjava-3.0/library/src/test/groovy/RxJava3Test.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3Test
-import io.opentelemetry.instrumentation.rxjava3.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test
+import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared
 

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/v3_1_1/RxJava3InstrumentationModule.java → instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJava3InstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_1_1;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 
@@ -18,7 +18,7 @@ import net.bytebuddy.matcher.ElementMatcher;
 public class RxJava3InstrumentationModule extends InstrumentationModule {
 
   public RxJava3InstrumentationModule() {
-    super("rxjava3.1.1", "rxjava3");
+    super("rxjava", "rxjava-3.1.1");
   }
 
   @Override

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/v3_1_1/RxJavaPluginsInstrumentation.java → instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/RxJavaPluginsInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_1_1;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava3/v3_1_1/TracingAssemblyActivation.java → instrumentation/rxjava/rxjava-3.1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/rxjava/v3_1_1/TracingAssemblyActivation.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.javaagent.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.instrumentation.api.config.Config;
-import io.opentelemetry.instrumentation.rxjava3.v3_1_1.TracingAssembly;
+import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public final class TracingAssemblyActivation {

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/groovy/RxJava3SubscriptionTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava3SubscriptionTest extends AbstractRxJava3SubscriptionTest implements AgentTestTrait {

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/groovy/RxJava3Test.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3Test
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 
 class RxJava3Test extends AbstractRxJava3Test implements AgentTestTrait {

instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/groovy/RxJava3WithSpanInstrumentationTest.groovy

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3WithSpanInstrumentationTest
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanInstrumentationTest
 
 class RxJava3WithSpanInstrumentationTest extends AbstractRxJava3WithSpanInstrumentationTest {
 }

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingAssembly.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssembly.java

@@ -20,16 +20,16 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategies;
 import io.opentelemetry.instrumentation.api.internal.GuardedBy;
-import io.opentelemetry.instrumentation.rxjava3.RxJava3AsyncOperationEndStrategy;
-import io.opentelemetry.instrumentation.rxjava3.TracingCompletableObserver;
-import io.opentelemetry.instrumentation.rxjava3.TracingMaybeObserver;
-import io.opentelemetry.instrumentation.rxjava3.TracingSingleObserver;
+import io.opentelemetry.instrumentation.rxjava.v3.common.RxJava3AsyncOperationEndStrategy;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingCompletableObserver;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingMaybeObserver;
+import io.opentelemetry.instrumentation.rxjava.v3.common.TracingSingleObserver;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableObserver;
 import io.reactivex.rxjava3.core.Flowable;

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingAssemblyBuilder.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssemblyBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 public final class TracingAssemblyBuilder {
   private boolean captureExperimentalSpanAttributes;

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingConditionalSubscriber.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingConditionalSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingObserver.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingObserver.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingParallelFlowable.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingParallelFlowable.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava3/v3_1_1/TracingSubscriber.java → instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingSubscriber.java

@@ -20,7 +20,7 @@
  * under the License.
  */
 
-package io.opentelemetry.instrumentation.rxjava3.v3_1_1;
+package io.opentelemetry.instrumentation.rxjava.v3_1_1;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/rxjava/rxjava-3.1.1/library/src/test/groovy/RxJava3SubscriptionTest.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3SubscriptionTest
-import io.opentelemetry.instrumentation.rxjava3.v3_1_1.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest
+import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared
 

instrumentation/rxjava/rxjava-3.1.1/library/src/test/groovy/RxJava3Test.groovy

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import io.opentelemetry.instrumentation.rxjava3.AbstractRxJava3Test
-import io.opentelemetry.instrumentation.rxjava3.v3_1_1.TracingAssembly
+import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test
+import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly
 import io.opentelemetry.instrumentation.test.LibraryTestTrait
 import spock.lang.Shared