Merge branch 'master' into webb/openai-agents/transaction

Author: alexander-alderman-webb

scripts/test-lambda-locally/uv.lock

@@ -6,7 +6,6 @@
 from sentry_sdk.ai.monitoring import record_token_usage
 from sentry_sdk.ai.utils import get_start_span_function, set_data_normalized
 from sentry_sdk.consts import SPANDATA
-from sentry_sdk.tracing_utils import set_span_errored
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Iterator
@@ -83,8 +82,6 @@ def setup_once() -> None:
 
 
 def _capture_exception(exc: "Any") -> None:
-    set_span_errored()
-
     event, hint = event_from_exception(
         exc,
         client_options=sentry_sdk.get_client().options,
@@ -154,7 +151,7 @@ def new_chat(*args: "Any", **kwargs: "Any") -> "Any":
             exc_info = sys.exc_info()
             with capture_internal_exceptions():
                 _capture_exception(e)
-                span.__exit__(None, None, None)
+                span.__exit__(*exc_info)
             reraise(*exc_info)
 
         with capture_internal_exceptions():

sentry_sdk/integrations/cohere.py

@@ -19,7 +19,7 @@
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.tracing_utils import _get_value, set_span_errored
+from sentry_sdk.tracing_utils import _get_value
 from sentry_sdk.utils import capture_internal_exceptions, logger
 
 if TYPE_CHECKING:
@@ -273,11 +273,10 @@ def _handle_error(self, run_id: "UUID", error: "Any") -> None:
 
             span_data = self.span_map[run_id]
             span = span_data.span
-            set_span_errored(span)
 
             sentry_sdk.capture_exception(error, span.scope)
 
-            span.__exit__(None, None, None)
+            span.__exit__(type(error), error, error.__traceback__)
             del self.span_map[run_id]
 
     def _normalize_langchain_message(self, message: "BaseMessage") -> "Any":
@@ -1112,13 +1111,13 @@ def new_iterator() -> "Iterator[Any]":
                     and integration.include_prompts
                 ):
                     set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_TEXT, output)
+
+                span.__exit__(None, None, None)
             except Exception:
                 exc_info = sys.exc_info()
-                set_span_errored(span)
+                with capture_internal_exceptions():
+                    span.__exit__(*exc_info)
                 raise
-            finally:
-                # Ensure cleanup happens even if iterator is abandoned or fails
-                span.__exit__(*exc_info)
 
         async def new_iterator_async() -> "AsyncIterator[Any]":
             exc_info: "tuple[Any, Any, Any]" = (None, None, None)
@@ -1137,13 +1136,13 @@ async def new_iterator_async() -> "AsyncIterator[Any]":
                     and integration.include_prompts
                 ):
                     set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_TEXT, output)
+
+                span.__exit__(None, None, None)
             except Exception:
                 exc_info = sys.exc_info()
-                set_span_errored(span)
+                with capture_internal_exceptions():
+                    span.__exit__(*exc_info)
                 raise
-            finally:
-                # Ensure cleanup happens even if iterator is abandoned or fails
-                span.__exit__(*exc_info)
 
         if str(type(result)) == "<class 'async_generator'>":
             result = new_iterator_async()

sentry_sdk/integrations/langchain.py

@@ -4,7 +4,6 @@
 import sentry_sdk
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.tracing_utils import set_span_errored
 from sentry_sdk.utils import event_from_exception, safe_serialize
 
 if TYPE_CHECKING:
@@ -207,8 +206,6 @@ def _set_available_tools(span: "sentry_sdk.tracing.Span", agent: "Any") -> None:
 
 
 def _capture_exception(exc: "Any", handled: bool = False) -> None:
