Skip to content

Rename OpenSearch REST common module #18787

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

Merged
trask merged 1 commit into from
May 19, 2026
Merged

Rename OpenSearch REST common module #18787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions ...pentelemetry/javaagent/instrumentation/opensearch/rest/v1_0/OpenSearchRestSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...entelemetry/javaagent/instrumentation/opensearch/rest/v1_0/RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...pentelemetry/javaagent/instrumentation/opensearch/rest/v3_0/OpenSearchRestSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...entelemetry/javaagent/instrumentation/opensearch/rest/v3_0/RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...ch-rest-common/javaagent/build.gradle.kts → ...est-common-1.0/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ommon/OpenSearchRestAttributesGetter.java → .../v1_0/OpenSearchRestAttributesGetter.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.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;
Expand Down
2 changes: 1 addition & 1 deletion ...on/OpenSearchRestInstrumenterFactory.java → ..._0/OpenSearchRestInstrumenterFactory.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.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;
Expand Down
2 changes: 1 addition & 1 deletion ...ch/rest/common/OpenSearchRestRequest.java → ...st/common/v1_0/OpenSearchRestRequest.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.javaagent.instrumentation.opensearch.rest.common;
package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0;

import com.google.auto.value.AutoValue;

Expand Down
2 changes: 1 addition & 1 deletion ...h/rest/common/OpenSearchRestResponse.java → ...t/common/v1_0/OpenSearchRestResponse.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.javaagent.instrumentation.opensearch.rest.common;
package io.opentelemetry.javaagent.instrumentation.opensearch.rest.common.v1_0;

import java.net.InetAddress;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...rch/rest/common/RestResponseListener.java → ...est/common/v1_0/RestResponseListener.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.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;
Expand Down
0 ...arch-rest-common/testing/build.gradle.kts → ...-rest-common-1.0/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...st/common/AbstractOpenSearchRestTest.java → ...st/common/AbstractOpenSearchRestTest.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading