Address code review comments

Author: ericapisani

sentry_sdk/integrations/huey.py

@@ -16,6 +16,7 @@
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import (
     SENSITIVE_DATA_SUBSTITUTE,
+    _register_control_flow_exception,
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
@@ -55,6 +56,9 @@ class HueyIntegration(Integration):
     def setup_once() -> None:
         patch_enqueue()
         patch_execute()
+        _register_control_flow_exception(
+            [CancelExecution, RetryTask, TaskLockedException]
+        )
 
 
 def patch_enqueue() -> None:

sentry_sdk/utils.py

@@ -90,7 +90,7 @@
 
 # These exceptions won't set the span status to error if they occur. Use
 # register_control_flow_exception to add to this list
-_control_flow_exception_classes: "list[type]" = []
+_control_flow_exception_classes: "set[type]" = set()
 
 
 def is_internal_task() -> bool:
@@ -1982,8 +1982,13 @@ def get_current_thread_meta(
     return None, None
 
 
-def _register_control_flow_exception(exc_type: type) -> None:
-    _control_flow_exception_classes.append(exc_type)
+def _register_control_flow_exception(
+    exc_type: "Union[type, list[type], tuple[type], set[type]]",
+) -> None:
+    if isinstance(exc_type, (list, tuple, set)):
+        _control_flow_exception_classes.update(exc_type)
+    else:
+        _control_flow_exception_classes.add(exc_type)
 
 
 def should_be_treated_as_error(ty: "Any", value: "Any") -> bool:

tests/integrations/huey/test_huey.py

@@ -283,7 +283,7 @@ def maybe_locked_task():
         assert (
             event["contexts"]["trace"]["status"] == "aborted"
             if should_be_locked
-            else "ok"
+            else event["contexts"]["trace"]["status"] == "ok"
         )
     assert len(huey) == 0