Addressed PR comments

Author: akats7

Diff for: instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/db/SqlStatementInfo.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.instrumentation.api.db;
 
 import com.google.auto.value.AutoValue;
-import java.util.function.Function;
 import javax.annotation.Nullable;
 
 @AutoValue
@@ -17,26 +16,12 @@ public static SqlStatementInfo create(
     return new AutoValue_SqlStatementInfo(fullStatement, operation, identifier);
   }
 
-  public SqlStatementInfo mapTable(Function<String, String> mapper) {
-    return SqlStatementInfo.create(
-        getFullStatement(), getOperation(), mapper.apply(getIdentifier()));
-  }
-
   @Nullable
   public abstract String getFullStatement();
 
   @Nullable
   public abstract String getOperation();
 
   @Nullable
-  public abstract String getIdentifier();
-
-  @Nullable
-  public String getTable() {
-    String operation = getOperation();
-    if (operation != null && !operation.equals("CALL")) {
-      return getIdentifier();
-    }
-    return null;
-  }
+  public abstract String getMainIdentifier();
 }

Diff for: instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbClientSpanNameExtractor.java

@@ -29,7 +29,8 @@ public static <REQUEST> SpanNameExtractor<REQUEST> create(
    *
    * @see SqlStatementInfo#getOperation() used to extract {@code <db.operation>}.
    * @see DbClientAttributesGetter#name(Object) used to extract {@code <db.name>}.
-   * @see SqlStatementInfo#getIdentifier() used to extract {@code <db.identifier>}.
+   * @see SqlStatementInfo#getMainIdentifier() used to extract {@code <db.table>} or stored
+   *     procedure name.
    */
   public static <REQUEST> SpanNameExtractor<REQUEST> create(
       SqlClientAttributesGetter<REQUEST> getter) {
@@ -96,7 +97,7 @@ public String extract(REQUEST request) {
       String dbName = getter.name(request);
       SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.rawStatement(request));
       return computeSpanName(
-          dbName, sanitizedStatement.getOperation(), sanitizedStatement.getIdentifier());
+          dbName, sanitizedStatement.getOperation(), sanitizedStatement.getMainIdentifier());
     }
   }
 }

Diff for: instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlClientAttributesExtractor.java

@@ -43,6 +43,7 @@ public static <REQUEST, RESPONSE> SqlClientAttributesExtractorBuilder<REQUEST, R
     return new SqlClientAttributesExtractorBuilder<>(getter);
   }
 
+  private static final String SQL_CALL = "CALL";
   private final AttributeKey<String> dbTableAttribute;
   private final SqlStatementSanitizer sanitizer;
 
@@ -60,8 +61,11 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
     super.onStart(attributes, parentContext, request);
 
     SqlStatementInfo sanitizedStatement = sanitizer.sanitize(getter.rawStatement(request));
+    String operation = sanitizedStatement.getOperation();
     internalSet(attributes, SemanticAttributes.DB_STATEMENT, sanitizedStatement.getFullStatement());
-    internalSet(attributes, SemanticAttributes.DB_OPERATION, sanitizedStatement.getOperation());
-    internalSet(attributes, dbTableAttribute, sanitizedStatement.getTable());
+    internalSet(attributes, SemanticAttributes.DB_OPERATION, operation);
+    if (operation != null && !operation.equals(SQL_CALL)) {
+      internalSet(attributes, dbTableAttribute, sanitizedStatement.getMainIdentifier());
+    }
   }
 }

Diff for: instrumentation-api-semconv/src/main/jflex/SqlSanitizer.jflex

@@ -64,12 +64,12 @@ WHITESPACE          = [ \t\r\n]+
 
   /** @return text matched by current token without enclosing double quotes or backticks */
   private String readIdentifierName() {
-    String IdentifierName = yytext();
-    if (IdentifierName != null && ((IdentifierName.startsWith("\"") && IdentifierName.endsWith("\""))
-        || (IdentifierName.startsWith("`") && IdentifierName.endsWith("`")))) {
-      IdentifierName = IdentifierName.substring(1, IdentifierName.length() - 1);
+    String identifierName = yytext();
+    if (identifierName != null && ((identifierName.startsWith("\"") && identifierName.endsWith("\""))
+        || (identifierName.startsWith("`") && identifierName.endsWith("`")))) {
+      identifierName = identifierName.substring(1, identifierName.length() - 1);
     }
-    return IdentifierName;
+    return identifierName;
   }
 
   // you can reference a table in the FROM clause in one of the following ways:
@@ -316,13 +316,12 @@ WHITESPACE          = [ \t\r\n]+
           if (isOverLimit()) return YYEOF;
       }
   "CALL" {
-       if (!insideComment) {
-        setOperation(new Call());
-        }
-        operation.handleIdentifier();
-        appendCurrentFragment();
-        if (isOverLimit()) return YYEOF;
-  }
+          if (!insideComment) {
+            setOperation(new Call());
+          }
+          appendCurrentFragment();
+          if (isOverLimit()) return YYEOF;
+      }
   "MERGE" {
           if (!insideComment) {
             setOperation(new Merge());

Diff for: instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/db/SqlStatementSanitizerTest.java

@@ -276,6 +276,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) th
           Arguments.of("/* update comment */ select * from table1", expect("SELECT", "table1")),
           Arguments.of("select /*((*/abc from table", expect("SELECT", "table")),
           Arguments.of("SeLeCT * FrOm TAblE", expect("SELECT", "table")),
+          Arguments.of("select next value in hibernate_sequence", expect("SELECT", null)),
 
           // hibernate/jpa
           Arguments.of("FROM schema.table", expect("SELECT", "schema.table")),

Diff for: instrumentation/hibernate/hibernate-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/hibernate/OperationNameUtil.java

@@ -22,8 +22,8 @@ public static String getOperationNameForQuery(String query) {
     SqlStatementInfo info = sanitizer.sanitize(query);
     if (info.getOperation() != null) {
       operation = info.getOperation();
-      if (info.getTable() != null) {
-        operation += " " + info.getTable();
+      if (info.getMainIdentifier() != null) {
+        operation += " " + info.getMainIdentifier();
       }
     }
     return operation;