Merge branch 'webb/mcp/use-middleware-4' into webb/mcp/prompt-arguments

Author: alexander-alderman-webb

sentry_sdk/integrations/mcp.py

@@ -96,7 +96,7 @@ def setup_once() -> None:
 
 
 @contextmanager
-def _with_active_http_scopes(
+def _active_http_scopes(
     ctx: "Any" = None,
 ) -> "Iterator[None]":
     """
@@ -402,7 +402,7 @@ async def _tool_handler_wrapper(
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with _with_active_http_scopes(ctx=ctx):
+    with _active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(
@@ -520,7 +520,7 @@ async def _prompt_handler_wrapper(
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with _with_active_http_scopes(ctx=ctx):
+    with _active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(
@@ -690,7 +690,7 @@ async def _resource_handler_wrapper(
     span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
 
     # Start span and execute
-    with _with_active_http_scopes(ctx=ctx):
+    with _active_http_scopes(ctx=ctx):
         span_mgr: "Union[Span, StreamedSpan]"
         if span_streaming:
             span_mgr = sentry_sdk.traces.start_span(