change2

Author: Dibbu-cell

sentry_sdk/_compat.py

@@ -2,7 +2,7 @@
 import asyncio
 import inspect
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Callable
 
 if TYPE_CHECKING:
     from typing import Any
@@ -12,6 +12,10 @@
     T = TypeVar("T")
     _F = TypeVar("_F", bound=Callable[..., Any])
 
+# Public shim symbols with precise types so mypy accepts branch assignments
+iscoroutinefunction: "Callable[[Any], bool]"
+markcoroutinefunction: "Callable[[ _F ], _F]"
+
 
 PY37 = sys.version_info[0] == 3 and sys.version_info[1] >= 7
 PY38 = sys.version_info[0] == 3 and sys.version_info[1] >= 8
@@ -28,11 +32,26 @@
     iscoroutinefunction = inspect.iscoroutinefunction
     markcoroutinefunction = inspect.markcoroutinefunction
 else:
-    iscoroutinefunction = asyncio.iscoroutinefunction  # type: ignore[assignment]
+    iscoroutinefunction = asyncio.iscoroutinefunction
 
     def markcoroutinefunction(func):
         # type: (_F) -> _F
-        func._is_coroutine = asyncio.coroutines._is_coroutine  # type: ignore
+        # Prior to Python 3.12, asyncio exposed a private `_is_coroutine`
+        # marker used by asyncio.iscoroutinefunction(). This attribute was
+        # removed in Python 3.11. If it's not available, fall back to a no-op,
+        # which preserves behavior of inspect.iscoroutinefunction for our
+        # supported versions while avoiding AttributeError.
+        try:
+            marker = getattr(asyncio.coroutines, "_is_coroutine")
+        except Exception:
+            # No marker available on this Python version; return function as-is.
+            return func
+
+        try:  # pragma: no cover - defensive
+            func._is_coroutine = marker  # type: ignore[attr-defined]
+        except Exception:
+            # If assignment fails for any reason, leave func unchanged.
+            pass
         return func
 
 

sentry_sdk/ai/monitoring.py

@@ -1,7 +1,6 @@
 import inspect
 from functools import wraps
 
-from sentry_sdk._compat import iscoroutinefunction
 from sentry_sdk.consts import SPANDATA
 import sentry_sdk.utils
 from sentry_sdk import start_span
@@ -90,7 +89,7 @@ async def async_wrapped(*args, **kwargs):
                         _ai_pipeline_name.set(None)
                     return res
 
-        if iscoroutinefunction(f):
+        if inspect.iscoroutinefunction(f):
             return wraps(f)(async_wrapped)  # type: ignore
         else:
             return wraps(f)(sync_wrapped)  # type: ignore

sentry_sdk/integrations/django/asgi.py

@@ -36,9 +36,6 @@
     _F = TypeVar("_F", bound=Callable[..., Any])
 
 
-
-
-
 def _make_asgi_request_event_processor(request):
     # type: (ASGIRequest) -> EventProcessor
     def asgi_request_event_processor(event, hint):

sentry_sdk/integrations/google_genai/utils.py

@@ -15,7 +15,6 @@
 )
 
 import sentry_sdk
-from sentry_sdk._compat import iscoroutinefunction
 from sentry_sdk.ai.utils import set_data_normalized
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.scope import should_send_default_pii
@@ -319,7 +318,7 @@ def wrapped_tool(tool):
     tool_name = getattr(tool, "__name__", "unknown")
     tool_doc = tool.__doc__
 
-    if iscoroutinefunction(tool):
+    if inspect.iscoroutinefunction(tool):
         # Async function
         @wraps(tool)
         async def async_wrapped(*args, **kwargs):

sentry_sdk/integrations/quart.py

@@ -114,9 +114,7 @@ def _sentry_route(*args, **kwargs):
         def decorator(old_func):
             # type: (Any) -> Any
 
-            if inspect.isfunction(old_func) and not iscoroutinefunction(
-                old_func
-            ):
+            if inspect.isfunction(old_func) and not iscoroutinefunction(old_func):
 
                 @wraps(old_func)
                 @ensure_integration_enabled(QuartIntegration, old_func)

sentry_sdk/tracing_utils.py

@@ -11,7 +11,6 @@
 import uuid
 
 import sentry_sdk
-from sentry_sdk._compat import iscoroutinefunction
 from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS, SPANTEMPLATE
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -913,7 +912,7 @@ def sync_wrapper(*args, **kwargs):
         except Exception:
             pass
 
