split off PR

Author: zeitlinger

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

@@ -18,8 +18,11 @@ default String getUser(REQUEST request) {
     return null;
   }
 
+  // TODO: make this required to implement
   @Nullable
-  String getDbNamespace(REQUEST request);
+  default String getDbNamespace(REQUEST request) {
+    return getName(request);
+  }
 
   @Deprecated
   @Nullable

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

@@ -5,6 +5,9 @@
 
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -30,10 +33,13 @@ public interface SqlClientAttributesGetter<REQUEST, RESPONSE>
    * <p>If {@code request} is not a batch query, then this method should return a collection with a
    * single element.
    */
-  Collection<String> getRawQueryTexts(REQUEST request);
+  // TODO: make this required to implement
+  default Collection<String> getRawQueryTexts(REQUEST request) {
+    String rawQueryText = getRawQueryText(request);
+    return rawQueryText == null ? emptySet() : singleton(rawQueryText);
+  }
 
   // TODO: make this required to implement
-  @Nullable
   default Long getBatchSize(REQUEST request) {
     return null;
   }