diff --git a/.fossa.yml b/.fossa.yml index c81719c2e8c3..8adc5e42eb9d 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -798,7 +798,7 @@ targets: target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent' - type: gradle path: ./ - target: ':instrumentation:opensearch:opensearch-rest-common:javaagent' + target: ':instrumentation:opensearch:opensearch-rest-common-1.0:javaagent' - type: gradle path: ./ target: ':instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent' diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts index bac585c26f0c..0f275c8af47b 100644 --- a/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts @@ -21,7 +21,7 @@ dependencies { compileOnly("com.fasterxml.jackson.core:jackson-core") testImplementation("org.opensearch.client:opensearch-rest-client:3.0.0") - testImplementation(project(":instrumentation:opensearch:opensearch-rest-common:testing")) + testImplementation(project(":instrumentation:opensearch:opensearch-rest-common-1.0:testing")) testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent")) // AwsSdk2Transport supports awssdk version 2.26.0 diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts index 6bac710bfcef..4b143f92f285 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ otelJava { dependencies { library("org.opensearch.client:opensearch-rest-client:1.0.0") - implementation(project(":instrumentation:opensearch:opensearch-rest-common:javaagent")) + implementation(project(":instrumentation:opensearch:opensearch-rest-common-1.0:javaagent")) testInstrumentation(project(":instrumentation:opensearch:opensearch-rest-3.0:javaagent")) testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent")) @@ -34,7 +34,7 @@ dependencies { testImplementation("org.apache.logging.log4j:log4j-api:2.18.0") testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("commons-io:commons-io:2.11.0") - testImplementation(project(":instrumentation:opensearch:opensearch-rest-common:testing")) + testImplementation(project(":instrumentation:opensearch:opensearch-rest-common-1.0:testing")) latestDepTestLibrary("org.opensearch.client:opensearch-rest-client:2.+") // see opensearch-rest-3.0 module } diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestSingletons.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestSingletons.java index efaf572c60fb..39437c92e253 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestSingletons.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestSingletons.java @@ -6,9 +6,9 @@ package io.opentelemetry.javaagent.instrumentation.opensearch.rest.v1_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestRequest; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestResponse; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestRequest; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestResponse; import java.net.InetAddress; import javax.annotation.Nullable; import org.opensearch.client.Response; diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java index b2e54837f439..1fc8ab693a4d 100644 --- a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java +++ b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java @@ -15,8 +15,8 @@ import io.opentelemetry.context.Scope; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestRequest; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.RestResponseListener; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestRequest; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.RestResponseListener; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice.AssignReturned; diff --git a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts index 696fc1714563..d424507b1e6e 100644 --- a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts +++ b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts @@ -24,12 +24,12 @@ otelJava { dependencies { library("org.opensearch.client:opensearch-rest-client:3.0.0") - implementation(project(":instrumentation:opensearch:opensearch-rest-common:javaagent")) + implementation(project(":instrumentation:opensearch:opensearch-rest-common-1.0:javaagent")) testInstrumentation(project(":instrumentation:opensearch:opensearch-rest-1.0:javaagent")) testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent")) - testImplementation(project(":instrumentation:opensearch:opensearch-rest-common:testing")) + testImplementation(project(":instrumentation:opensearch:opensearch-rest-common-1.0:testing")) } tasks { diff --git a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestSingletons.java b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestSingletons.java index 993358d4fabe..09423658b4b7 100644 --- a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestSingletons.java +++ b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestSingletons.java @@ -6,9 +6,9 @@ package io.opentelemetry.javaagent.instrumentation.opensearch.rest.v3_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestRequest; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestResponse; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestRequest; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestResponse; import java.net.InetAddress; import javax.annotation.Nullable; import org.opensearch.client.Response; diff --git a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/RestClientInstrumentation.java b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/RestClientInstrumentation.java index e8b08c9356e7..cb2530e8db24 100644 --- a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/RestClientInstrumentation.java +++ b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/RestClientInstrumentation.java @@ -15,8 +15,8 @@ import io.opentelemetry.context.Scope; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.OpenSearchRestRequest; -import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.RestResponseListener; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.OpenSearchRestRequest; +import io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0.RestResponseListener; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.asm.Advice.AssignReturned; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/build.gradle.kts rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/build.gradle.kts diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestAttributesGetter.java b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestAttributesGetter.java similarity index 99% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestAttributesGetter.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestAttributesGetter.java index 7b4c6d2d9bf1..7379186746d9 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestAttributesGetter.java +++ b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common; +package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter; import io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestInstrumenterFactory.java b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestInstrumenterFactory.java similarity index 98% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestInstrumenterFactory.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestInstrumenterFactory.java index d409543e6bee..6ec6988ce061 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestInstrumenterFactory.java +++ b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common; +package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestRequest.java b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestRequest.java similarity index 96% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestRequest.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestRequest.java index 9af7e3a11814..6cb65e7d8f93 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestRequest.java +++ b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common; +package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0; import com.google.auto.value.AutoValue; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestResponse.java b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestResponse.java similarity index 95% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestResponse.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestResponse.java index 08ee3aed1f02..9cccb27af3d8 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/OpenSearchRestResponse.java +++ b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/OpenSearchRestResponse.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common; +package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0; import java.net.InetAddress; import javax.annotation.Nullable; diff --git a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/RestResponseListener.java b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/RestResponseListener.java similarity index 99% rename from instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/RestResponseListener.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/RestResponseListener.java index 3925e6172c86..bda55c249e36 100644 --- a/instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/RestResponseListener.java +++ b/instrumentation/opensearch/opensearch-rest-common-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/v1_0/RestResponseListener.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common; +package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-common-1.0/testing/build.gradle.kts similarity index 100% rename from instrumentation/opensearch/opensearch-rest-common/testing/build.gradle.kts rename to instrumentation/opensearch/opensearch-rest-common-1.0/testing/build.gradle.kts diff --git a/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/AbstractOpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-common-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/AbstractOpenSearchRestTest.java similarity index 100% rename from instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/AbstractOpenSearchRestTest.java rename to instrumentation/opensearch/opensearch-rest-common-1.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/common/AbstractOpenSearchRestTest.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 0be5f7a233a4..240f3d99fc9f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -508,8 +508,8 @@ include(":instrumentation:opencensus-shim:testing") include(":instrumentation:opensearch:opensearch-java-3.0:javaagent") include(":instrumentation:opensearch:opensearch-rest-1.0:javaagent") include(":instrumentation:opensearch:opensearch-rest-3.0:javaagent") -include(":instrumentation:opensearch:opensearch-rest-common:javaagent") -include(":instrumentation:opensearch:opensearch-rest-common:testing") +include(":instrumentation:opensearch:opensearch-rest-common-1.0:javaagent") +include(":instrumentation:opensearch:opensearch-rest-common-1.0:testing") include(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent") include(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:testing") include(":instrumentation:opentelemetry-api:opentelemetry-api-1.4:javaagent")