Merge branch 'master' into webb/requirements-testing/tomli

Author: alexander-alderman-webb

docs/_static/.gitkeep

@@ -95,6 +95,8 @@
 # documentation.
 #
 html_theme_options = {
+    "light_logo": "_static/logo-light.svg",
+    "dark_logo": "_static/logo-dark.svg",
     "github_url": "https://github.com/getsentry/sentry-python",
 }
 

docs/_static/logo-dark.svg

@@ -1,10 +1,8 @@
-pip
 pytest>=6.0.0
 pytest-cov
 pytest-forked
 pytest-localserver
 pytest-timeout
-pytest-watch
 jsonschema
 executing
 asttokens

docs/_static/logo-light.svg

@@ -1180,6 +1180,8 @@ class OP:
     COHERE_CHAT_COMPLETIONS_CREATE = "ai.chat_completions.create.cohere"
     COHERE_EMBEDDINGS_CREATE = "ai.embeddings.create.cohere"
     DB = "db"
+    DB_CURSOR_ITERATOR = "db.cursor.iter"
+    DB_CURSOR_FETCH = "db.cursor.fetch"
     DB_REDIS = "db.redis"
     EVENT_DJANGO = "event.django"
     FUNCTION = "function"

docs/conf.py

@@ -20,8 +20,12 @@
 )
 
 try:
-    import asyncpg  # type: ignore[import-not-found]
-    from asyncpg.cursor import BaseCursor  # type: ignore
+    import asyncpg  # type: ignore
+    from asyncpg.cursor import (  # type: ignore
+        BaseCursor,
+        Cursor,
+        CursorIterator,
+    )
 
 except ImportError:
     raise DidNotEnable("asyncpg not installed.")
@@ -169,6 +173,13 @@ async def _inner(*args: "Any", **kwargs: "Any") -> "T":
             return await f(*args, **kwargs)
 
         cursor = args[0]
+        if type(cursor) is CursorIterator:
+            span_op_override_value = OP.DB_CURSOR_ITERATOR
+        elif type(cursor) is Cursor:
+            span_op_override_value = OP.DB_CURSOR_FETCH
+        else:
+            span_op_override_value = None
+
         query = _normalize_query(cursor._query)
         with record_sql_queries(
             cursor=cursor,
@@ -178,6 +189,7 @@ async def _inner(*args: "Any", **kwargs: "Any") -> "T":
             executemany=False,
             record_cursor_repr=True,
             span_origin=AsyncPGIntegration.origin,
+            span_op_override_value=span_op_override_value,
         ) as span:
             _set_db_data(span, cursor._connection)
             res = await f(*args, **kwargs)

requirements-testing.txt

@@ -210,6 +210,8 @@ class LangchainIntegration(Integration):
     identifier = "langchain"
     origin = f"auto.ai.{identifier}"
 
+    _ignored_exceptions: "set[type[Exception]]" = set()
+
     def __init__(
         self: "LangchainIntegration",
         include_prompts: bool = True,
@@ -262,17 +264,22 @@ def gc_span_map(self) -> None:
                 self._exit_span(span, run_id)
 
     def _handle_error(self, run_id: "UUID", error: "Any") -> None:
+        is_ignored = isinstance(error, tuple(LangchainIntegration._ignored_exceptions))
+
         with capture_internal_exceptions():
             if not run_id or run_id not in self.span_map:
                 return
 
             span = self.span_map[run_id]
 
-            sentry_sdk.capture_exception(
-                error, span._scope if isinstance(span, StreamedSpan) else span.scope
-            )
+            if is_ignored:
+                span.__exit__(None, None, None)
+            else:
+                sentry_sdk.capture_exception(
+                    error, span._scope if isinstance(span, StreamedSpan) else span.scope
+                )
+                span.__exit__(type(error), error, error.__traceback__)
 
-            span.__exit__(type(error), error, error.__traceback__)
             del self.span_map[run_id]
 
     def _normalize_langchain_message(self, message: "BaseMessage") -> "Any":

sentry_sdk/consts.py

@@ -10,6 +10,9 @@
 )
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
+
+# This is fine because langgraph depends on langchain-base, and LangchainIntegration only imports from langchain-base.
+from sentry_sdk.integrations.langchain import LangchainIntegration
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing_utils import (
@@ -19,6 +22,7 @@
 from sentry_sdk.utils import safe_serialize
 
 try:
+    from langgraph.errors import GraphBubbleUp
     from langgraph.graph import StateGraph
     from langgraph.pregel import Pregel
 except ImportError:
@@ -34,6 +38,7 @@ def __init__(self: "LanggraphIntegration", include_prompts: bool = True) -> None
 
     @staticmethod
     def setup_once() -> None:
+        LangchainIntegration._ignored_exceptions.add(GraphBubbleUp)
         # LangGraph lets users create agents using a StateGraph or the Functional API.
         # StateGraphs are then compiled to a CompiledStateGraph. Both CompiledStateGraph and
         # the functional API execute on a Pregel instance. Pregel is the runtime for the graph

sentry_sdk/integrations/asyncpg.py

@@ -134,6 +134,7 @@ def record_sql_queries(
     executemany: bool,
     record_cursor_repr: bool = False,
     span_origin: str = "manual",
+    span_op_override_value: "Optional[str]" = None,
 ) -> "Generator[Union[sentry_sdk.tracing.Span, sentry_sdk.traces.StreamedSpan], None, None]":
     # TODO: Bring back capturing of params by default
     client = sentry_sdk.get_client()
@@ -167,13 +168,15 @@ def record_sql_queries(
             name="<unknown SQL query>" if query is None else query,
             attributes={
                 "sentry.origin": span_origin,
-                "sentry.op": OP.DB,
+                "sentry.op": span_op_override_value
+                if span_op_override_value
+                else OP.DB,
             },
         ) as span:
             yield span
     else:
         with sentry_sdk.start_span(
-            op=OP.DB,
+            op=span_op_override_value if span_op_override_value is not None else OP.DB,
             name=query,
             origin=span_origin,
         ) as span: