Remove unsupported SPANSTATUS.ERROR

Author: sl0thentr0py

sentry_sdk/consts.py

@@ -864,20 +864,18 @@ class SPANSTATUS:
     CANCELLED = "cancelled"
     DATA_LOSS = "data_loss"
     DEADLINE_EXCEEDED = "deadline_exceeded"
-    ERROR = "error"  # OTel status code: https://opentelemetry.io/docs/concepts/signals/traces/#span-status
     FAILED_PRECONDITION = "failed_precondition"
     INTERNAL_ERROR = "internal_error"
     INVALID_ARGUMENT = "invalid_argument"
     NOT_FOUND = "not_found"
-    OK = "ok"  # HTTP 200 and OTel status code: https://opentelemetry.io/docs/concepts/signals/traces/#span-status
+    OK = "ok"
     OUT_OF_RANGE = "out_of_range"
     PERMISSION_DENIED = "permission_denied"
     RESOURCE_EXHAUSTED = "resource_exhausted"
     UNAUTHENTICATED = "unauthenticated"
     UNAVAILABLE = "unavailable"
     UNIMPLEMENTED = "unimplemented"
     UNKNOWN_ERROR = "unknown_error"
-    UNSET = "unset"  # OTel status code: https://opentelemetry.io/docs/concepts/signals/traces/#span-status
 
 
 class OP:

sentry_sdk/integrations/anthropic.py

@@ -381,7 +381,7 @@ def _sentry_patched_create_sync(*args, **kwargs):
             return _execute_sync(f, *args, **kwargs)
         finally:
             span = sentry_sdk.get_current_span()
-            if span is not None and span.status == SPANSTATUS.ERROR:
+            if span is not None and span.status == SPANSTATUS.INTERNAL_ERROR:
                 with capture_internal_exceptions():
                     span.__exit__(None, None, None)
 
@@ -420,7 +420,7 @@ async def _sentry_patched_create_async(*args, **kwargs):
             return await _execute_async(f, *args, **kwargs)
         finally:
             span = sentry_sdk.get_current_span()
-            if span is not None and span.status == SPANSTATUS.ERROR:
+            if span is not None and span.status == SPANSTATUS.INTERNAL_ERROR:
                 with capture_internal_exceptions():
                     span.__exit__(None, None, None)
 

sentry_sdk/integrations/google_genai/__init__.py

@@ -107,7 +107,7 @@ def new_iterator():
                         yield chunk
                 except Exception as exc:
                     _capture_exception(exc)
-                    chat_span.set_status(SPANSTATUS.ERROR)
+                    chat_span.set_status(SPANSTATUS.INTERNAL_ERROR)
                     raise
                 finally:
                     # Accumulate all chunks and set final response data on spans
@@ -181,7 +181,7 @@ async def new_async_iterator():
                         yield chunk
                 except Exception as exc:
                     _capture_exception(exc)
-                    chat_span.set_status(SPANSTATUS.ERROR)
+                    chat_span.set_status(SPANSTATUS.INTERNAL_ERROR)
                     raise
                 finally:
                     # Accumulate all chunks and set final response data on spans
@@ -244,7 +244,7 @@ def new_generate_content(self, *args, **kwargs):
                     response = f(self, *args, **kwargs)
                 except Exception as exc:
                     _capture_exception(exc)
-                    chat_span.set_status(SPANSTATUS.ERROR)
+                    chat_span.set_status(SPANSTATUS.INTERNAL_ERROR)
                     raise
 
                 set_span_data_for_response(chat_span, integration, response)
@@ -290,7 +290,7 @@ async def new_async_generate_content(self, *args, **kwargs):
                     response = await f(self, *args, **kwargs)
                 except Exception as exc:
                     _capture_exception(exc)
-                    chat_span.set_status(SPANSTATUS.ERROR)
+                    chat_span.set_status(SPANSTATUS.INTERNAL_ERROR)
                     raise
 
                 set_span_data_for_response(chat_span, integration, response)

sentry_sdk/integrations/openai_agents/spans/execute_tool.py

@@ -42,7 +42,7 @@ def update_execute_tool_span(span, agent, tool, result):
     if isinstance(result, str) and result.startswith(
         "An error occurred while running the tool"
     ):
-        span.set_status(SPANSTATUS.ERROR)
+        span.set_status(SPANSTATUS.INTERNAL_ERROR)
 
     if should_send_default_pii():
         span.set_data(SPANDATA.GEN_AI_TOOL_OUTPUT, result)

sentry_sdk/integrations/openai_agents/utils.py

@@ -196,4 +196,4 @@ def _create_mcp_execute_tool_spans(span, result):
                         SPANDATA.GEN_AI_TOOL_OUTPUT, output.output
                     )
                 if output.error:
-                    execute_tool_span.set_status(SPANSTATUS.ERROR)
+                    execute_tool_span.set_status(SPANSTATUS.INTERNAL_ERROR)

sentry_sdk/tracing.py

@@ -408,8 +408,7 @@ def __enter__(self):
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
         if value is not None and should_be_treated_as_error(ty, value):
-            if self.status != SPANSTATUS.ERROR:
-                self.set_status(SPANSTATUS.INTERNAL_ERROR)
+            self.set_status(SPANSTATUS.INTERNAL_ERROR)
 
         with capture_internal_exceptions():
             scope, old_span = self._context_manager_state

sentry_sdk/tracing_utils.py

@@ -933,14 +933,14 @@ def get_current_span(scope=None):
 def set_span_errored(span=None):
     # type: (Optional[Span]) -> None
     """
-    Set the status of the current or given span to ERROR.
-    Also sets the status of the transaction (root span) to ERROR.
+    Set the status of the current or given span to INTERNAL_ERROR.
+    Also sets the status of the transaction (root span) to INTERNAL_ERROR.
     """
     span = span or get_current_span()
     if span is not None:
-        span.set_status(SPANSTATUS.ERROR)
+        span.set_status(SPANSTATUS.INTERNAL_ERROR)
         if span.containing_transaction is not None:
-            span.containing_transaction.set_status(SPANSTATUS.ERROR)
+            span.containing_transaction.set_status(SPANSTATUS.INTERNAL_ERROR)
 
 
 def _generate_sample_rand(