ref(scope): Properly type Scope.root_span

Currently, this property has type `Any`, but it can now be changed to `Optional[Span]`

Depends on:
  - #4263

Author: szokeasaurusrex

sentry_sdk/integrations/huey.py

@@ -110,11 +110,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,
@@ -135,8 +137,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/scope.py

@@ -689,8 +689,7 @@ 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