Merge branch 'potel-base' into potel-base-run-all-tests

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

tests/integrations/starlette/test_starlette.py

@@ -659,9 +659,9 @@ def test_middleware_spans(sentry_init, capture_events):
         "AuthenticationMiddleware",
         "ExceptionMiddleware",
         "AuthenticationMiddleware",  # 'op': 'middleware.starlette.send'
-        "ServerErrorMiddleware",  # 'op': 'middleware.starlette.send'
         "AuthenticationMiddleware",  # 'op': 'middleware.starlette.send'
         "ServerErrorMiddleware",  # 'op': 'middleware.starlette.send'
+        "ServerErrorMiddleware",  # 'op': 'middleware.starlette.send'
     ]
 
     assert len(transaction_event["spans"]) == len(expected_middleware_spans)
@@ -736,23 +736,23 @@ def test_middleware_callback_spans(sentry_init, capture_events):
         },
         {
             "op": "middleware.starlette.send",
-            "description": "ServerErrorMiddleware.__call__.<locals>._send",
-            "tags": {"starlette.middleware_name": "SampleMiddleware"},
+            "description": "SampleMiddleware.__call__.<locals>.do_stuff",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
         },
         {
             "op": "middleware.starlette.send",
-            "description": "SentryAsgiMiddleware._run_app.<locals>._sentry_wrapped_send",
-            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+            "description": "ServerErrorMiddleware.__call__.<locals>._send",
+            "tags": {"starlette.middleware_name": "SampleMiddleware"},
         },
         {
             "op": "middleware.starlette.send",
-            "description": "SampleMiddleware.__call__.<locals>.do_stuff",
-            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+            "description": "ServerErrorMiddleware.__call__.<locals>._send",
+            "tags": {"starlette.middleware_name": "SampleMiddleware"},
         },
         {
             "op": "middleware.starlette.send",
-            "description": "ServerErrorMiddleware.__call__.<locals>._send",
-            "tags": {"starlette.middleware_name": "SampleMiddleware"},
+            "description": "SentryAsgiMiddleware._run_app.<locals>._sentry_wrapped_send",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
         },
         {
             "op": "middleware.starlette.send",
@@ -830,16 +830,16 @@ def test_middleware_partial_receive_send(sentry_init, capture_events):
             "description": "ServerErrorMiddleware.__call__.<locals>._send",
             "tags": {"starlette.middleware_name": "SamplePartialReceiveSendMiddleware"},
         },
-        {
-            "op": "middleware.starlette.send",
-            "description": "SentryAsgiMiddleware._run_app.<locals>._sentry_wrapped_send",
-            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
-        },
         {
             "op": "middleware.starlette",
             "description": "ExceptionMiddleware",
             "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
         },
+        {
+            "op": "middleware.starlette.send",
+            "description": "SentryAsgiMiddleware._run_app.<locals>._sentry_wrapped_send",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
         {
             "op": "middleware.starlette.send",
             "description": "functools.partial(<function SamplePartialReceiveSendMiddleware.__call__.<locals>.my_send at ",
@@ -886,13 +886,13 @@ def test_active_thread_id(sentry_init, capture_envelopes, teardown_profiling, en
     sentry_init(
         traces_sample_rate=1.0,
         profiles_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
     )
     app = starlette_app_factory()
-    asgi_app = SentryAsgiMiddleware(app)
 
     envelopes = capture_envelopes()
 
-    client = TestClient(asgi_app)
+    client = TestClient(app)
     response = client.get(endpoint)
     assert response.status_code == 200
 
@@ -1244,9 +1244,7 @@ def test_transaction_http_method_default(sentry_init, capture_events):
     """
     sentry_init(
         traces_sample_rate=1.0,
-        integrations=[
-            StarletteIntegration(),
-        ],
+        integrations=[StarletteIntegration()],
     )
     events = capture_events()