Merge branch 'potel-base' into ivana/potel/determine-lowest-otel-version

Author: sentrivana

docs/conf.py

@@ -33,7 +33,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.26.1"
+release = "3.0.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/__init__.py

@@ -1,4 +1,6 @@
-from sentry_sdk.scope import Scope
+# TODO-neel scope switch
+# TODO-neel avoid duplication between api and __init__
+from sentry_sdk.opentelemetry.scope import PotelScope as Scope
 from sentry_sdk.transport import Transport, HttpTransport
 from sentry_sdk.client import Client
 

sentry_sdk/consts.py

@@ -985,4 +985,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.26.1"
+VERSION = "3.0.0"

sentry_sdk/integrations/huey.py

@@ -111,11 +111,13 @@ def _capture_exception(exc_info):
     # type: (ExcInfo) -> None
     scope = sentry_sdk.get_current_scope()
 
-    if exc_info[0] in HUEY_CONTROL_FLOW_EXCEPTIONS:
-        scope.root_span.set_status(SPANSTATUS.ABORTED)
-        return
+    if scope.root_span is not None:
+        if exc_info[0] in HUEY_CONTROL_FLOW_EXCEPTIONS:
+            scope.root_span.set_status(SPANSTATUS.ABORTED)
+            return
+
+        scope.root_span.set_status(SPANSTATUS.INTERNAL_ERROR)
 
-    scope.root_span.set_status(SPANSTATUS.INTERNAL_ERROR)
     event, hint = event_from_exception(
         exc_info,
         client_options=sentry_sdk.get_client().options,
@@ -136,8 +138,10 @@ def _sentry_execute(*args, **kwargs):
             exc_info = sys.exc_info()
             _capture_exception(exc_info)
             reraise(*exc_info)
-        else:
-            sentry_sdk.get_current_scope().root_span.set_status(SPANSTATUS.OK)
+
+        root_span = sentry_sdk.get_current_scope().root_span
+        if root_span is not None:
+            root_span.set_status(SPANSTATUS.OK)
 
         return result
 

sentry_sdk/integrations/threading.py

@@ -4,6 +4,8 @@
 from threading import Thread, current_thread
 
 import sentry_sdk
+from sentry_sdk import Scope
+from sentry_sdk.scope import ScopeType
 from sentry_sdk.integrations import Integration
 from sentry_sdk.utils import (
     event_from_exception,
@@ -17,7 +19,6 @@
     from typing import Any
     from typing import TypeVar
     from typing import Callable
-    from typing import Optional
 
     from sentry_sdk._types import ExcInfo
 
@@ -75,8 +76,8 @@ def sentry_start(self, *a, **kw):
                     isolation_scope = sentry_sdk.get_isolation_scope().fork()
                     current_scope = sentry_sdk.get_current_scope().fork()
             else:
-                isolation_scope = None
-                current_scope = None
+                isolation_scope = Scope(ty=ScopeType.ISOLATION)
+                current_scope = Scope(ty=ScopeType.CURRENT)
 
             # Patching instance methods in `start()` creates a reference cycle if
             # done in a naive way. See
@@ -98,7 +99,7 @@ def sentry_start(self, *a, **kw):
 
 
 def _wrap_run(isolation_scope_to_use, current_scope_to_use, old_run_func):
-    # type: (Optional[sentry_sdk.Scope], Optional[sentry_sdk.Scope], F) -> F
+    # type: (sentry_sdk.Scope, sentry_sdk.Scope, F) -> F
     @wraps(old_run_func)
     def run(*a, **kw):
         # type: (*Any, **Any) -> Any
@@ -110,13 +111,8 @@ def _run_old_run_func():
             except Exception:
                 reraise(*_capture_exception())
 
-        if isolation_scope_to_use is not None and current_scope_to_use is not None:
-            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:
-            with sentry_sdk.isolation_scope() as scope:
-                scope.clear()
+        with sentry_sdk.use_isolation_scope(isolation_scope_to_use):
+            with sentry_sdk.use_scope(current_scope_to_use):
                 return _run_old_run_func()
 
     return run  # type: ignore

sentry_sdk/integrations/wsgi.py

@@ -254,7 +254,7 @@ class _ScopedResponse:
     __slots__ = ("_response", "_scope")
 
     def __init__(self, scope, response):
-        # type: (sentry_sdk.scope.Scope, Iterator[bytes]) -> None
+        # type: (sentry_sdk.Scope, Iterator[bytes]) -> None
         self._scope = scope
         self._response = response
 

sentry_sdk/opentelemetry/scope.py

@@ -175,7 +175,7 @@ def setup_scope_context_management():
 
 @contextmanager
 def isolation_scope():
-    # type: () -> Generator[Scope, None, None]
+    # type: () -> Generator[PotelScope, None, None]
     context = set_value(SENTRY_FORK_ISOLATION_SCOPE_KEY, True)
     token = attach(context)
     try:
@@ -186,7 +186,7 @@ def isolation_scope():
 
 @contextmanager
 def new_scope():
-    # type: () -> Generator[Scope, None, None]
+    # type: () -> Generator[PotelScope, None, None]
     token = attach(get_current())
     try:
         yield PotelScope.get_current_scope()
@@ -196,7 +196,7 @@ def new_scope():
 
 @contextmanager
 def use_scope(scope):
-    # type: (Scope) -> Generator[Scope, None, None]
+    # type: (PotelScope) -> Generator[PotelScope, None, None]
     context = set_value(SENTRY_USE_CURRENT_SCOPE_KEY, scope)
     token = attach(context)
 
@@ -208,7 +208,7 @@ def use_scope(scope):
 
 @contextmanager
 def use_isolation_scope(isolation_scope):
-    # type: (Scope) -> Generator[Scope, None, None]
+    # type: (PotelScope) -> Generator[PotelScope, None, None]
     context = set_value(SENTRY_USE_ISOLATION_SCOPE_KEY, isolation_scope)
     token = attach(context)
 

sentry_sdk/scope.py

@@ -692,19 +692,11 @@ def fingerprint(self, value):
 
     @property
     def root_span(self):
-        # type: () -> Any
-        # would be type: () -> Optional[Span], see https://github.com/python/mypy/issues/3004
+        # type: () -> Optional[Span]
         """Return the root span in the scope, if any."""
-
-        # there is no span/transaction on the scope
         if self._span is None:
             return None
 
-        # there is an orphan span on the scope
-        if self._span.root_span is None:
-            return None
-        # there is either a root span (which is its own root
-        # span) or a non-orphan span on the scope
         return self._span.root_span
 
     def set_transaction_name(self, name, source=None):

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.26.1",
+    version="3.0.0",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",