From b6ab664e68d83f039e939adce2378be894abb116 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 22 Dec 2024 20:48:51 -0800 Subject: [PATCH 1/2] Rename some common modules --- .../testing/build.gradle.kts | 0 .../cassandra/v4/common/AbstractCassandraTest.java | 0 .../cassandra-4.0/javaagent/build.gradle.kts | 2 +- .../cassandra/cassandra-4.4/testing/build.gradle.kts | 2 +- .../javaagent-unit-tests/build.gradle.kts | 2 +- .../couchbase/v2_0/CouchbaseQuerySanitizerTest.java | 0 .../javaagent/build.gradle.kts | 0 .../couchbase/v2_0/CouchbaseQuerySanitizer.java | 0 .../couchbase/v2_0/CouchbaseRequestInfo.java | 0 .../testing/build.gradle.kts | 0 .../couchbase/AbstractCouchbaseAsyncClientTest.java | 0 .../couchbase/AbstractCouchbaseClientTest.java | 0 .../couchbase/AbstractCouchbaseTest.java | 0 .../AbstractCouchbaseSpringRepositoryTest.java | 0 .../AbstractCouchbaseSpringTemplateTest.java | 0 .../couchbase/springdata/CouchbaseConfig.java | 0 .../couchbase/springdata/TestDocument.java | 0 .../couchbase/springdata/TestRepository.java | 0 .../couchbase-2.0/javaagent/build.gradle.kts | 4 ++-- .../couchbase-2.6/javaagent/build.gradle.kts | 4 ++-- .../library/build.gradle.kts | 0 .../v3/common/RxJava3AsyncOperationEndStrategy.java | 0 .../RxJava3AsyncOperationEndStrategyBuilder.java | 0 .../rxjava/v3/common/TracingCompletableObserver.java | 0 .../rxjava/v3/common/TracingMaybeObserver.java | 0 .../rxjava/v3/common/TracingSingleObserver.java | 0 .../java/RxJava3AsyncOperationEndStrategyTest.java | 0 .../testing/build.gradle.kts | 0 .../v3/common/AbstractRxJava3SubscriptionTest.java | 0 .../rxjava/v3/common/AbstractRxJava3Test.java | 0 .../v3/common/AbstractRxJava3WithSpanTest.java | 0 .../rxjava/v3/common/AbstractTracedWithSpan.java | 0 .../v3/common/RxJava3ConcurrencyTestHelper.java | 0 .../common/extensionannotation/TracedWithSpan.java | 0 .../instrumentationannotation/TracedWithSpan.java | 0 .../rxjava/rxjava-3.0/javaagent/build.gradle.kts | 2 +- .../rxjava/rxjava-3.0/library/build.gradle.kts | 4 ++-- .../rxjava/rxjava-3.1.1/javaagent/build.gradle.kts | 2 +- .../rxjava/rxjava-3.1.1/library/build.gradle.kts | 4 ++-- settings.gradle.kts | 12 ++++++------ 40 files changed, 19 insertions(+), 19 deletions(-) rename instrumentation/cassandra/{cassandra-4-common => cassandra-4.0-common}/testing/build.gradle.kts (100%) rename instrumentation/cassandra/{cassandra-4-common => cassandra-4.0-common}/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java (100%) rename instrumentation/couchbase/{couchbase-2-common => couchbase-2.0-common}/javaagent-unit-tests/build.gradle.kts (91%) rename instrumentation/couchbase/{couchbase-2-common => couchbase-2.0-common}/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java (100%) rename instrumentation/couchbase/{couchbase-2-common => couchbase-2.0-common}/javaagent/build.gradle.kts (100%) rename instrumentation/couchbase/{couchbase-2-common => couchbase-2.0-common}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizer.java (100%) rename instrumentation/couchbase/{couchbase-2-common => couchbase-2.0-common}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseRequestInfo.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/build.gradle.kts (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java (100%) rename instrumentation/couchbase/{couchbase-common => couchbase-2.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/build.gradle.kts (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/build.gradle.kts (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java (100%) rename instrumentation/rxjava/{rxjava-3-common => rxjava-3.0-common}/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java (100%) diff --git a/instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/cassandra/cassandra-4-common/testing/build.gradle.kts rename to instrumentation/cassandra/cassandra-4.0-common/testing/build.gradle.kts diff --git a/instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java similarity index 100% rename from instrumentation/cassandra/cassandra-4-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java rename to instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts index bf3b4b5862a3..a20a8971c8fa 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":instrumentation:cassandra:cassandra-4-common:testing")) + testImplementation(project(":instrumentation:cassandra:cassandra-4.0-common:testing")) testInstrumentation(project(":instrumentation:cassandra:cassandra-3.0:javaagent")) testInstrumentation(project(":instrumentation:cassandra:cassandra-4.4:javaagent")) diff --git a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts index faaad8aa7951..52807b028209 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts @@ -8,5 +8,5 @@ dependencies { implementation("com.datastax.oss:java-driver-core:4.4.0") implementation("io.projectreactor:reactor-core:3.5.3") - api(project(":instrumentation:cassandra:cassandra-4-common:testing")) + api(project(":instrumentation:cassandra:cassandra-4.0-common:testing")) } diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0-common/javaagent-unit-tests/build.gradle.kts similarity index 91% rename from instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/build.gradle.kts rename to instrumentation/couchbase/couchbase-2.0-common/javaagent-unit-tests/build.gradle.kts index 69287a4bb7f6..c7d3ced2c10a 100644 --- a/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.0-common/javaagent-unit-tests/build.gradle.kts @@ -5,6 +5,6 @@ plugins { dependencies { testImplementation(project(":instrumentation-api-incubator")) testImplementation(project(":javaagent-extension-api")) - testImplementation(project(":instrumentation:couchbase:couchbase-2-common:javaagent")) + testImplementation(project(":instrumentation:couchbase:couchbase-2.0-common:javaagent")) testImplementation("com.couchbase.client:java-client:2.5.0") } diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java b/instrumentation/couchbase/couchbase-2.0-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-2-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java rename to instrumentation/couchbase/couchbase-2.0-common/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.java diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0-common/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/couchbase/couchbase-2-common/javaagent/build.gradle.kts rename to instrumentation/couchbase/couchbase-2.0-common/javaagent/build.gradle.kts diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizer.java b/instrumentation/couchbase/couchbase-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizer.java similarity index 100% rename from instrumentation/couchbase/couchbase-2-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizer.java rename to instrumentation/couchbase/couchbase-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizer.java diff --git a/instrumentation/couchbase/couchbase-2-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseRequestInfo.java b/instrumentation/couchbase/couchbase-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseRequestInfo.java similarity index 100% rename from instrumentation/couchbase/couchbase-2-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseRequestInfo.java rename to instrumentation/couchbase/couchbase-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseRequestInfo.java diff --git a/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/build.gradle.kts rename to instrumentation/couchbase/couchbase-2.0-common/testing/build.gradle.kts diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java diff --git a/instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java similarity index 100% rename from instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts index be9254a911c2..1f585beeb2bd 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts @@ -19,12 +19,12 @@ muzzle { } dependencies { - implementation(project(":instrumentation:couchbase:couchbase-2-common:javaagent")) + implementation(project(":instrumentation:couchbase:couchbase-2.0-common:javaagent")) implementation(project(":instrumentation:rxjava:rxjava-1.0:library")) library("com.couchbase.client:java-client:2.0.0") - testImplementation(project(":instrumentation:couchbase:couchbase-common:testing")) + testImplementation(project(":instrumentation:couchbase:couchbase-2.0-common:testing")) // later versions are tested with couchbase-2.6 instrumentation latestDepTestLibrary("org.springframework.data:spring-data-couchbase:2.+") diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts index 6de9e2639be8..5fa21a80ccd2 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts @@ -19,12 +19,12 @@ muzzle { } dependencies { - implementation(project(":instrumentation:couchbase:couchbase-2-common:javaagent")) + implementation(project(":instrumentation:couchbase:couchbase-2.0-common:javaagent")) library("com.couchbase.client:java-client:2.6.0") testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent")) - testImplementation(project(":instrumentation:couchbase:couchbase-common:testing")) + testImplementation(project(":instrumentation:couchbase:couchbase-2.0-common:testing")) testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE") testLibrary("com.couchbase.client:encryption:1.0.0") diff --git a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0-common/library/build.gradle.kts similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts rename to instrumentation/rxjava/rxjava-3.0-common/library/build.gradle.kts diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java diff --git a/instrumentation/rxjava/rxjava-3-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/build.gradle.kts rename to instrumentation/rxjava/rxjava-3.0-common/testing/build.gradle.kts diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java diff --git a/instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java similarity index 100% rename from instrumentation/rxjava/rxjava-3-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts index fbdc5a2fd9b9..e4af511a58b0 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { implementation(project(":instrumentation:rxjava:rxjava-3.0:library")) testImplementation("io.opentelemetry:opentelemetry-extension-annotations") - testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing")) + testImplementation(project(":instrumentation:rxjava:rxjava-3.0-common:testing")) testInstrumentation(project(":instrumentation:opentelemetry-extension-annotations-1.0:javaagent")) testInstrumentation(project(":instrumentation:rxjava:rxjava-3.1.1:javaagent")) diff --git a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts index 396086688085..701c8d721105 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts @@ -5,9 +5,9 @@ plugins { dependencies { library("io.reactivex.rxjava3:rxjava:3.0.12") implementation(project(":instrumentation-annotations-support")) - implementation(project(":instrumentation:rxjava:rxjava-3-common:library")) + implementation(project(":instrumentation:rxjava:rxjava-3.0-common:library")) - testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing")) + testImplementation(project(":instrumentation:rxjava:rxjava-3.0-common:testing")) latestDepTestLibrary("io.reactivex.rxjava3:rxjava:3.1.0") // see rxjava-3.1.1 module } diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts index c32b99fed23b..7c8505f370c8 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { implementation(project(":instrumentation:rxjava:rxjava-3.1.1:library")) - testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing")) + testImplementation(project(":instrumentation:rxjava:rxjava-3.0-common:testing")) testInstrumentation(project(":instrumentation:opentelemetry-extension-annotations-1.0:javaagent")) testInstrumentation(project(":instrumentation:rxjava:rxjava-3.0:javaagent")) diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts index 61931f68e631..9edb11f4a597 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts @@ -5,9 +5,9 @@ plugins { dependencies { library("io.reactivex.rxjava3:rxjava:3.1.1") implementation(project(":instrumentation-annotations-support")) - implementation(project(":instrumentation:rxjava:rxjava-3-common:library")) + implementation(project(":instrumentation:rxjava:rxjava-3.0-common:library")) - testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing")) + testImplementation(project(":instrumentation:rxjava:rxjava-3.0-common:testing")) } tasks.withType().configureEach { diff --git a/settings.gradle.kts b/settings.gradle.kts index 0e4cda313a8d..3921fdd17fe2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -183,20 +183,20 @@ include(":instrumentation:cassandra:cassandra-4.0:javaagent") include(":instrumentation:cassandra:cassandra-4.4:javaagent") include(":instrumentation:cassandra:cassandra-4.4:library") include(":instrumentation:cassandra:cassandra-4.4:testing") -include(":instrumentation:cassandra:cassandra-4-common:testing") +include(":instrumentation:cassandra:cassandra-4.0-common:testing") include(":instrumentation:cdi-testing") include(":instrumentation:clickhouse-client-0.5:javaagent") include(":instrumentation:couchbase:couchbase-2.0:javaagent") include(":instrumentation:couchbase:couchbase-2.6:javaagent") -include(":instrumentation:couchbase:couchbase-2-common:javaagent") -include(":instrumentation:couchbase:couchbase-2-common:javaagent-unit-tests") +include(":instrumentation:couchbase:couchbase-2.0-common:javaagent") +include(":instrumentation:couchbase:couchbase-2.0-common:javaagent-unit-tests") +include(":instrumentation:couchbase:couchbase-2.0-common:testing") include(":instrumentation:couchbase:couchbase-3.1:javaagent") include(":instrumentation:couchbase:couchbase-3.1:tracing-opentelemetry-shaded") include(":instrumentation:couchbase:couchbase-3.1.6:javaagent") include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded") include(":instrumentation:couchbase:couchbase-3.2:javaagent") include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded") -include(":instrumentation:couchbase:couchbase-common:testing") include(":instrumentation:dropwizard:dropwizard-metrics-4.0:javaagent") include(":instrumentation:dropwizard:dropwizard-testing") include(":instrumentation:dropwizard:dropwizard-views-0.7:javaagent") @@ -506,8 +506,8 @@ include(":instrumentation:rxjava:rxjava-3.0:javaagent") include(":instrumentation:rxjava:rxjava-3.0:library") include(":instrumentation:rxjava:rxjava-3.1.1:javaagent") include(":instrumentation:rxjava:rxjava-3.1.1:library") -include(":instrumentation:rxjava:rxjava-3-common:library") -include(":instrumentation:rxjava:rxjava-3-common:testing") +include(":instrumentation:rxjava:rxjava-3.0-common:library") +include(":instrumentation:rxjava:rxjava-3.0-common:testing") include(":instrumentation:scala-fork-join-2.8:javaagent") include(":instrumentation:servlet:servlet-2.2:javaagent") include(":instrumentation:servlet:servlet-3.0:javaagent") From 2a006771f6b8af68bf88e32c31eb3c590c04a314 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 22 Dec 2024 20:59:27 -0800 Subject: [PATCH 2/2] package names --- .../{v4 => v4_0}/common/AbstractCassandraTest.java | 2 +- .../instrumentation/cassandra/v4_0/CassandraTest.java | 2 +- .../testing/cassandra/v4_4/AbstractCassandra44Test.java | 2 +- .../common}/AbstractCouchbaseAsyncClientTest.java | 2 +- .../{ => v2_0/common}/AbstractCouchbaseClientTest.java | 2 +- .../{ => v2_0/common}/AbstractCouchbaseTest.java | 2 +- .../springdata/AbstractCouchbaseSpringRepositoryTest.java | 6 +++--- .../springdata/AbstractCouchbaseSpringTemplateTest.java | 4 ++-- .../{ => v2_0/common}/springdata/CouchbaseConfig.java | 7 ++++--- .../{ => v2_0/common}/springdata/TestDocument.java | 2 +- .../{ => v2_0/common}/springdata/TestRepository.java | 2 +- .../couchbase/v2_0/CouchbaseAsyncClientTest.java | 2 +- .../couchbase/v2_0/CouchbaseClientTest.java | 2 +- .../v2_0/springdata/CouchbaseSpringRepositoryTest.java | 6 +++--- .../v2_0/springdata/CouchbaseSpringTemplateTest.java | 2 +- .../couchbase/v2_6/CouchbaseAsyncClient26Test.java | 2 +- .../couchbase/v2_6/CouchbaseClient26Test.java | 2 +- .../v2_6/springdata/CouchbaseSpringRepository26Test.java | 6 +++--- .../v2_6/springdata/CouchbaseSpringTemplate26Test.java | 2 +- .../common/RxJava3AsyncOperationEndStrategy.java | 2 +- .../common/RxJava3AsyncOperationEndStrategyBuilder.java | 2 +- .../{v3 => v3_0}/common/TracingCompletableObserver.java | 2 +- .../rxjava/{v3 => v3_0}/common/TracingMaybeObserver.java | 2 +- .../rxjava/{v3 => v3_0}/common/TracingSingleObserver.java | 2 +- .../test/java/RxJava3AsyncOperationEndStrategyTest.java | 2 +- .../common/AbstractRxJava3SubscriptionTest.java | 2 +- .../rxjava/{v3 => v3_0}/common/AbstractRxJava3Test.java | 2 +- .../{v3 => v3_0}/common/AbstractRxJava3WithSpanTest.java | 2 +- .../{v3 => v3_0}/common/AbstractTracedWithSpan.java | 2 +- .../{v3 => v3_0}/common/RxJava3ConcurrencyTestHelper.java | 2 +- .../common/extensionannotation/TracedWithSpan.java | 4 ++-- .../common/instrumentationannotation/TracedWithSpan.java | 4 ++-- .../src/test/java/RxJava3ExtensionWithSpanTest.java | 6 +++--- .../src/test/java/RxJava3InstrumentationWithSpanTest.java | 6 +++--- .../javaagent/src/test/java/RxJava3SubscriptionTest.java | 2 +- .../rxjava-3.0/javaagent/src/test/java/RxJava3Test.java | 2 +- .../instrumentation/rxjava/v3_0/TracingAssembly.java | 8 ++++---- .../library/src/test/java/RxJava3SubscriptionTest.java | 2 +- .../rxjava-3.0/library/src/test/java/RxJava3Test.java | 2 +- .../src/test/java/RxJava3ExtensionWithSpanTest.java | 6 +++--- .../src/test/java/RxJava3InstrumentationWithSpanTest.java | 6 +++--- .../javaagent/src/test/java/RxJava3SubscriptionTest.java | 2 +- .../rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java | 2 +- .../instrumentation/rxjava/v3_1_1/TracingAssembly.java | 8 ++++---- .../library/src/test/java/RxJava3SubscriptionTest.java | 2 +- .../rxjava-3.1.1/library/src/test/java/RxJava3Test.java | 2 +- 46 files changed, 72 insertions(+), 71 deletions(-) rename instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/{v4 => v4_0}/common/AbstractCassandraTest.java (99%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/AbstractCouchbaseAsyncClientTest.java (99%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/AbstractCouchbaseClientTest.java (99%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/AbstractCouchbaseTest.java (98%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/springdata/AbstractCouchbaseSpringRepositoryTest.java (96%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/springdata/AbstractCouchbaseSpringTemplateTest.java (97%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/springdata/CouchbaseConfig.java (85%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/springdata/TestDocument.java (92%) rename instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/{ => v2_0/common}/springdata/TestRepository.java (76%) rename instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/RxJava3AsyncOperationEndStrategy.java (99%) rename instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/RxJava3AsyncOperationEndStrategyBuilder.java (92%) rename instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/TracingCompletableObserver.java (96%) rename instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/TracingMaybeObserver.java (97%) rename instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/TracingSingleObserver.java (96%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/AbstractRxJava3SubscriptionTest.java (96%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/AbstractRxJava3Test.java (99%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/AbstractRxJava3WithSpanTest.java (99%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/AbstractTracedWithSpan.java (93%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/RxJava3ConcurrencyTestHelper.java (98%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/extensionannotation/TracedWithSpan.java (90%) rename instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/{v3 => v3_0}/common/instrumentationannotation/TracedWithSpan.java (88%) diff --git a/instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java b/instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4_0/common/AbstractCassandraTest.java similarity index 99% rename from instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java rename to instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4_0/common/AbstractCassandraTest.java index b49fb7da01ab..ca0660aaaa86 100644 --- a/instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4/common/AbstractCassandraTest.java +++ b/instrumentation/cassandra/cassandra-4.0-common/testing/src/main/java/io/opentelemetry/cassandra/v4_0/common/AbstractCassandraTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.cassandra.v4.common; +package io.opentelemetry.cassandra.v4_0.common; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java b/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java index 1df7618a85c9..c634723b0407 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0; -import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest; +import io.opentelemetry.cassandra.v4_0.common.AbstractCassandraTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java index a5319f49df4e..c34fc61879a3 100644 --- a/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java +++ b/instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java @@ -29,7 +29,7 @@ import com.datastax.oss.driver.api.core.CqlSession; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest; +import io.opentelemetry.cassandra.v4_0.common.AbstractCassandraTest; import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseAsyncClientTest.java similarity index 99% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseAsyncClientTest.java index 707c78dca833..2ec23c60c3e3 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseAsyncClientTest.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseAsyncClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase; +package io.opentelemetry.instrumentation.couchbase.v2_0.common; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseClientTest.java similarity index 99% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseClientTest.java index 2c1db076ce39..59a91ede2c5e 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseClientTest.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseClientTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase; +package io.opentelemetry.instrumentation.couchbase.v2_0.common; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseTest.java similarity index 98% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseTest.java index 719f8d037d91..59a398a62f00 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/AbstractCouchbaseTest.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/AbstractCouchbaseTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase; +package io.opentelemetry.instrumentation.couchbase.v2_0.common; import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringRepositoryTest.java similarity index 96% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringRepositoryTest.java index 57988264a5da..dac7ded5a786 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringRepositoryTest.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringRepositoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase.springdata; +package io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata; import static org.assertj.core.api.Assertions.assertThat; @@ -13,7 +13,7 @@ import com.couchbase.client.java.view.DefaultView; import com.couchbase.client.java.view.DesignDocument; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseTest; import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; @@ -52,7 +52,7 @@ void setUp() { DefaultView.create( "all", "function (doc, meta) {" - + " if (doc._class == \"io.opentelemetry.instrumentation.couchbase.springdata.TestDocument\") {" + + " if (doc._class == \"io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.TestDocument\") {" + " emit(meta.id, null);" + " }" + "}")))); diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringTemplateTest.java similarity index 97% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringTemplateTest.java index c0c4c2eaa75e..663635ab282e 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/AbstractCouchbaseSpringTemplateTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase.springdata; +package io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Named.named; @@ -14,7 +14,7 @@ import com.couchbase.client.java.cluster.ClusterManager; import com.couchbase.client.java.env.CouchbaseEnvironment; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import java.util.ArrayList; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/CouchbaseConfig.java similarity index 85% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/CouchbaseConfig.java index e324fc183810..6a80d9e5f231 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/CouchbaseConfig.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/CouchbaseConfig.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase.springdata; +package io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata; import static java.util.Objects.requireNonNull; @@ -17,8 +17,9 @@ import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories; @Configuration -@EnableCouchbaseRepositories(basePackages = "io.opentelemetry.instrumentation.couchbase.springdata") -@ComponentScan(basePackages = "io.opentelemetry.instrumentation.couchbase.springdata") +@EnableCouchbaseRepositories( + basePackages = "io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata") +@ComponentScan(basePackages = "io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata") class CouchbaseConfig extends AbstractCouchbaseConfiguration { // These need to be set before this class can be used by Spring diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestDocument.java similarity index 92% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestDocument.java index af594c13a620..007debd7ec81 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestDocument.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestDocument.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase.springdata; +package io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata; import java.util.Objects; import org.springframework.data.annotation.Id; diff --git a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestRepository.java similarity index 76% rename from instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java rename to instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestRepository.java index 467deb16bfc6..8607f20224eb 100644 --- a/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/TestRepository.java +++ b/instrumentation/couchbase/couchbase-2.0-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/v2_0/common/springdata/TestRepository.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.couchbase.springdata; +package io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata; import org.springframework.data.couchbase.repository.CouchbaseRepository; diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java index a28658223a61..bd8d5f288d47 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseAsyncClientTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseAsyncClientTest; class CouchbaseAsyncClientTest extends AbstractCouchbaseAsyncClientTest { diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java index 0890358a8ead..461270cfcf19 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseClientTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseClientTest; class CouchbaseClientTest extends AbstractCouchbaseClientTest { diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java index db5ba3d31379..ac677622db0d 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java @@ -7,9 +7,9 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringRepositoryTest; -import io.opentelemetry.instrumentation.couchbase.springdata.TestDocument; -import io.opentelemetry.instrumentation.couchbase.springdata.TestRepository; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.AbstractCouchbaseSpringRepositoryTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.TestDocument; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.TestRepository; import io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.CouchbaseUtil; class CouchbaseSpringRepositoryTest extends AbstractCouchbaseSpringRepositoryTest { diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java index 3f4c193bd782..a7e6672e07af 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringTemplateTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.AbstractCouchbaseSpringTemplateTest; import io.opentelemetry.javaagent.instrumentation.couchbase.v2_0.CouchbaseUtil; class CouchbaseSpringTemplateTest extends AbstractCouchbaseSpringTemplateTest { diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java index 8257d7014ec4..8df1acad2b39 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseAsyncClientTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseAsyncClientTest; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.util.List; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java index 65ace4b6f395..28bbbc2a9413 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.AbstractCouchbaseClientTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.AbstractCouchbaseClientTest; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.util.List; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java index 8f1765ad6852..1e6c64ab8839 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java @@ -7,9 +7,9 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringRepositoryTest; -import io.opentelemetry.instrumentation.couchbase.springdata.TestDocument; -import io.opentelemetry.instrumentation.couchbase.springdata.TestRepository; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.AbstractCouchbaseSpringRepositoryTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.TestDocument; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.TestRepository; import io.opentelemetry.javaagent.instrumentation.couchbase.v2_6.Couchbase26Util; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.util.List; diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java index cb7e4a1d978b..28cf13fcd956 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java @@ -7,7 +7,7 @@ import com.couchbase.client.java.cluster.BucketSettings; import com.couchbase.client.java.env.DefaultCouchbaseEnvironment; -import io.opentelemetry.instrumentation.couchbase.springdata.AbstractCouchbaseSpringTemplateTest; +import io.opentelemetry.instrumentation.couchbase.v2_0.common.springdata.AbstractCouchbaseSpringTemplateTest; import io.opentelemetry.javaagent.instrumentation.couchbase.v2_6.Couchbase26Util; import io.opentelemetry.sdk.testing.assertj.AttributeAssertion; import java.util.List; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategy.java similarity index 99% rename from instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategy.java index 2814a15f42dc..c3c046ef6fa3 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategy.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategy.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import static io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport.tryToGetResponse; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategyBuilder.java similarity index 92% rename from instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategyBuilder.java index 60c9e994141f..05c159840003 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3AsyncOperationEndStrategyBuilder.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3AsyncOperationEndStrategyBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import com.google.errorprone.annotations.CanIgnoreReturnValue; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingCompletableObserver.java similarity index 96% rename from instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingCompletableObserver.java index 9f2338381c59..f383940b710f 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingCompletableObserver.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingCompletableObserver.java @@ -20,7 +20,7 @@ * under the License. */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingMaybeObserver.java similarity index 97% rename from instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingMaybeObserver.java index 97e0adb11081..4a848d25ae96 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingMaybeObserver.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingMaybeObserver.java @@ -20,7 +20,7 @@ * under the License. */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingSingleObserver.java similarity index 96% rename from instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java rename to instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingSingleObserver.java index a16bb4f6fba9..1e9f29e7b4fe 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/TracingSingleObserver.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/TracingSingleObserver.java @@ -20,7 +20,7 @@ * under the License. */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java b/instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java index f3fbd8144e23..907e6933b2a2 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java +++ b/instrumentation/rxjava/rxjava-3.0-common/library/src/test/java/RxJava3AsyncOperationEndStrategyTest.java @@ -15,7 +15,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndStrategy; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.instrumentation.rxjava.v3.common.RxJava3AsyncOperationEndStrategy; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.RxJava3AsyncOperationEndStrategy; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Maybe; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3SubscriptionTest.java similarity index 96% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3SubscriptionTest.java index c1962937a9b2..5b9b50b8a3e1 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3SubscriptionTest.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3SubscriptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.trace.Span; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3Test.java similarity index 99% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3Test.java index aea341536897..b5f983f84c7a 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3Test.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3Test.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.attributeEntry; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3WithSpanTest.java similarity index 99% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3WithSpanTest.java index 1f06824c8fea..933d21a3c505 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractRxJava3WithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractRxJava3WithSpanTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractTracedWithSpan.java similarity index 93% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractTracedWithSpan.java index 7f45316a32fd..dec0b3dc1008 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/AbstractTracedWithSpan.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/AbstractTracedWithSpan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3ConcurrencyTestHelper.java similarity index 98% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3ConcurrencyTestHelper.java index 9d1ddb055d9c..15b66db2792d 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/RxJava3ConcurrencyTestHelper.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/RxJava3ConcurrencyTestHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common; +package io.opentelemetry.instrumentation.rxjava.v3_0.common; import io.opentelemetry.api.trace.Span; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/extensionannotation/TracedWithSpan.java similarity index 90% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/extensionannotation/TracedWithSpan.java index 94c679776345..006654daa9d4 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/extensionannotation/TracedWithSpan.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/extensionannotation/TracedWithSpan.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation; +package io.opentelemetry.instrumentation.rxjava.v3_0.common.extensionannotation; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Maybe; diff --git a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/instrumentationannotation/TracedWithSpan.java similarity index 88% rename from instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java rename to instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/instrumentationannotation/TracedWithSpan.java index d8f31c2874da..9ca38b0691aa 100644 --- a/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3/common/instrumentationannotation/TracedWithSpan.java +++ b/instrumentation/rxjava/rxjava-3.0-common/testing/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/common/instrumentationannotation/TracedWithSpan.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.rxjava.v3.common.instrumentationannotation; +package io.opentelemetry.instrumentation.rxjava.v3_0.common.instrumentationannotation; import io.opentelemetry.instrumentation.annotations.WithSpan; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Maybe; diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java index 47deb1fd7cef..2b57e3a40c65 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; -import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3WithSpanTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.extensionannotation.TracedWithSpan; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java index 3e55565a3632..d46d4642c97e 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; -import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3WithSpanTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.extensionannotation.TracedWithSpan; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3SubscriptionTest.java index 95ce51a2b612..b2a89cd13010 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3SubscriptionTest.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3SubscriptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3SubscriptionTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java index 9eb2fdfadb51..7540b1da94a0 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/src/test/java/RxJava3Test.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3Test; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssembly.java b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssembly.java index 191a2ebf9b1f..67a0743dc534 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssembly.java +++ b/instrumentation/rxjava/rxjava-3.0/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_0/TracingAssembly.java @@ -26,10 +26,10 @@ 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.opentelemetry.instrumentation.rxjava.v3_0.common.RxJava3AsyncOperationEndStrategy; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingCompletableObserver; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingMaybeObserver; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingSingleObserver; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.CompletableObserver; import io.reactivex.rxjava3.core.Flowable; diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java index 282a731c61a3..b0b013b0283b 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java +++ b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3SubscriptionTest.java @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest; import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3SubscriptionTest; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java index 540a8b8ca537..73533c9776f8 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java +++ b/instrumentation/rxjava/rxjava-3.0/library/src/test/java/RxJava3Test.java @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test; import io.opentelemetry.instrumentation.rxjava.v3_0.TracingAssembly; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3Test; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; import org.junit.jupiter.api.BeforeAll; diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java index 47deb1fd7cef..2b57e3a40c65 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3ExtensionWithSpanTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; -import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3WithSpanTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.extensionannotation.TracedWithSpan; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java index 3e55565a3632..d46d4642c97e 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3InstrumentationWithSpanTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3WithSpanTest; -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractTracedWithSpan; -import io.opentelemetry.instrumentation.rxjava.v3.common.extensionannotation.TracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3WithSpanTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractTracedWithSpan; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.extensionannotation.TracedWithSpan; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3SubscriptionTest.java index 95ce51a2b612..b2a89cd13010 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3SubscriptionTest.java +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3SubscriptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3SubscriptionTest; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java index 9eb2fdfadb51..7540b1da94a0 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java +++ b/instrumentation/rxjava/rxjava-3.1.1/javaagent/src/test/java/RxJava3Test.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3Test; import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssembly.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssembly.java index 10726a499728..7b4d0650e845 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssembly.java +++ b/instrumentation/rxjava/rxjava-3.1.1/library/src/main/java/io/opentelemetry/instrumentation/rxjava/v3_1_1/TracingAssembly.java @@ -26,10 +26,10 @@ 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.opentelemetry.instrumentation.rxjava.v3_0.common.RxJava3AsyncOperationEndStrategy; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingCompletableObserver; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingMaybeObserver; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.TracingSingleObserver; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.CompletableObserver; import io.reactivex.rxjava3.core.Flowable; diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java index 02c219ae1e66..1ca218aeab97 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java +++ b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3SubscriptionTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3SubscriptionTest; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3SubscriptionTest; import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension; diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java index 2f0d54a1b7da..a2ef2d9d1320 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java +++ b/instrumentation/rxjava/rxjava-3.1.1/library/src/test/java/RxJava3Test.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import io.opentelemetry.instrumentation.rxjava.v3.common.AbstractRxJava3Test; +import io.opentelemetry.instrumentation.rxjava.v3_0.common.AbstractRxJava3Test; import io.opentelemetry.instrumentation.rxjava.v3_1_1.TracingAssembly; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;