fix

Author: trask

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractor.java

@@ -67,10 +67,10 @@ public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     if (SemconvStability.emitStableDatabaseSemconv()) {
-      internalSet(
-          attributes,
-          DB_SYSTEM_NAME,
-          SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
+      String dbSystem = getter.getDbSystem(request);
+      if (dbSystem != null) {
+        internalSet(attributes, DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(dbSystem));
+      }
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
       internalSet(attributes, DB_QUERY_TEXT, getter.getDbQueryText(request));
       internalSet(attributes, DB_OPERATION_NAME, getter.getDbOperationName(request));

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesGetter.java

@@ -87,4 +87,14 @@ default String getOperation(REQUEST request) {
   default String getDbOperationName(REQUEST request) {
     return getOperation(request);
   }
+
+  @Nullable
+  default String getDbQuerySummary(REQUEST request) {
+    return null;
+  }
+
+  @Nullable
+  default String getResponseStatus(@Nullable RESPONSE response, @Nullable Throwable error) {
+    return null;
+  }
 }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractor.java

@@ -90,10 +90,10 @@ public static <REQUEST, RESPONSE> SqlClientAttributesExtractorBuilder<REQUEST, R
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     // Common attributes
     if (SemconvStability.emitStableDatabaseSemconv()) {
-      internalSet(
-          attributes,
-          DB_SYSTEM_NAME,
-          SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
+      String dbSystem = getter.getDbSystem(request);
+      if (dbSystem != null) {
+        internalSet(attributes, DB_SYSTEM_NAME, SemconvStability.stableDbSystemName(dbSystem));
+      }
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
     }
     if (SemconvStability.emitOldDatabaseSemconv()) {

instrumentation/couchbase/couchbase-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseAttributesGetter.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class CouchbaseAttributesGetter
@@ -54,6 +55,10 @@ public String getDbOperationName(CouchbaseRequestInfo couchbaseRequest) {
   @Override
   public InetSocketAddress getNetworkPeerInetSocketAddress(
       CouchbaseRequestInfo request, @Nullable Void unused) {
-    return request.peerSocketAddress();
+    SocketAddress address = request.getPeerAddress();
+    if (address instanceof InetSocketAddress) {
+      return (InetSocketAddress) address;
+    }
+    return null;
   }
 }

instrumentation/jedis/jedis-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v4_0/JedisDbAttributesGetter.java

@@ -8,6 +8,7 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import javax.annotation.Nullable;
 
 final class JedisDbAttributesGetter implements DbClientAttributesGetter<JedisRequest, Void> {
@@ -49,6 +50,10 @@ public String getDbOperationName(JedisRequest request) {
   @Override
   public InetSocketAddress getNetworkPeerInetSocketAddress(
       JedisRequest request, @Nullable Void unused) {
-    return request.getAddress();
+    SocketAddress address = request.getRemoteSocketAddress();
+    if (address instanceof InetSocketAddress) {
+      return (InetSocketAddress) address;
+    }
+    return null;
   }
 }