use contextlib for nullcontext in mcp

Author: alexander-alderman-webb

sentry_sdk/integrations/_wsgi_common.py

@@ -1,3 +1,4 @@
+from contextlib import contextmanager
 import json
 from copy import deepcopy
 
@@ -51,6 +52,12 @@
 )
 
 
+# This noop context manager can be replaced with "from contextlib import nullcontext" when we drop Python 3.6 support
+@contextmanager
+def nullcontext() -> "Iterator[None]":
+    yield
+
+
 def request_body_within_bounds(
     client: "Optional[sentry_sdk.client.BaseClient]", content_length: int
 ) -> bool:

sentry_sdk/integrations/asgi.py

@@ -19,6 +19,7 @@
 )
 from sentry_sdk.integrations._wsgi_common import (
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
+    nullcontext,
 )
 from sentry_sdk.sessions import track_session
 from sentry_sdk.tracing import (
@@ -33,7 +34,6 @@
     logger,
     transaction_from_function,
     _get_installed_modules,
-    nullcontext,
 )
 from sentry_sdk.tracing import Transaction
 

sentry_sdk/integrations/mcp.py

@@ -10,14 +10,14 @@
 import inspect
 from functools import wraps
 from typing import TYPE_CHECKING
+from contextlib import nullcontext
 
 import sentry_sdk
 from sentry_sdk.ai.utils import get_start_span_function
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.utils import safe_serialize
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.utils import nullcontext
 
 try:
     from mcp.server.lowlevel import Server  # type: ignore[import-not-found]

sentry_sdk/utils.py

@@ -2108,9 +2108,3 @@ def serialize_attribute(val: "AttributeValue") -> "SerializedAttributeValue":
     # Coerce to string if we don't know what to do with the value. This should
     # never happen as we pre-format early in format_attribute, but let's be safe.
     return {"value": safe_repr(val), "type": "string"}
-
-
-# This noop context manager can be replaced with "from contextlib import nullcontext" when we drop Python 3.6 support
-@contextmanager
-def nullcontext() -> "Iterator[None]":
-    yield