From 71ca69dbcb3df1a6f99309eb483e2b027116033c Mon Sep 17 00:00:00 2001 From: Tony Xiao Date: Wed, 28 Aug 2024 09:26:43 -0400 Subject: [PATCH] fix(sentry-sdk): Use existing scope in thread (#76624) If the scope is forked, tags set in the forked scope will not be set on the event started on the original scope. --- src/sentry/utils/concurrent.py | 4 ++-- src/sentry/utils/snuba.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sentry/utils/concurrent.py b/src/sentry/utils/concurrent.py index e45b455ce95b84..88e13294c17ef9 100644 --- a/src/sentry/utils/concurrent.py +++ b/src/sentry/utils/concurrent.py @@ -241,8 +241,8 @@ def submit(self, callable, priority=0, block=True, timeout=None): task = PriorityTask( priority, ( - sentry_sdk.Scope.get_isolation_scope().fork(), - sentry_sdk.Scope.get_current_scope().fork(), + sentry_sdk.Scope.get_isolation_scope(), + sentry_sdk.Scope.get_current_scope(), callable, future, ), diff --git a/src/sentry/utils/snuba.py b/src/sentry/utils/snuba.py index 49b474670c3930..b45eaca28096e2 100644 --- a/src/sentry/utils/snuba.py +++ b/src/sentry/utils/snuba.py @@ -1097,8 +1097,8 @@ def _bulk_snuba_query(snuba_requests: Sequence[SnubaRequest]) -> ResultSet: _snuba_query, [ ( - sentry_sdk.Scope.get_isolation_scope().fork(), - sentry_sdk.Scope.get_current_scope().fork(), + sentry_sdk.Scope.get_isolation_scope(), + sentry_sdk.Scope.get_current_scope(), snuba_request, ) for snuba_request in snuba_requests_list @@ -1110,8 +1110,8 @@ def _bulk_snuba_query(snuba_requests: Sequence[SnubaRequest]) -> ResultSet: query_results = [ _snuba_query( ( - sentry_sdk.Scope.get_isolation_scope().fork(), - sentry_sdk.Scope.get_current_scope().fork(), + sentry_sdk.Scope.get_isolation_scope(), + sentry_sdk.Scope.get_current_scope(), snuba_requests_list[0], ) )