Capture table names in double quotes

open-telemetry · Oct 14, 2024 · 46616da · 46616da
1 parent e73b23a
commit 46616da
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/patches/client.rb b/instrumentation/mysql2/lib/opentelemetry/instrumentation/mysql2/patches/client.rb
@@ -14,7 +14,7 @@ module Patches
         # Module to prepend to Mysql2::Client for instrumentation
         module Client
           # Capture the first word (including letters, digits, underscores, & '.', ) that follows common table commands
-          TABLE_NAME = /\b(?:(?:FROM|INTO|UPDATE)|(?:(?:CREATE|DROP|ALTER)\s+TABLE(?:\s+IF\s+(?:NOT\s+)?EXISTS)?))\s+["']?([\w.]+)["']?/i
+          TABLE_NAME = /\b(?:(?:FROM|INTO|UPDATE)|(?:(?:CREATE|DROP|ALTER)\s+TABLE(?:\s+IF\s+(?:NOT\s+)?EXISTS)?))\s+["]?([\w.]+)["]?/i
 
           def query(sql, options = {})
             tracer.in_span(

diff --git a/instrumentation/mysql2/test/fixtures/sql_table_name.json b/instrumentation/mysql2/test/fixtures/sql_table_name.json
@@ -50,5 +50,9 @@
     {
       "name": "from_with_join",
       "sql": "SELECT columns FROM test_table JOIN table2 ON test_table.column = table2.column"
+    },
+    {
+      "name": "table_name_with_double_quotes",
+      "sql": "SELECT columns FROM \"test_table\""
     }
   ]
diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb
@@ -14,7 +14,7 @@ module Patches
         # Module to prepend to Trilogy for instrumentation
         module Client
           # Capture the first word (including letters, digits, underscores, & '.', ) that follows common table commands
-          TABLE_NAME = /\b(?:(?:FROM|INTO|UPDATE)|(?:(?:CREATE|DROP|ALTER)\s+TABLE(?:\s+IF\s+(?:NOT\s+)?EXISTS)?))\s+["']?([\w.]+)["']?/i
+          TABLE_NAME = /\b(?:(?:FROM|INTO|UPDATE)|(?:(?:CREATE|DROP|ALTER)\s+TABLE(?:\s+IF\s+(?:NOT\s+)?EXISTS)?))\s+["]?([\w.]+)["]?/i
 
           def initialize(options = {})
             @connection_options = options # This is normally done by Trilogy#initialize

diff --git a/instrumentation/trilogy/test/fixtures/sql_table_name.json b/instrumentation/trilogy/test/fixtures/sql_table_name.json
@@ -50,5 +50,9 @@
     {
       "name": "from_with_join",
       "sql": "SELECT columns FROM test_table JOIN table2 ON test_table.column = table2.column"
+    },
+    {
+      "name": "table_name_with_double_quotes",
+      "sql": "SELECT columns FROM \"test_table\""
     }
   ]