Revert tracing set_status change and just set OK properly in huey

Author: sl0thentr0py

sentry_sdk/integrations/huey.py

@@ -135,6 +135,8 @@ def _sentry_execute(*args, **kwargs):
             exc_info = sys.exc_info()
             _capture_exception(exc_info)
             reraise(*exc_info)
+        else:
+            sentry_sdk.get_current_scope().transaction.set_status(SPANSTATUS.OK)
 
         return result
 
@@ -165,9 +167,7 @@ def _sentry_execute(self, task, timestamp=None):
                     op=OP.QUEUE_TASK_HUEY,
                     source=TRANSACTION_SOURCE_TASK,
                     origin=HueyIntegration.origin,
-                ) as transaction:
-                    return_value = old_execute(self, task, timestamp)
-                    transaction.set_status(SPANSTATUS.OK)
-                    return return_value
+                ):
+                    return old_execute(self, task, timestamp)
 
     Huey._execute = _sentry_execute

sentry_sdk/tracing.py

@@ -1541,17 +1541,13 @@ def set_attribute(self, key, value):
     def set_status(self, status):
         # type: (str) -> None
         if status == SPANSTATUS.OK:
-            # Do not set status if it's already set.
-            # We would override an error status with OK.
-            if self._otel_span.status.status_code == StatusCode.UNSET:
-                self._otel_span.set_status(StatusCode.OK, None)
+            otel_status = StatusCode.OK
+            otel_description = None
         else:
-            # OpenTelemetry does not allow setting and error status
-            # if the span is already set to OK
-            if self._otel_span.status.status_code == StatusCode.OK:
-                return
+            otel_status = StatusCode.ERROR
+            otel_description = status
 
-            self._otel_span.set_status(StatusCode.ERROR, status)
+        self._otel_span.set_status(otel_status, otel_description)
 
     def set_measurement(self, name, value, unit=""):
         # type: (str, float, MeasurementUnit) -> None