-    set_span_errored()
-
     event, hint = event_from_exception(
         exc,
         client_options=sentry_sdk.get_client().options,

sentry_sdk/integrations/pydantic_ai/utils.py

@@ -119,9 +119,9 @@ def _sentry_patched_schema_init(
         ]
 
         # add our extension
-        extensions.append(
+        extensions = [
             SentryAsyncExtension if should_use_async_extension else SentrySyncExtension
-        )
+        ] + extensions
 
         kwargs["extensions"] = extensions
 
@@ -152,7 +152,7 @@ def hash_query(self, query: str) -> str:
         return hashlib.md5(query.encode("utf-8")).hexdigest()
 
     def on_operation(self) -> "Generator[None, None, None]":
-        self._operation_name = self.execution_context.operation_name
+        operation_name = self.execution_context.operation_name
 
         operation_type = "query"
         op = OP.GRAPHQL_QUERY
@@ -168,13 +168,13 @@ def on_operation(self) -> "Generator[None, None, None]":
             op = OP.GRAPHQL_SUBSCRIPTION
 
         description = operation_type
-        if self._operation_name:
-            description += " {}".format(self._operation_name)
+        if operation_name:
+            description += " {}".format(operation_name)
 
         sentry_sdk.add_breadcrumb(
             category="graphql.operation",
             data={
-                "operation_name": self._operation_name,
+                "operation_name": operation_name,
                 "operation_type": operation_type,
             },
         )
@@ -183,50 +183,50 @@ def on_operation(self) -> "Generator[None, None, None]":
         event_processor = _make_request_event_processor(self.execution_context)
         scope.add_event_processor(event_processor)
 
-        self.graphql_span = sentry_sdk.start_span(
+        graphql_span = sentry_sdk.start_span(
             op=op,
             name=description,
             origin=StrawberryIntegration.origin,
         )
-        self.graphql_span.__enter__()
+        graphql_span.__enter__()
 
-        self.graphql_span.set_data("graphql.operation.type", operation_type)
-        self.graphql_span.set_data("graphql.operation.name", self._operation_name)
+        graphql_span.set_data("graphql.operation.type", operation_type)
+        graphql_span.set_data("graphql.operation.name", operation_name)
         if should_send_default_pii():
-            self.graphql_span.set_data("graphql.document", self.execution_context.query)
-        self.graphql_span.set_data("graphql.resource_name", self._resource_name)
+            graphql_span.set_data("graphql.document", self.execution_context.query)
+        graphql_span.set_data("graphql.resource_name", self._resource_name)
 
         yield
 
-        transaction = self.graphql_span.containing_transaction
+        transaction = graphql_span.containing_transaction
         if transaction and self.execution_context.operation_name:
             transaction.name = self.execution_context.operation_name
             transaction.source = TransactionSource.COMPONENT
             transaction.op = op
 
-        self.graphql_span.__exit__(None, None, None)
+        graphql_span.__exit__(None, None, None)
 
     def on_validate(self) -> "Generator[None, None, None]":
-        self.validation_span = self.graphql_span.start_child(
+        validation_span = sentry_sdk.start_span(
             op=OP.GRAPHQL_VALIDATE,
             name="validation",
             origin=StrawberryIntegration.origin,
         )
 
         yield
 
-        self.validation_span.finish()
+        validation_span.finish()
 
     def on_parse(self) -> "Generator[None, None, None]":
-        self.parsing_span = self.graphql_span.start_child(
+        parsing_span = sentry_sdk.start_span(
             op=OP.GRAPHQL_PARSE,
             name="parsing",
             origin=StrawberryIntegration.origin,
         )
 
         yield
 
-        self.parsing_span.finish()
+        parsing_span.finish()
 
     def should_skip_tracing(
         self,
@@ -263,7 +263,7 @@ async def resolve(
 
         field_path = "{}.{}".format(info.parent_type, info.field_name)
 
-        with self.graphql_span.start_child(
+        with sentry_sdk.start_span(
             op=OP.GRAPHQL_RESOLVE,
             name="resolving {}".format(field_path),
             origin=StrawberryIntegration.origin,
@@ -290,7 +290,7 @@ def resolve(
 
         field_path = "{}.{}".format(info.parent_type, info.field_name)
 
-        with self.graphql_span.start_child(
+        with sentry_sdk.start_span(
             op=OP.GRAPHQL_RESOLVE,
             name="resolving {}".format(field_path),
             origin=StrawberryIntegration.origin,

sentry_sdk/integrations/strawberry.py

@@ -183,7 +183,6 @@ def test_span_status_error(sentry_init, capture_events):
     assert error["level"] == "error"
     assert transaction["spans"][0]["status"] == "internal_error"
     assert transaction["spans"][0]["tags"]["status"] == "internal_error"
-    assert transaction["contexts"]["trace"]["status"] == "internal_error"
 
 
 @pytest.mark.parametrize(

tests/integrations/cohere/test_cohere.py

@@ -2561,8 +2561,6 @@ def _llm_type(self) -> str:
         assert transaction["spans"][0]["status"] == "internal_error"
         assert transaction["spans"][0]["tags"]["status"] == "internal_error"
 
-    assert transaction["contexts"]["trace"]["status"] == "internal_error"
-
 
 def test_manual_callback_no_duplication(sentry_init):
     """