feat(dbapi2): include object name in procedure call spans

Include the name of the procedure in the name of the span.
Examples:
CALL procedure()
EXECUTE procedure

Issue: #1937

Author: anderssonjohan

elasticapm/instrumentation/packages/dbapi2.py

@@ -170,25 +170,32 @@ def extract_signature(sql):
         keyword = "INTO" if sql_type == "INSERT" else "FROM"
         sql_type = sql_type + " " + keyword
 
-        table_name = look_for_table(sql, keyword)
+        object_name = look_for_table(sql, keyword)
     elif sql_type in ["CREATE", "DROP"]:
         # 2nd word is part of SQL type
         sql_type = sql_type + sql[first_space:second_space]
-        table_name = ""
+        object_name = ""
     elif sql_type == "UPDATE":
-        table_name = look_for_table(sql, "UPDATE")
+        object_name = look_for_table(sql, "UPDATE")
     elif sql_type == "SELECT":
         # Name is first table
         try:
             sql_type = "SELECT FROM"
-            table_name = look_for_table(sql, "FROM")
+            object_name = look_for_table(sql, "FROM")
         except Exception:
-            table_name = ""
+            object_name = ""
+    elif sql_type in ["EXEC", "EXECUTE"]:
+        sql_type = "EXECUTE"
+        end = second_space if second_space > first_space else len(sql)
+        object_name = sql[first_space + 1 : end]
+    elif sql_type == "CALL":
+        first_paren = sql.find("(", first_space)
+        object_name = sql[first_space + 1 : first_paren] + "()"
     else:
         # No name
-        table_name = ""
+        object_name = ""
 
-    signature = " ".join(filter(bool, [sql_type, table_name]))
+    signature = " ".join(filter(bool, [sql_type, object_name]))
     return signature
 
 

tests/instrumentation/dbapi2_tests.py

@@ -114,3 +114,22 @@ def test_extract_signature_bytes():
     actual = extract_signature(sql)
     expected = "HELLO"
     assert actual == expected
+
+
+@pytest.mark.parametrize(
+    ["sql", "expected"],
+    [
+        (
+            "EXEC AdventureWorks2022.dbo.uspGetEmployeeManagers 50;",
+            "EXECUTE AdventureWorks2022.dbo.uspGetEmployeeManagers",
+        ),
+        ("EXECUTE sp_who2", "EXECUTE sp_who2"),
+        ("EXEC sp_updatestats @@all_schemas = 'true'", "EXECUTE sp_updatestats"),
+        ("CALL get_car_stats_by_year(2017, @number, @min, @avg, @max);", "CALL get_car_stats_by_year()"),
+        ("CALL get_car_stats_by_year;", "CALL get_car_stats_by_year()"),
+        ("CALL get_car_stats_by_year();", "CALL get_car_stats_by_year()"),
+    ],
+)
+def test_extract_signature_for_procedure_call(sql, expected):
+    actual = extract_signature(sql)
+    assert actual == expected