Skip to content

Add base version to common modules #12956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add base version to common modules #12956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ab664
Rename some common modules
trask Dec 23, 2024
2a00677
package names
trask Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ssandra-4-common/testing/build.gradle.kts → ...andra-4.0-common/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ndra/v4/common/AbstractCassandraTest.java → ...ra/v4_0/common/AbstractCassandraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/cassandra/cassandra-4.4/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion ...esting/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mon/javaagent-unit-tests/build.gradle.kts → ...mon/javaagent-unit-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
0 ...ase/v2_0/CouchbaseQuerySanitizerTest.java → ...ase/v2_0/CouchbaseQuerySanitizerTest.java
View file
Open in desktop
File renamed without changes.
0 ...hbase-2-common/javaagent/build.gradle.kts → ...ase-2.0-common/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...uchbase/v2_0/CouchbaseQuerySanitizer.java → ...uchbase/v2_0/CouchbaseQuerySanitizer.java
View file
Open in desktop
File renamed without changes.
0 .../couchbase/v2_0/CouchbaseRequestInfo.java → .../couchbase/v2_0/CouchbaseRequestInfo.java
View file
Open in desktop
File renamed without changes.
0 ...couchbase-common/testing/build.gradle.kts → ...hbase-2.0-common/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ase/AbstractCouchbaseAsyncClientTest.java → ...mon/AbstractCouchbaseAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ouchbase/AbstractCouchbaseClientTest.java → ...0/common/AbstractCouchbaseClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tion/couchbase/AbstractCouchbaseTest.java → ...se/v2_0/common/AbstractCouchbaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...bstractCouchbaseSpringRepositoryTest.java → ...bstractCouchbaseSpringRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down Expand Up @@ -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);"
+ " }"
+ "}"))));
Expand Down
4 changes: 2 additions & 2 deletions .../AbstractCouchbaseSpringTemplateTest.java → .../AbstractCouchbaseSpringTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions ...couchbase/springdata/CouchbaseConfig.java → ..._0/common/springdata/CouchbaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...on/couchbase/springdata/TestDocument.java → .../v2_0/common/springdata/TestDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../couchbase/springdata/TestRepository.java → ...2_0/common/springdata/TestRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.+")
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...t/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions ...ry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...etry/javaagent/instrumentation/couchbase/v2_0/springdata/CouchbaseSpringTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ...io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseAsyncClient26Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_6/CouchbaseClient26Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions .../javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringRepository26Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ry/javaagent/instrumentation/couchbase/v2_6/springdata/CouchbaseSpringTemplate26Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 .../rxjava-3-common/library/build.gradle.kts → ...xjava-3.0-common/library/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mon/RxJava3AsyncOperationEndStrategy.java → ...mon/RxJava3AsyncOperationEndStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ava3AsyncOperationEndStrategyBuilder.java → ...ava3AsyncOperationEndStrategyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...v3/common/TracingCompletableObserver.java → ..._0/common/TracingCompletableObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...xjava/v3/common/TracingMaybeObserver.java → ...ava/v3_0/common/TracingMaybeObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...java/v3/common/TracingSingleObserver.java → ...va/v3_0/common/TracingSingleObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...RxJava3AsyncOperationEndStrategyTest.java → ...RxJava3AsyncOperationEndStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 .../rxjava-3-common/testing/build.gradle.kts → ...xjava-3.0-common/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mmon/AbstractRxJava3SubscriptionTest.java → ...mmon/AbstractRxJava3SubscriptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rxjava/v3/common/AbstractRxJava3Test.java → ...java/v3_0/common/AbstractRxJava3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...3/common/AbstractRxJava3WithSpanTest.java → ...0/common/AbstractRxJava3WithSpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/v3/common/AbstractTracedWithSpan.java → ...a/v3_0/common/AbstractTracedWithSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../common/RxJava3ConcurrencyTestHelper.java → .../common/RxJava3ConcurrencyTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n/extensionannotation/TracedWithSpan.java → ...n/extensionannotation/TracedWithSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...rumentationannotation/TracedWithSpan.java → ...rumentationannotation/TracedWithSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading