remove java keyword in opensearch instrumentation

Author: mznet

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaRequest.java

@@ -3,50 +3,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import javax.annotation.Nullable;
 
-final class OpenSearchJavaAttributesGetter
-    implements DbClientAttributesGetter<OpenSearchJavaRequest, Void> {
+final class OpenSearchAttributesGetter
+    implements DbClientAttributesGetter<OpenSearchRequest, Void> {
 
   @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
-  public String getDbSystem(OpenSearchJavaRequest request) {
+  public String getDbSystem(OpenSearchRequest request) {
     return DbIncubatingAttributes.DbSystemIncubatingValues.OPENSEARCH;
   }
 
-  @Deprecated
   @Override
   @Nullable
-  public String getUser(OpenSearchJavaRequest request) {
+  public String getDbNamespace(OpenSearchRequest request) {
     return null;
   }
 
   @Override
   @Nullable
-  public String getDbNamespace(OpenSearchJavaRequest request) {
-    return null;
-  }
-
-  @Deprecated
-  @Override
-  @Nullable
-  public String getConnectionString(OpenSearchJavaRequest request) {
-    return null;
-  }
-
-  @Override
-  @Nullable
-  public String getDbQueryText(OpenSearchJavaRequest request) {
+  public String getDbQueryText(OpenSearchRequest request) {
     return request.getMethod() + " " + request.getOperation();
   }
 
   @Override
   @Nullable
-  public String getDbOperationName(OpenSearchJavaRequest request) {
+  public String getDbOperationName(OpenSearchRequest request) {
     return request.getMethod();
   }
 

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import static java.util.Collections.singletonList;
 
@@ -13,8 +13,8 @@
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class OpenSearchJavaInstrumentationModule extends InstrumentationModule {
-  public OpenSearchJavaInstrumentationModule() {
+public class OpenSearchInstrumentationModule extends InstrumentationModule {
+  public OpenSearchInstrumentationModule() {
     super("opensearch-java", "opensearch-java-3.0", "opensearch");
   }
 

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaAttributesGetter.java renamed to instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
@@ -12,12 +12,12 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 
-public final class OpenSearchJavaInstrumenterFactory {
+public final class OpenSearchInstrumenterFactory {
 
-  public static Instrumenter<OpenSearchJavaRequest, Void> create(String instrumentationName) {
-    OpenSearchJavaAttributesGetter dbClientAttributesGetter = new OpenSearchJavaAttributesGetter();
+  public static Instrumenter<OpenSearchRequest, Void> create(String instrumentationName) {
+    OpenSearchAttributesGetter dbClientAttributesGetter = new OpenSearchAttributesGetter();
 
-    return Instrumenter.<OpenSearchJavaRequest, Void>builder(
+    return Instrumenter.<OpenSearchRequest, Void>builder(
             GlobalOpenTelemetry.get(),
             instrumentationName,
             DbClientSpanNameExtractor.create(dbClientAttributesGetter))
@@ -26,5 +26,5 @@ public static Instrumenter<OpenSearchJavaRequest, Void> create(String instrument
         .buildInstrumenter(SpanKindExtractor.alwaysClient());
   }
 
-  private OpenSearchJavaInstrumenterFactory() {}
+  private OpenSearchInstrumenterFactory() {}
 }

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaInstrumentationModule.java renamed to instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumentationModule.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
+
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class OpenSearchRequest {
+
+  public static OpenSearchRequest create(String method, String endpoint) {
+    return new AutoValue_OpenSearchRequest(method, endpoint);
+  }
+
+  public abstract String getMethod();
+
+  public abstract String getOperation();
+}

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaInstrumenterFactory.java renamed to instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchInstrumenterFactory.java

@@ -3,23 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import io.opentelemetry.context.Context;
 import java.util.function.BiConsumer;
 
-public final class OpenSearchJavaResponseHandler implements BiConsumer<Object, Throwable> {
+public final class OpenSearchResponseHandler implements BiConsumer<Object, Throwable> {
   private final Context context;
-  private final OpenSearchJavaRequest otelRequest;
+  private final OpenSearchRequest otelRequest;
 
-  public OpenSearchJavaResponseHandler(Context context, OpenSearchJavaRequest otelRequest) {
+  public OpenSearchResponseHandler(Context context, OpenSearchRequest otelRequest) {
     this.context = context;
     this.otelRequest = otelRequest;
   }
 
   @Override
   public void accept(Object response, Throwable error) {
     // OpenSearch responses don't provide response information, so the span is closed with null.
-    OpenSearchJavaSingletons.instrumenter().end(context, otelRequest, null, error);
+    OpenSearchSingletons.instrumenter().end(context, otelRequest, null, error);
   }
 }

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchRequest.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
+
+import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+
+public final class OpenSearchSingletons {
+  private static final Instrumenter<OpenSearchRequest, Void> INSTRUMENTER =
+      OpenSearchInstrumenterFactory.create("io.opentelemetry.opensearch-java-3.0");
+
+  public static Instrumenter<OpenSearchRequest, Void> instrumenter() {
+    return INSTRUMENTER;
+  }
+
+  private OpenSearchSingletons() {}
+}

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/java/v3_0/OpenSearchJavaResponseHandler.java renamed to instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchResponseHandler.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0.OpenSearchJavaSingletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.opensearch.v3_0.OpenSearchSingletons.instrumenter;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -55,13 +55,13 @@ public static class PerformRequestAdvice {
     public static void onEnter(
         @Advice.Argument(0) Object request,
         @Advice.Argument(1) Endpoint<Object, Object, Object> endpoint,
-        @Advice.Local("otelRequest") OpenSearchJavaRequest otelRequest,
+        @Advice.Local("otelRequest") OpenSearchRequest otelRequest,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
       Context parentContext = currentContext();
       otelRequest =
-          OpenSearchJavaRequest.create(endpoint.method(request), endpoint.requestUrl(request));
+          OpenSearchRequest.create(endpoint.method(request), endpoint.requestUrl(request));
       if (!instrumenter().shouldStart(parentContext, otelRequest)) {
         return;
       }
@@ -73,7 +73,7 @@ public static void onEnter(
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Thrown Throwable throwable,
-        @Advice.Local("otelRequest") OpenSearchJavaRequest otelRequest,
+        @Advice.Local("otelRequest") OpenSearchRequest otelRequest,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
@@ -93,13 +93,13 @@ public static class PerformRequestAsyncAdvice {
     public static void onEnter(
         @Advice.Argument(0) Object request,
         @Advice.Argument(value = 1, readOnly = false) Endpoint<Object, Object, Object> endpoint,
-        @Advice.Local("otelRequest") OpenSearchJavaRequest otelRequest,
+        @Advice.Local("otelRequest") OpenSearchRequest otelRequest,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
       Context parentContext = currentContext();
       otelRequest =
-          OpenSearchJavaRequest.create(endpoint.method(request), endpoint.requestUrl(request));
+          OpenSearchRequest.create(endpoint.method(request), endpoint.requestUrl(request));
       if (!instrumenter().shouldStart(parentContext, otelRequest)) {
         return;
       }
@@ -112,7 +112,7 @@ public static void onEnter(
     public static void stopSpan(
         @Advice.Thrown Throwable throwable,
         @Advice.Return(readOnly = false) CompletableFuture<Object> future,
-        @Advice.Local("otelRequest") OpenSearchJavaRequest otelRequest,
+        @Advice.Local("otelRequest") OpenSearchRequest otelRequest,
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
@@ -125,7 +125,7 @@ public static void stopSpan(
         instrumenter().end(context, otelRequest, null, throwable);
       }
 
-      future.whenComplete(new OpenSearchJavaResponseHandler(context, otelRequest));
+      future.whenComplete(new OpenSearchResponseHandler(context, otelRequest));
     }
   }
 }

instrumentation/opensearch/opensearch-java-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/OpenSearchSingletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.opensearch.java.v3_0;
+package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;