.

Author: sentrivana

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -12,7 +12,6 @@
 from opentelemetry.sdk.trace import Span, ReadableSpan, SpanProcessor
 
 import sentry_sdk
-from sentry_sdk._types import AnnotatedValue
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.tracing import DEFAULT_SPAN_ORIGIN
 from sentry_sdk.utils import get_current_thread_meta
@@ -152,12 +151,10 @@ def _flush_root_span(self, span):
             if span_json:
                 spans.append(span_json)
 
-        if dropped_spans == 0:
-            transaction_event["spans"] = spans
-        else:
-            transaction_event["spans"] = AnnotatedValue(
-                spans, {"len": len(spans) + dropped_spans}
-            )
+        transaction_event["spans"] = spans
+        if dropped_spans > 0:
+            transaction_event["_dropped_spans"] = dropped_spans
+
         # TODO-neel-potel sort and cutoff max spans
 
         sentry_sdk.capture_event(transaction_event)

tests/tracing/test_misc.py

@@ -15,7 +15,7 @@ def test_span_trimming(sentry_init, capture_events):
 
     with start_span(name="hi"):
         for i in range(10):
-            with start_span(op="foo{}".format(i)):
+            with start_span(op=f"foo{i}"):
                 pass
 
     (event,) = events
@@ -29,7 +29,6 @@ def test_span_trimming(sentry_init, capture_events):
 
     assert event["_meta"]["spans"][""]["len"] == 10
     assert "_dropped_spans" not in event
-    assert "dropped_spans" not in event
 
 
 def test_span_data_scrubbing_and_trimming(sentry_init, capture_events):
@@ -42,7 +41,7 @@ def test_span_data_scrubbing_and_trimming(sentry_init, capture_events):
             span.set_data("datafoo", "databar")
 
         for i in range(10):
-            with start_span(op="foo{}".format(i)):
+            with start_span(op=f"foo{i}"):
                 pass
 
     (event,) = events