fix source and txn name

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -339,8 +339,6 @@ def _inner(*args: "Any", **kwargs: "Any") -> "Any":
                 }
             }
 
-            scope.set_transaction_name(task.name, source=TransactionSource.TASK)
-
             span: "Union[Span, StreamedSpan]"
             span_ctx: "Union[StreamedSpan, Span, NoOpMgr]" = NoOpMgr()
 

sentry_sdk/scope.py

@@ -893,6 +893,19 @@ def span(self, span: "Optional[Union[Span, StreamedSpan]]") -> None:
                 if transaction.source:
                     self._transaction_info["source"] = transaction.source
 
+        # Also set _transaction and _transaction_info in streaming mode as this
+        # is used for populating events and linking them to segments
+        if (
+            isinstance(span, StreamedSpan)
+            and not isinstance(span, NoOpStreamedSpan)
+            and span._is_segment
+        ):
+            self._transaction = span.name
+            if span._attributes.get("sentry.span.source"):
+                self._transaction_info["source"] = span._attributes[
+                    "sentry.span.source"
+                ]
+
     @property
     def profile(self) -> "Optional[Profile]":
         return self._profile

tests/integrations/celery/test_celery.py

@@ -522,7 +522,7 @@ def test_traces_sampler_gets_task_info_in_sampling_context(
     celery_invocation,
     DictionaryContaining,  # noqa:N803
 ):
-    traces_sampler = mock.Mock()
+    traces_sampler = mock.Mock(return_value=1.0)
     celery = init_celery(
         traces_sampler=traces_sampler,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},