-        if iscoroutinefunction(f):
+        if inspect.iscoroutinefunction(f):
             return async_wrapper
         else:
             return sync_wrapper

tests/integrations/httpx/test_httpx.py

@@ -1,6 +1,7 @@
 import os
 import datetime
 import asyncio
+import inspect
 from unittest import mock
 
 import httpx
@@ -9,7 +10,6 @@
 
 import sentry_sdk
 from sentry_sdk import capture_message, start_transaction
-from sentry_sdk._compat import iscoroutinefunction
 from sentry_sdk.consts import MATCH_ALL, SPANDATA
 from sentry_sdk.integrations.httpx import HttpxIntegration
 from tests.conftest import ApproxDict
@@ -33,7 +33,7 @@ def before_breadcrumb(crumb, hint):
     with start_transaction():
         events = capture_events()
 
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             response = asyncio.get_event_loop().run_until_complete(
                 httpx_client.get(url)
             )
@@ -87,7 +87,7 @@ def test_crumb_capture_client_error(
     with start_transaction():
         events = capture_events()
 
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             response = asyncio.get_event_loop().run_until_complete(
                 httpx_client.get(url)
             )
@@ -138,7 +138,7 @@ def test_outgoing_trace_headers(sentry_init, httpx_client, httpx_mock):
         op="greeting.sniff",
         trace_id="01234567890123456789012345678901",
     ) as transaction:
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             response = asyncio.get_event_loop().run_until_complete(
                 httpx_client.get(url)
             )
@@ -181,7 +181,7 @@ def test_outgoing_trace_headers_append_to_baggage(
             op="greeting.sniff",
             trace_id="01234567890123456789012345678901",
         ) as transaction:
-            if iscoroutinefunction(httpx_client.get):
+            if inspect.iscoroutinefunction(httpx_client.get):
                 response = asyncio.get_event_loop().run_until_complete(
                     httpx_client.get(url, headers={"baGGage": "custom=data"})
                 )
@@ -334,7 +334,7 @@ def test_option_trace_propagation_targets(
 
     # Must be in a transaction to propagate headers
     with sentry_sdk.start_transaction():
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
         else:
             httpx_client.get(url)
@@ -421,7 +421,7 @@ def test_request_source_disabled(
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
         else:
             httpx_client.get(url)
@@ -458,7 +458,7 @@ def test_request_source_enabled(sentry_init, capture_events, httpx_client, httpx
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
         else:
             httpx_client.get(url)
@@ -495,7 +495,7 @@ def test_request_source(sentry_init, capture_events, httpx_client, httpx_mock):
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
         else:
             httpx_client.get(url)
@@ -548,7 +548,7 @@ def test_request_source_with_module_in_search_path(
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             from httpx_helpers.helpers import async_get_request_with_client
 
             asyncio.get_event_loop().run_until_complete(
@@ -579,7 +579,7 @@ def test_request_source_with_module_in_search_path(
     is_relative_path = data.get(SPANDATA.CODE_FILEPATH)[0] != os.sep
     assert is_relative_path
 
-    if iscoroutinefunction(httpx_client.get):
+    if inspect.iscoroutinefunction(httpx_client.get):
         assert data.get(SPANDATA.CODE_FUNCTION) == "async_get_request_with_client"
     else:
         assert data.get(SPANDATA.CODE_FUNCTION) == "get_request_with_client"
@@ -619,7 +619,7 @@ def fake_start_span(*args, **kwargs):
             "sentry_sdk.integrations.httpx.start_span",
             fake_start_span,
         ):
-            if iscoroutinefunction(httpx_client.get):
+            if inspect.iscoroutinefunction(httpx_client.get):
                 asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
             else:
                 httpx_client.get(url)
@@ -671,7 +671,7 @@ def fake_start_span(*args, **kwargs):
             "sentry_sdk.integrations.httpx.start_span",
             fake_start_span,
         ):
-            if iscoroutinefunction(httpx_client.get):
+            if inspect.iscoroutinefunction(httpx_client.get):
                 asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
             else:
                 httpx_client.get(url)
@@ -721,7 +721,7 @@ def test_span_origin(sentry_init, capture_events, httpx_client, httpx_mock):
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-        if iscoroutinefunction(httpx_client.get):
+        if inspect.iscoroutinefunction(httpx_client.get):
             asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
         else:
             httpx_client.get(url)