more warden stuff

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -321,7 +321,7 @@ def _inner(*args: "Any", **kwargs: "Any") -> "Any":
             scope.add_event_processor(_make_event_processor(task, *args, **kwargs))
 
             transaction: "Optional[Union[Span, StreamedSpan]]" = None
-            span_ctx: "Union[Span, StreamedSpan]"
+            span_ctx: "Optional[Union[Span, StreamedSpan]]" = None
 
             # Celery task objects are not a thing to be trusted. Even
             # something such as attribute access can fail.
@@ -359,7 +359,7 @@ def _inner(*args: "Any", **kwargs: "Any") -> "Any":
                         },
                     )
 
-            if transaction is None:
+            if transaction is None or span_ctx is None:
                 return f(*args, **kwargs)
 
             with span_ctx:

sentry_sdk/integrations/strawberry.py

@@ -260,6 +260,7 @@ def on_parse(self) -> "Generator[None, None, None]":
         if isinstance(self.graphql_span, StreamedSpan):
             self.parsing_span = sentry_sdk.traces.start_span(
                 name="parsing",
+                parent_span=self.graphql_span,
             )
             self.parsing_span.set_op(OP.GRAPHQL_PARSE)
             self.parsing_span.set_origin(StrawberryIntegration.origin)

sentry_sdk/scope.py

@@ -825,7 +825,10 @@ def set_transaction_name(self, name: str, source: "Optional[str]" = None) -> Non
         """Set the transaction name and optionally the transaction source."""
         self._transaction = name
         if self._span:
-            if isinstance(self._span, StreamedSpan):
+            if isinstance(self._span, NoOpStreamedSpan):
+                return
+
+            elif isinstance(self._span, StreamedSpan):
                 self._span.segment.set_name(name)
                 if source:
                     self._span.segment.set_source(source)