up

Author: trask

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

@@ -24,11 +24,6 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
   /**
    * Returns a {@link SpanNameExtractor} that constructs the span name according to DB semantic
    * conventions.
-   *
-   * @see SqlStatementInfo#getOperationName() used to extract {@code <db.operation.name>}.
-   * @see DbClientAttributesGetter#getDbNamespace(Object) used to extract {@code <db.namespace>}.
-   * @see SqlStatementInfo#getCollectionName() used to extract table name.
-   * @see SqlStatementInfo#getStoredProcedureName() used to extract stored procedure name.
    */
   public static <REQUEST> SpanNameExtractor<REQUEST> create(
       SqlClientAttributesGetter<REQUEST, ?> getter) {
@@ -40,32 +35,30 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
   private DbClientSpanNameExtractor() {}
 
   protected String computeSpanName(
-      @Nullable String dbName,
-      @Nullable String operation,
+      @Nullable String namespace,
+      @Nullable String operationName,
       @Nullable String collectionName,
       @Nullable String storedProcedureName) {
-    // Use whichever identifier is available (they're mutually exclusive)
-    String mainIdentifier = collectionName != null ? collectionName : storedProcedureName;
-
-    if (operation == null) {
-      return dbName == null ? DEFAULT_SPAN_NAME : dbName;
+    if (operationName == null) {
+      return namespace == null ? DEFAULT_SPAN_NAME : namespace;
     }
 
-    StringBuilder name = new StringBuilder(operation);
-    if (dbName != null || mainIdentifier != null) {
-      name.append(' ');
+    StringBuilder spanName = new StringBuilder(operationName);
+    String mainIdentifier = collectionName != null ? collectionName : storedProcedureName;
+    if (namespace != null || mainIdentifier != null) {
+      spanName.append(' ');
     }
-    // skip db name if mainIdentifier already has namespace prefixed to it
-    if (dbName != null && (mainIdentifier == null || mainIdentifier.indexOf('.') == -1)) {
-      name.append(dbName);
+    // skip namespace if identifier already has a namespace prefixed to it
+    if (namespace != null && (mainIdentifier == null || mainIdentifier.indexOf('.') == -1)) {
+      spanName.append(namespace);
       if (mainIdentifier != null) {
-        name.append('.');
+        spanName.append('.');
       }
     }
     if (mainIdentifier != null) {
-      name.append(mainIdentifier);
+      spanName.append(mainIdentifier);
     }
-    return name.toString();
+    return spanName.toString();
   }
 
   /**
@@ -191,29 +184,23 @@ public String extract(REQUEST request) {
       if (rawQueryTexts.size() == 1) {
         SqlStatementInfo sanitizedStatement =
             SqlStatementSanitizerUtil.sanitize(rawQueryTexts.iterator().next());
-        String operation = sanitizedStatement.getOperationName();
+        String operationName = sanitizedStatement.getOperationName();
         if (isBatch(request)) {
-          operation = operation != null ? "BATCH " + operation : "BATCH";
+          operationName = "BATCH " + operationName;
         }
         return computeSpanNameStable(
             getter,
             request,
-            operation,
+            operationName,
             sanitizedStatement.getCollectionName(),
             sanitizedStatement.getStoredProcedureName());
       }
 
       MultiQuery multiQuery = MultiQuery.analyze(rawQueryTexts, false);
-      String operation = multiQuery.getOperationName();
-      if (operation != null) {
-        operation = "BATCH " + operation;
-      } else {
-        operation = "BATCH";
-      }
       return computeSpanNameStable(
           getter,
           request,
-          operation,
+          multiQuery.getOperationName(),
           multiQuery.getCollectionName(),
           multiQuery.getStoredProcedureName());
     }

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

@@ -46,10 +46,11 @@ static MultiQuery analyze(
           statementSanitizationEnabled ? sanitizedStatement.getQueryText() : rawQueryText);
     }
 
+    String operationName = uniqueOperationName.getValue();
     return new MultiQuery(
         uniqueCollectionName.getValue(),
         uniqueStoredProcedureName.getValue(),
-        uniqueOperationName.getValue(),
+        operationName == null ? "BATCH" : "BATCH " + operationName,
         uniqueQueryTexts);
   }
 

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

@@ -124,12 +124,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
         MultiQuery multiQuery =
             MultiQuery.analyze(getter.getRawQueryTexts(request), statementSanitizationEnabled);
         internalSet(attributes, DB_QUERY_TEXT, join("; ", multiQuery.getQueryTexts()));
-
-        String operationName =
-            multiQuery.getOperationName() != null
-                ? "BATCH " + multiQuery.getOperationName()
-                : "BATCH";
-        internalSet(attributes, DB_OPERATION_NAME, operationName);
+        internalSet(attributes, DB_OPERATION_NAME, multiQuery.getOperationName());
         internalSet(attributes, DB_COLLECTION_NAME, multiQuery.getCollectionName());
         internalSet(attributes, DB_STORED_PROCEDURE_NAME, multiQuery.getStoredProcedureName());
       }