feat(dbapi2): use span action exec for procedure calls

Set span action to exec instead of query for procedure calls
not using callproc().

Issue: #1937

Author: anderssonjohan

elasticapm/instrumentation/packages/dbapi2.py

@@ -203,6 +203,13 @@ def extract_signature(sql):
 
 QUERY_ACTION = "query"
 EXEC_ACTION = "exec"
+PROCEDURE_STATEMENTS = ["EXEC", "EXECUTE", "CALL"]
+
+
+def extract_action_from_signature(signature, default):
+    if signature.split(" ")[0] in PROCEDURE_STATEMENTS:
+        return EXEC_ACTION
+    return default
 
 
 class CursorProxy(wrapt.ObjectProxy):
@@ -235,6 +242,7 @@ def _trace_sql(self, method, sql, params, action=QUERY_ACTION):
             signature = sql_string + "()"
         else:
             signature = self.extract_signature(sql_string)
+            action = extract_action_from_signature(signature, action)
 
         # Truncate sql_string to 10000 characters to prevent large queries from
         # causing an error to APM server.

tests/instrumentation/dbapi2_tests.py

@@ -29,7 +29,13 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 import pytest
 
-from elasticapm.instrumentation.packages.dbapi2 import Literal, extract_signature, scan, tokenize
+from elasticapm.instrumentation.packages.dbapi2 import (
+    Literal,
+    extract_action_from_signature,
+    extract_signature,
+    scan,
+    tokenize,
+)
 
 
 def test_scan_simple():
@@ -134,3 +140,17 @@ def test_extract_signature_bytes():
 def test_extract_signature_for_procedure_call(sql, expected):
     actual = extract_signature(sql)
     assert actual == expected
+
+
+@pytest.mark.parametrize(
+    ["sql", "expected"],
+    [
+        ("SELECT FROM table", "query"),
+        ("EXEC sp_who", "exec"),
+        ("EXECUTE sp_updatestats", "exec"),
+        ("CALL me_maybe", "exec"),
+    ],
+)
+def test_extract_action_from_signature(sql, expected):
+    actual = extract_action_from_signature(sql, "query")
+    assert actual == expected