more ignore spans

Author: sentrivana

sentry_sdk/_types.py

@@ -364,7 +364,7 @@ class TextPart(TypedDict):
         type: Literal["text"]
         content: str
 
-    IgnoreSpansName = Union[str, Pattern]
+    IgnoreSpansName = Union[str, Pattern[str]]
     IgnoreSpansContext = TypedDict(
         "IgnoreSpansContext",
         {"name": IgnoreSpansName, "attributes": Attributes},

sentry_sdk/scope.py

@@ -1235,13 +1235,19 @@ def start_streamed_span(
             # Get currently active span
             parent_span = self.span or self.get_current_scope().span  # type: ignore
 
+        if isinstance(parent_span, NoOpStreamedSpan):
+            # If the parent is an ignored span, attempt to reparent to the
+            # first non-ignored ancestor
+            parent_span = parent_span.last_valid_parent
+
         # If no specific parent_span provided and there is no currently
         # active span, this is a segment
         if parent_span is None:
             propagation_context = self.get_active_propagation_context()
 
+            span: "Union[StreamedSpan, NoOpStreamedSpan]"
             if is_ignored_span(name, attributes):
-                span = NoOpStreamedSpan(name=name, scope=self)
+                span = NoOpStreamedSpan(name=name, scope=self, last_valid_parent=None)
             else:
                 span = StreamedSpan(
                     name=name,
@@ -1259,7 +1265,9 @@ def start_streamed_span(
         # This is a child span; take propagation context from the parent span
         with new_scope():
             if is_ignored_span(name, attributes):
-                span = NoOpStreamedSpan(name=name, scope=self)
+                span = NoOpStreamedSpan(
+                    name=name, scope=self, last_valid_parent=parent_span
+                )
             else:
                 span = StreamedSpan(
                     name=name,

sentry_sdk/traces.py

@@ -632,16 +632,23 @@ def _set_segment_attributes(self) -> None:
 
 
 class NoOpStreamedSpan(StreamedSpan):
-    def __init__(self, *args, **kwargs):
+    # XXX[span-first]: make this actually no-op
+    def __init__(
+        self,
+        *args: "Any",
+        last_valid_parent: "Optional[StreamedSpan]" = None,
+        **kwargs: "Any",
+    ):
         self._sampled = False
+        self.last_valid_parent = last_valid_parent
 
     def __enter__(self) -> "NoOpStreamedSpan":
         return self
 
     def __exit__(
         self, ty: "Optional[Any]", value: "Optional[Any]", tb: "Optional[Any]"
     ) -> None:
-        return self
+        return
 
 
 def trace(

sentry_sdk/tracing_utils.py

@@ -1474,14 +1474,14 @@ def add_sentry_baggage_to_headers(
     )
 
 
-def is_ignored_span(name: str, attributes: "Attributes") -> bool:
+def is_ignored_span(name: str, attributes: "Optional[Attributes]") -> bool:
     client = sentry_sdk.get_client()
     ignore_spans = (client.options.get("_experiments") or {}).get("ignore_spans")
 
     if not ignore_spans:
         return False
 
-    def _match_name(rule: "Union[str, Pattern]") -> bool:
+    def _match_name(rule: "Union[str, Pattern[str]]") -> bool:
         if isinstance(rule, Pattern):
             return bool(rule.match(name))
         return rule == name
@@ -1499,14 +1499,19 @@ def _match_name(rule: "Union[str, Pattern]") -> bool:
                 name_matches = _match_name(rule["name"])
 
             if "attributes" in rule:
-                for attribute, value in rule["attributes"].items():
-                    if attribute not in attributes:
-                        attributes_match = False
-                        break
+                if not attributes:
+                    attributes_match = False
+                else:
+                    for attribute, value in rule["attributes"].items():
+                        if attribute not in attributes:
+                            attributes_match = False
+                            break
 
             if name_matches and attributes_match:
                 return True
 
+    return False
+
 
 # Circular imports
 from sentry_sdk.tracing import (

tests/tracing/test_span_streaming.py

@@ -954,7 +954,9 @@ def test_ignore_spans_promoting(sentry_init, capture_envelopes):
     assert len(spans) == 2
     (span1, span2) = spans
     assert span1["name"] == "not ignored 1"
+    assert span1["parent_span_id"] is None
     assert span2["name"] == "not ignored 2"
+    assert span2["parent_span_id"] is None
 
 
 def test_ignore_spans_reparenting(sentry_init, capture_envelopes):
@@ -985,6 +987,69 @@ def test_ignore_spans_reparenting(sentry_init, capture_envelopes):
     (span3, span1) = spans
     assert span1["name"] == "not ignored segment"
     assert span3["name"] == "not ignored child"
+    assert span3["parent_span_id"] == span1["span_id"]
+
+
+def test_ignore_spans_set_ignored_span_as_parent(sentry_init, capture_envelopes):
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={
+            "trace_lifecycle": "stream",
+            "ignore_spans": ["ignored"],
+        },
+    )
+
+    events = capture_envelopes()
+
+    with sentry_sdk.traces.start_span(name="ignored") as ignored_span:
+        assert ignored_span.sampled is False
+
+    with sentry_sdk.traces.start_span(
+        name="not ignored", parent_span=ignored_span
+    ) as span:
+        assert span.sampled is True
+        assert span.parent_span_id is None
+
+    sentry_sdk.get_client().flush()
+    spans = envelopes_to_spans(events)
+
+    assert len(spans) == 1
+    (span,) = spans
+    assert span["name"] == "not ignored"
+    assert span["parent_span_id"] is None
+
+
+def test_ignore_spans_set_ignored_child_span_as_parent(sentry_init, capture_envelopes):
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={
+            "trace_lifecycle": "stream",
+            "ignore_spans": ["ignored"],
+        },
+    )
+
+    events = capture_envelopes()
+
+    with sentry_sdk.traces.start_span(name="not ignored segment") as segment:
+        assert segment.sampled is True
+
+        with sentry_sdk.traces.start_span(name="ignored") as ignored_span:
+            assert ignored_span.sampled is False
+
+        with sentry_sdk.traces.start_span(
+            name="not ignored child", parent_span=ignored_span
+        ) as span:
+            assert span.sampled is True
+            assert span.parent_span_id == segment.span_id
+
+    sentry_sdk.get_client().flush()
+    spans = envelopes_to_spans(events)
+
+    assert len(spans) == 2
+    (child, segment) = spans
+    assert segment["name"] == "not ignored segment"
+    assert child["name"] == "not ignored child"
+    assert child["parent_span_id"] == segment["span_id"]
 
 
 def test_transport_format(sentry_init, capture_envelopes):