Re-introduce patch for _bind, just don't add query source to those spans since they're not fetching rows

Author: ericapisani

sentry_sdk/integrations/asyncpg.py

@@ -53,6 +53,9 @@ def setup_once() -> None:
         )
         asyncpg.Connection.prepare = _wrap_connection_method(asyncpg.Connection.prepare)
 
+        BaseCursor._bind = _wrap_cursor_method(
+            BaseCursor._bind, record_query_source=False
+        )
         BaseCursor._bind_exec = _wrap_cursor_method(BaseCursor._bind_exec)
         BaseCursor._exec = _wrap_cursor_method(BaseCursor._exec)
 
@@ -163,6 +166,8 @@ async def _inner(*args: "Any", **kwargs: "Any") -> "T":
 
 def _wrap_cursor_method(
     f: "Callable[..., Awaitable[T]]",
+    *,
+    record_query_source: bool = True,
 ) -> "Callable[..., Awaitable[T]]":
     async def _inner(*args: "Any", **kwargs: "Any") -> "T":
         if sentry_sdk.get_client().get_integration(AsyncPGIntegration) is None:
@@ -182,11 +187,11 @@ async def _inner(*args: "Any", **kwargs: "Any") -> "T":
             _set_db_data(span, cursor._connection)
             res = await f(*args, **kwargs)
 
-            if isinstance(span, StreamedSpan):
+            if record_query_source and isinstance(span, StreamedSpan):
                 with capture_internal_exceptions():
                     add_query_source(span)
 
-        if not isinstance(span, StreamedSpan):
+        if record_query_source and not isinstance(span, StreamedSpan):
             with capture_internal_exceptions():
                 add_query_source(span)
 

tests/integrations/asyncpg/test_asyncpg.py

@@ -410,6 +410,12 @@ async def test_cursor_manual(sentry_init, capture_events) -> None:
             "message": "SELECT * FROM users WHERE dob > $1",
             "type": "default",
         },
+        {
+            "category": "query",
+            "data": {"db.cursor": mock.ANY},
+            "message": "SELECT * FROM users WHERE dob > $1",
+            "type": "default",
+        },
         {"category": "query", "data": {}, "message": "COMMIT;", "type": "default"},
     ]
 
@@ -1462,7 +1468,9 @@ async def test_cursor__bind_exec_creates_spans(
 
 
 @pytest.mark.asyncio
-async def test_cursor__exec_methods_create_spans(sentry_init, capture_events) -> None:
+async def test_cursor_bind_and_exec_methods_create_spans(
+    sentry_init, capture_events
+) -> None:
     sentry_init(
         integrations=[AsyncPGIntegration()],
         traces_sample_rate=1.0,
@@ -1494,25 +1502,34 @@ async def test_cursor__exec_methods_create_spans(sentry_init, capture_events) ->
 
     (event,) = events
 
-    assert len(event["spans"]) == 6
+    assert len(event["spans"]) == 7
 
     connect_span = event["spans"][0]
     executemany_span = event["spans"][1]
     begin_span = event["spans"][2]
-    fetchrow_span_1 = event["spans"][3]
-    fetchrow_span_2 = event["spans"][4]
-    commit_span = event["spans"][5]
+    bind_span = event["spans"][3]
+    fetchrow_span_1 = event["spans"][4]
+    fetchrow_span_2 = event["spans"][5]
+    commit_span = event["spans"][6]
 
     assert connect_span["description"] == "connect"
     assert (
         executemany_span["description"]
         == "INSERT INTO users(name, password, dob) VALUES($1, $2, $3)"
     )
     assert begin_span["description"] == "BEGIN;"
+    assert bind_span["description"] == "SELECT * FROM users WHERE dob > $1"
     assert fetchrow_span_1["description"] == "SELECT * FROM users WHERE dob > $1"
     assert fetchrow_span_2["description"] == "SELECT * FROM users WHERE dob > $1"
     assert commit_span["description"] == "COMMIT;"
 
+    assert bind_span["data"]["db.cursor"] is not None
+    assert bind_span["data"]["db.system"] == "postgresql"
+    assert bind_span["data"]["db.driver.name"] == "asyncpg"
+    assert bind_span["origin"] == "auto.db.asyncpg"
+    assert SPANDATA.CODE_LINENO not in bind_span.get("data", {})
+    assert SPANDATA.CODE_FILEPATH not in bind_span.get("data", {})
+
     for span in (fetchrow_span_1, fetchrow_span_2):
         assert span["data"]["db.cursor"] is not None
         assert span["data"]["db.system"] == "postgresql"