Merge branch 'webb/mcp/seperate-handlers' into webb/mcp/use-middleware

Author: alexander-alderman-webb

sentry_sdk/integrations/mcp.py

@@ -8,6 +8,8 @@
 """
 
 import inspect
+from collections.abc import Iterator
+from contextlib import contextmanager
 from functools import wraps
 from typing import TYPE_CHECKING
 
@@ -53,7 +55,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, Awaitable, Callable, ContextManager, Optional, Tuple, Union
+    from typing import Any, Awaitable, Callable, Optional, Union
 
     from mcp_types import (
         CallToolResult,
@@ -93,29 +95,48 @@ def setup_once() -> None:
             _patch_fastmcp()
 
 
-def _get_active_http_scopes(
-    ctx: "Optional[Any]" = None,
-) -> "Optional[Tuple[Optional[sentry_sdk.Scope], Optional[sentry_sdk.Scope]]]":
+@contextmanager
+def _with_active_http_scopes(
+    ctx: "Any" = None,
+) -> "Iterator[None]":
+    """
+    Use isolation and current scopes that were stored before the in-memory MCP request queue.
+    This ensures that MCP spans are nested under the HTTP server span when using the Streamable HTTP transport.
+    """
     if MCP_PACKAGE_VERSION and MCP_PACKAGE_VERSION < (2, 0, 0):
         if ctx is None:
             try:
                 ctx = request_ctx.get()
             except LookupError:
-                return None
+                yield None
+                return
 
     if (
         ctx is None
         or not hasattr(ctx, "request")
         or ctx.request is None
         or "state" not in ctx.request.scope
     ):
-        return None
+        yield
+        return
 
-    return (
-        ctx.request.scope["state"].get("sentry_sdk.isolation_scope"),
-        ctx.request.scope["state"].get("sentry_sdk.current_scope"),
+    isolation_scope = ctx.request.scope["state"].get("sentry_sdk.isolation_scope")
+    current_scope = ctx.request.scope["state"].get("sentry_sdk.current_scope")
+
+    isolation_scope_context = (
+        nullcontext()
+        if isolation_scope is None
+        else sentry_sdk.scope.use_isolation_scope(isolation_scope)
+    )
+    current_scope_context = (
+        nullcontext()
+        if current_scope is None
+        else sentry_sdk.scope.use_scope(current_scope)
     )
 
+    with isolation_scope_context, current_scope_context:
+        yield
+
 
 def _get_request_context_data(
     ctx: "Optional[Any]" = None,
@@ -501,35 +522,13 @@ async def _tool_handler_wrapper(
         "tool", handler_name
     )
 
-    scopes = _get_active_http_scopes(ctx=ctx)
-
-    isolation_scope_context: "ContextManager[Any]"
-    current_scope_context: "ContextManager[Any]"
-
-    if scopes is None:
-        isolation_scope_context = nullcontext()
-        current_scope_context = nullcontext()
-    else:
-        isolation_scope, current_scope = scopes
-
-        isolation_scope_context = (
-            nullcontext()
-            if isolation_scope is None
-            else sentry_sdk.scope.use_isolation_scope(isolation_scope)
-        )
-        current_scope_context = (
-            nullcontext()
-            if current_scope is None
-            else sentry_sdk.scope.use_scope(current_scope)
-        )
-
     # Get request ID, session ID, and transport from context
     request_id, session_id, mcp_transport = _get_request_context_data(ctx=ctx)
 
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with isolation_scope_context, current_scope_context:
+    with _with_active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(
@@ -623,35 +622,13 @@ async def _prompt_handler_wrapper(
         "prompt", handler_name
     )
 
-    scopes = _get_active_http_scopes(ctx=ctx)
-
-    isolation_scope_context: "ContextManager[Any]"
-    current_scope_context: "ContextManager[Any]"
-
-    if scopes is None:
-        isolation_scope_context = nullcontext()
-        current_scope_context = nullcontext()
-    else:
-        isolation_scope, current_scope = scopes
-
-        isolation_scope_context = (
-            nullcontext()
-            if isolation_scope is None
-            else sentry_sdk.scope.use_isolation_scope(isolation_scope)
-        )
-        current_scope_context = (
-            nullcontext()
-            if current_scope is None
-            else sentry_sdk.scope.use_scope(current_scope)
-        )
-
     # Get request ID, session ID, and transport from context
     request_id, session_id, mcp_transport = _get_request_context_data(ctx=ctx)
 
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with isolation_scope_context, current_scope_context:
+    with _with_active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(
@@ -745,35 +722,13 @@ async def _resource_handler_wrapper(
         "resource", handler_name
     )
 
-    scopes = _get_active_http_scopes(ctx=ctx)
-
-    isolation_scope_context: "ContextManager[Any]"
-    current_scope_context: "ContextManager[Any]"
-
-    if scopes is None:
-        isolation_scope_context = nullcontext()
-        current_scope_context = nullcontext()
-    else:
-        isolation_scope, current_scope = scopes
-
-        isolation_scope_context = (
-            nullcontext()
-            if isolation_scope is None
-            else sentry_sdk.scope.use_isolation_scope(isolation_scope)
-        )
-        current_scope_context = (
-            nullcontext()
-            if current_scope is None
-            else sentry_sdk.scope.use_scope(current_scope)
-        )
-
     # Get request ID, session ID, and transport from context
     request_id, session_id, mcp_transport = _get_request_context_data(ctx=ctx)
 
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with isolation_scope_context, current_scope_context:
+    with _with_active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(