move _markcoroutinefunction back to django asgi

Author: cooperoptigrid

sentry_sdk/integrations/_asgi_common.py

@@ -11,30 +11,19 @@
     from typing import Any
     from typing import Dict
     from typing import Optional
-    from typing import TypeVar
     from typing import Union
     from typing_extensions import Literal
 
     from sentry_sdk.utils import AnnotatedValue
 
-    _F = TypeVar("_F")
-
-
 # Python 3.12 deprecates asyncio.iscoroutinefunction() as an alias for
-# inspect.iscoroutinefunction(), whilst also removing the _is_coroutine marker.
-# The latter is replaced with inspect.markcoroutinefunction().
-# Until 3.12 is the minimum supported Python version, provide a shim.
-# This was copied from https://github.com/django/asgiref/blob/main/asgiref/sync.py
-if hasattr(inspect, "markcoroutinefunction"):
+# inspect.iscoroutinefunction(). Until 3.12 is the minimum supported Python
+# version, provide a shim.
+if hasattr(inspect, "iscoroutinefunction"):
     _iscoroutinefunction = inspect.iscoroutinefunction
-    _markcoroutinefunction = inspect.markcoroutinefunction
 else:
     _iscoroutinefunction = asyncio.iscoroutinefunction  # type: ignore[assignment]
 
-    def _markcoroutinefunction(func: "_F") -> "_F":
-        func._is_coroutine = asyncio.coroutines._is_coroutine  # type: ignore[attr-defined]
-        return func
-
 
 def _get_headers(asgi_scope: "Any") -> "Dict[str, str]":
     """

sentry_sdk/integrations/django/asgi.py

@@ -6,18 +6,17 @@
 `django.core.handlers.asgi`.
 """
 
+import asyncio
 import functools
+import inspect
 
 from django.core.handlers.wsgi import WSGIRequest
 
 import sentry_sdk
 from sentry_sdk.consts import OP
 
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
-from sentry_sdk.integrations._asgi_common import (
-    _iscoroutinefunction,
-    _markcoroutinefunction,
-)
+from sentry_sdk.integrations._asgi_common import _iscoroutinefunction
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -27,13 +26,28 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Union
+    from typing import Any, Callable, Union, TypeVar
 
     from django.core.handlers.asgi import ASGIRequest
     from django.http.response import HttpResponse
 
     from sentry_sdk._types import Event, EventProcessor
 
+    _F = TypeVar("_F", bound=Callable[..., Any])
+
+# Python 3.12 deprecates asyncio.iscoroutinefunction() as an alias for
+# inspect.iscoroutinefunction(), whilst also removing the _is_coroutine marker.
+# The latter is replaced with the inspect.markcoroutinefunction decorator.
+# Until 3.12 is the minimum supported Python version, provide a shim.
+# This was copied from https://github.com/django/asgiref/blob/main/asgiref/sync.py
+if hasattr(inspect, "markcoroutinefunction"):
+    markcoroutinefunction = inspect.markcoroutinefunction
+else:
+
+    def markcoroutinefunction(func: "_F") -> "_F":
+        func._is_coroutine = asyncio.coroutines._is_coroutine  # type: ignore
+        return func
+
 
 def _make_asgi_request_event_processor(request: "ASGIRequest") -> "EventProcessor":
     def asgi_request_event_processor(event: "Event", hint: "dict[str, Any]") -> "Event":
@@ -200,7 +214,7 @@ def _async_check(self) -> None:
             Taken from django.utils.deprecation::MiddlewareMixin._async_check
             """
             if _iscoroutinefunction(self.get_response):
-                _markcoroutinefunction(self)
+                markcoroutinefunction(self)
 
         def async_route_check(self) -> bool:
             """