multiple tables per operation

Author: trask

instrumentation-api-incubator/src/main/jflex/SqlSanitizer.jflex

@@ -270,6 +270,10 @@ WHITESPACE           = [ \t\r\n]+
     boolean expectingTableName = false;
     boolean mainTableSetAlready = false;
     int identifiersAfterMainFromClause = 0;
+    // Tracks whether we're in a comma-separated table list (implicit join)
+    boolean inImplicitJoin = false;
+    // Counter for identifiers after each comma in implicit join
+    int identifiersAfterComma = 0;
 
     boolean handleFrom() {
       if (parenLevel == 0) {
@@ -294,6 +298,17 @@ WHITESPACE           = [ \t\r\n]+
         ++identifiersAfterMainFromClause;
       }
 
+      // Handle identifiers in implicit join (comma-separated tables)
+      if (inImplicitJoin) {
+        ++identifiersAfterComma;
+        // First identifier after comma is the table name - add it to summary
+        if (identifiersAfterComma == 1) {
+          String tableName = readIdentifierName();
+          appendTargetToSummary(tableName);
+        }
+        return false;
+      }
+
       if (!expectingTableName) {
         return false;
       }
@@ -328,7 +343,14 @@ WHITESPACE           = [ \t\r\n]+
       if (identifiersAfterMainFromClause > 0
           && identifiersAfterMainFromClause <= FROM_TABLE_REF_MAX_IDENTIFIERS) {
         mainIdentifier = null;
-        return true;
+        inImplicitJoin = true;
+        identifiersAfterComma = 0;
+        // Don't return true - continue processing to capture more table names for summary
+        return false;
+      }
+      // Reset counter for next table in implicit join
+      if (inImplicitJoin) {
+        identifiersAfterComma = 0;
       }
       return false;
     }

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlStatementSanitizerTest.java

@@ -173,9 +173,9 @@ void querySummaryIsTruncated() {
     String result = SqlStatementSanitizer.create(true).sanitize(sql.toString()).getQuerySummary();
     assertThat(result).isNotNull();
     assertThat(result.length()).isLessThanOrEqualTo(255);
-    // For implicit join (comma-separated tables), mainIdentifier is null so only first table is in
-    // summary
-    assertThat(result).isEqualTo("SELECT very_long_table_name_0");
+    // Implicit join (comma-separated tables) should include all table names in the summary
+    // but truncated at 255 characters
+    assertThat(result).startsWith("SELECT very_long_table_name_0 very_long_table_name_1");
   }
 
   private static Stream<Arguments> sqlArgs() {
@@ -341,11 +341,22 @@ private static Stream<Arguments> simplifyArgs() {
         Arguments.of(
             "select col from table where col in (select * from anotherTable)",
             expect("SELECT", null, "SELECT table SELECT anotherTable")),
-        Arguments.of("select col from table1, table2", expect("SELECT", null, "SELECT table1")),
         Arguments.of(
-            "select col from table1 t1, table2 t2", expect("SELECT", null, "SELECT table1")),
+            "select col from table1, table2", expect("SELECT", null, "SELECT table1 table2")),
         Arguments.of(
-            "select col from table1 as t1, table2 as t2", expect("SELECT", null, "SELECT table1")),
+            "select col from table1 t1, table2 t2",
+            expect("SELECT", null, "SELECT table1 table2")),
+        Arguments.of(
+            "select col from table1 as t1, table2 as t2",
+            expect("SELECT", null, "SELECT table1 table2")),
+        // Example from semantic conventions: multiple tables in FROM clause
+        Arguments.of(
+            "SELECT * FROM songs, artists WHERE songs.artist_id = artists.id",
+            expect(
+                "SELECT * FROM songs, artists WHERE songs.artist_id = artists.id",
+                "SELECT",
+                null,
+                "SELECT songs artists")),
         Arguments.of(
             "select col from table where col in (1, 2, 3)",
             expect("select col from table where col in (?)", "SELECT", "table", "SELECT table")),