Skip to content

fix(asyncio): fork task scope when task is created #8022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bhabishnu wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(asyncio): fork task scope when task is created #8022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion sentry_sdk/integrations/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
import sentry_sdk
from sentry_sdk.consts import OP
from sentry_sdk.integrations import DidNotEnable, Integration
from sentry_sdk.scope import Scope, ScopeType, _current_scope, use_scope
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing import Span
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.transport import AsyncHttpTransport
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
event_from_exception,
is_internal_task,
logger,
Expand Down Expand Up @@ -142,6 +144,21 @@ def _sentry_task_factory(
orig_task_factory, loop, coro, **kwargs
)

# Fork the current scope when the task is created rather than when
# it first runs, so the task's span isn't parented to whatever span
# is current by then.
context = kwargs.get("context")
if context is None or not HAS_REAL_CONTEXTVARS:
current_scope = sentry_sdk.get_current_scope()
else:
# Unlike Context.run(), Context.get() also works on a context
# that is already entered
current_scope = context.get(_current_scope)
if current_scope is None:
current_scope = Scope(ty=ScopeType.CURRENT)

forked_current_scope = current_scope.fork()

@_wrap_coroutine(coro)
async def _task_with_sentry_span_creation() -> "Any":
result = None
Expand All @@ -152,7 +169,7 @@ async def _task_with_sentry_span_creation() -> "Any":
span_ctx: "Optional[Union[StreamedSpan, Span]]" = None
is_span_streaming_enabled = has_span_streaming_enabled(client.options)

with sentry_sdk.isolation_scope():
with sentry_sdk.isolation_scope(), use_scope(forked_current_scope):
if task_spans:
if is_span_streaming_enabled:
if sentry_sdk.traces.get_current_span() is not None:
Expand Down
Loading