remove OpenSearchInstrumenterFactory.java

Author: mznet

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

@@ -12,10 +12,9 @@
 final class OpenSearchAttributesGetter
     implements DbClientAttributesGetter<OpenSearchRequest, Void> {
 
-  @SuppressWarnings("deprecation") // using deprecated DbSystemIncubatingValues
   @Override
   public String getDbSystem(OpenSearchRequest request) {
-    return DbIncubatingAttributes.DbSystemIncubatingValues.OPENSEARCH;
+    return DbIncubatingAttributes.DbSystemNameIncubatingValues.OPENSEARCH;
   }
 
   @Override

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

@@ -5,15 +5,31 @@
 
 package io.opentelemetry.javaagent.instrumentation.opensearch.v3_0;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientMetrics;
+import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 
 public final class OpenSearchSingletons {
-  private static final Instrumenter<OpenSearchRequest, Void> INSTRUMENTER =
-      OpenSearchInstrumenterFactory.create("io.opentelemetry.opensearch-java-3.0");
+  private static final Instrumenter<OpenSearchRequest, Void> INSTRUMENTER = createInstrumenter();
 
   public static Instrumenter<OpenSearchRequest, Void> instrumenter() {
     return INSTRUMENTER;
   }
 
+  private static Instrumenter<OpenSearchRequest, Void> createInstrumenter() {
+    OpenSearchAttributesGetter dbClientAttributesGetter = new OpenSearchAttributesGetter();
+
+    return Instrumenter.<OpenSearchRequest, Void>builder(
+            GlobalOpenTelemetry.get(),
+            "io.opentelemetry.opensearch-java-3.0",
+            DbClientSpanNameExtractor.create(dbClientAttributesGetter))
+        .addAttributesExtractor(DbClientAttributesExtractor.create(dbClientAttributesGetter))
+        .addOperationMetrics(DbClientMetrics.get())
+        .buildInstrumenter(SpanKindExtractor.alwaysClient());
+  }
+
   private OpenSearchSingletons() {}
 }