ref(asyncpg): Normalize query whitespace in integration

sentry_sdk/client.py

@@ -7,7 +7,7 @@
 from importlib import import_module
 from typing import TYPE_CHECKING, List, Dict, cast, overload
 import warnings
-
+import re
 from sentry_sdk._compat import check_uwsgi_thread_support
 from sentry_sdk._metrics_batcher import MetricsBatcher
 from sentry_sdk._span_batcher import SpanBatcher
@@ -688,6 +688,7 @@
         ):
             new_event = None
             spans_before = len(cast(List[Dict[str, object]], event.get("spans", [])))
+            self._clean_span_descriptions(event)
             with capture_internal_exceptions():
                 new_event = before_send_transaction(event, hint or {})
             if new_event is None:
@@ -712,6 +713,12 @@
 
         return event
 
+    def _clean_span_descriptions(self, event: "Event") -> None:
+        for s in event.get("spans", []):
+            if "description" in s:
+                cleaned_description = re.sub(r"\s+", " ", s["description"]).strip()
+                s["description"] = cleaned_description
+
     def _is_ignored_error(self, event: "Event", hint: "Hint") -> bool:
         exc_info = hint.get("exc_info")
         if exc_info is None:

tests/test_basics.py

@@ -185,6 +185,85 @@ def before_send_transaction(event, hint):
     assert event["extra"] == {"before_send_transaction_called": True}
 
 
+def test_before_send_transaction_span_description_contains_newlines(
+    sentry_init, capture_events
+):
+    def before_send_transaction(event, hint):
+        for span in event.get("spans", []):
+            if (
+                span.get("description", "")
+                == "SELECT u.id, u.name, u.email FROM users;"
+            ):
+                span["description"] = "filtered"
+        return event
+
+    sentry_init(
+        before_send_transaction=before_send_transaction,
+        traces_sample_rate=1.0,
+    )
+    events = capture_events()
+
+    description = "SELECT u.id,\n    u.name,\n    u.email\n    FROM users;"
+
+    with start_transaction(name="test_transaction"):
+        with sentry_sdk.start_span(op="db", description=description):
+            pass
+
+    (event,) = events
+    assert event["transaction"] == "test_transaction"
+
+    spans = event["spans"]
+    assert len(spans) == 1
+    assert spans[0]["description"] == "filtered"
+    assert spans[0]["op"] == "db"
+
+
+def test_before_send_transaction_span_description_contains_multiple_lines(
+    sentry_init, capture_events
+):
+    def before_send_transaction(event, hint):
+        for span in event.get("spans", []):
+            if (
+                span.get("description", "")
+                == "SELECT u.id, u.name, u.email, p.title AS post_title, p.created_at AS post_date FROM users u JOIN posts p ON u.id = p.user_id WHERE u.active = true ORDER BY p.created_at DESC"
+            ):
+                span["description"] = "no bueno"
+        return event
+
+    sentry_init(
+        before_send_transaction=before_send_transaction,
+        traces_sample_rate=1.0,
+    )
+    events = capture_events()
+
+    description = """SELECT
+    u.id,
+    u.name,
+    u.email,
+    p.title AS post_title,
+    p.created_at AS post_date
+FROM
+    users u
+JOIN
+    posts p ON u.id = p.user_id
+WHERE
+    u.active = true
+ORDER BY
+    p.created_at DESC"""
+
+    with start_transaction(name="test_transaction"):
+        with sentry_sdk.start_span(op="db", description=description):
+            pass
+
+    (event,) = events
+    assert event["transaction"] == "test_transaction"
+
+    spans = event["spans"]
+    assert len(spans) == 1
+    assert spans[0]["description"] == "no bueno"
+    assert spans[0]["op"] == "db"
+
+
 def test_option_before_send_transaction_discard(sentry_init, capture_events):
     def before_send_transaction_discard(event, hint):
         return None