defaultdict

Author: sl0thentr0py

sentry_sdk/integrations/opentelemetry/potel_span_processor.py

@@ -1,4 +1,4 @@
-from collections import deque
+from collections import deque, defaultdict
 
 from opentelemetry.trace import format_trace_id, format_span_id
 from opentelemetry.context import Context
@@ -17,7 +17,7 @@
 from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Optional, List, Any, Deque
+    from typing import Optional, List, Any, Deque, DefaultDict
     from sentry_sdk._types import Event
 
 
@@ -35,7 +35,9 @@ def __new__(cls):
 
     def __init__(self):
         # type: () -> None
-        self._children_spans = {}  # type: dict[int, List[ReadableSpan]]
+        self._children_spans = defaultdict(
+            list
+        )  # type: DefaultDict[int, List[ReadableSpan]]
 
     def on_start(self, span, parent_context=None):
         # type: (Span, Optional[Context]) -> None
@@ -48,7 +50,7 @@ def on_end(self, span):
 
         # TODO-neel-potel-remote only take parent if not remote
         if span.parent:
-            self._children_spans.setdefault(span.parent.span_id, []).append(span)
+            self._children_spans[span.parent.span_id].append(span)
         else:
             # if have a root span ending, we build a transaction and send it
             self._flush_root_span(span)
@@ -75,7 +77,7 @@ def _flush_root_span(self, span):
             span_json = self._span_to_json(child)
             if span_json:
                 spans.append(span_json)
-        transaction_event.setdefault("spans", []).extend(spans)
+        transaction_event["spans"] = spans
         # TODO-neel-potel sort and cutoff max spans
 
         capture_event(transaction_event)

tests/integrations/opentelemetry/test_span_processor.py

@@ -10,6 +10,7 @@
     SentrySpanProcessor,
     link_trace_context_to_error_event,
 )
+from sentry_sdk.integrations.opentelemetry.utils import is_sentry_span
 from sentry_sdk.scope import Scope
 from sentry_sdk.tracing import Span, Transaction
 from sentry_sdk.tracing_utils import extract_sentrytrace_data
@@ -19,24 +20,24 @@ def test_is_sentry_span():
     otel_span = MagicMock()
 
     span_processor = SentrySpanProcessor()
-    assert not span_processor._is_sentry_span(otel_span)
+    assert not is_sentry_span(otel_span)
 
     client = MagicMock()
     client.options = {"instrumenter": "otel"}
     client.dsn = "https://[email protected]/123456"
     Scope.get_global_scope().set_client(client)
 
-    assert not span_processor._is_sentry_span(otel_span)
+    assert not is_sentry_span(otel_span)
 
     otel_span.attributes = {
         "http.url": "https://example.com",
     }
-    assert not span_processor._is_sentry_span(otel_span)
+    assert not is_sentry_span(otel_span)
 
     otel_span.attributes = {
         "http.url": "https://o123456.ingest.sentry.io/api/123/envelope",
     }
-    assert span_processor._is_sentry_span(otel_span)
+    assert is_sentry_span(otel_span)
 
 
 def test_get_otel_context():