.

Author: sentrivana

MIGRATION_GUIDE.md

@@ -10,6 +10,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 ### Changed
 
 - The SDK now supports Python 3.7 and higher.
+- Transaction names can no longer contain commas and equals signs. If present, these characters will be stripped.
 - `sentry_sdk.start_span` now only takes keyword arguments.
 - `sentry_sdk.start_span` no longer takes an explicit `span` argument.
 - The `Span()` constructor does not accept a `hub` parameter anymore.

sentry_sdk/tracing.py

@@ -1189,11 +1189,6 @@ class POTelSpan:
     OTel span wrapper providing compatibility with the old span interface.
     """
 
-    # XXX Maybe it makes sense to repurpose the existing Span class for this.
-    # For now I'm keeping this class separate to have a clean slate.
-
-    # XXX The wrapper itself should have as little state as possible
-
     def __init__(
         self,
         *,
@@ -1225,14 +1220,14 @@ def __init__(
                 # OTel timestamps have nanosecond precision
                 start_timestamp = convert_to_otel_timestamp(start_timestamp)
 
-            self._otel_span = tracer.start_span(
-                name or description or op or "", start_time=start_timestamp
-            )
+            span_name = self._sanitize_name(name or description or op or "")
+            self._otel_span = tracer.start_span(span_name, start_time=start_timestamp)
 
             self.origin = origin or DEFAULT_SPAN_ORIGIN
             self.op = op
             self.description = description
-            self.name = name
+            self.name = span_name
+
             if status is not None:
                 self.set_status(status)
 
@@ -1602,6 +1597,10 @@ def set_context(self, key, value):
 
         self.set_attribute(f"{SentrySpanAttribute.CONTEXT}.{key}", value)
 
+    def _sanitize_name(self, name):
+        """No commas and equals allowed in tracestate."""
+        return name.replace(",", "").replace("=", "")
+
 
 if TYPE_CHECKING:
 

tests/integrations/pymongo/test_pymongo.py

@@ -1,3 +1,5 @@
+import re
+
 from sentry_sdk import capture_message, start_transaction
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations.pymongo import PyMongoIntegration, _strip_pii
@@ -72,8 +74,8 @@ def test_transactions(sentry_init, capture_events, mongo_server, with_pii):
     assert insert_fail["data"]["db.operation"] == "insert"
 
     assert find["description"].startswith('{"find')
-    assert insert_success["description"].startswith('{"insert')
-    assert insert_fail["description"].startswith('{"insert')
+    assert re.match("^{['\"]insert.*", insert_success["description"])
+    assert re.match("^{['\"]insert.*", insert_fail["description"])
 
     assert find["data"][SPANDATA.DB_MONGODB_COLLECTION] == "test_collection"
     assert insert_success["data"][SPANDATA.DB_MONGODB_COLLECTION] == "test_collection"
@@ -119,7 +121,11 @@ def test_breadcrumbs(
     )  # force query execution
     capture_message("hi")
 
-    (event,) = events
+    if traces_sample_rate:
+        event = events[1]
+    else:
+        event = events[0]
+
     (crumb,) = event["breadcrumbs"]["values"]
 
     assert crumb["category"] == "query"