Skip to content
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

Jump to bottom

Use POTel use_scope, use_isolation_scope #3522

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Use POTel use_scope, use_isolation_scope #3522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c02da5b
use potelscope
sentrivana Sep 11, 2024
79fc4a3
Use POTel use_{isolation_}scope
sentrivana Sep 11, 2024
7af488c
use from top level api
sentrivana Sep 11, 2024
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
4 changes: 4 additions & 0 deletions sentry_sdk/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
PotelScope as Scope,
new_scope,
isolation_scope,
use_scope,
use_isolation_scope,
)


Expand Down Expand Up @@ -77,6 +79,8 @@
"start_transaction",
"trace",
"monitor",
"use_scope",
"use_isolation_scope",
]


Expand Down
5 changes: 2 additions & 3 deletions sentry_sdk/integrations/threading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import sentry_sdk
from sentry_sdk.integrations import Integration
from sentry_sdk.scope import use_isolation_scope, use_scope
from sentry_sdk.utils import (
ensure_integration_enabled,
event_from_exception,
Expand Down Expand Up @@ -95,8 +94,8 @@ def _run_old_run_func():
reraise(*_capture_exception())

if isolation_scope_to_use is not None and current_scope_to_use is not None:
with use_isolation_scope(isolation_scope_to_use):
with use_scope(current_scope_to_use):
with sentry_sdk.use_isolation_scope(isolation_scope_to_use):
with sentry_sdk.use_scope(current_scope_to_use):
return _run_old_run_func()
else:
return _run_old_run_func()
Expand Down
5 changes: 2 additions & 3 deletions sentry_sdk/integrations/wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from sentry_sdk.scope import should_send_default_pii
from sentry_sdk.integrations._wsgi_common import _filter_headers
from sentry_sdk.sessions import track_session
from sentry_sdk.scope import use_isolation_scope
from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
from sentry_sdk.utils import (
ContextVar,
Expand Down Expand Up @@ -219,7 +218,7 @@ def __iter__(self):
iterator = iter(self._response)

while True:
with use_isolation_scope(self._scope):
with sentry_sdk.use_isolation_scope(self._scope):
try:
chunk = next(iterator)
except StopIteration:
Expand All @@ -231,7 +230,7 @@ def __iter__(self):

def close(self):
# type: () -> None
with use_isolation_scope(self._scope):
with sentry_sdk.use_isolation_scope(self._scope):
try:
self._response.close() # type: ignore
except AttributeError:
Expand Down
Loading