ref(client): Adapt client for blocking kill in async transport

Add blocking kill functionality to the client in async transport.

GH-4601

Author: srothh

sentry_sdk/client.py

@@ -915,16 +915,28 @@ def get_integration(
 
         return self.integrations.get(integration_name)
 
+    def _close_transport(self) -> Optional[asyncio.Task[None]]:
+        """Close transport and return cleanup task if any."""
+        if self.transport is not None:
+            cleanup_task = self.transport.kill()
+            self.transport = None
+            return cleanup_task
+        return None
+
     def _close_components(self) -> None:
         """Kill all client components in the correct order."""
         self.session_flusher.kill()
         if self.log_batcher is not None:
             self.log_batcher.kill()
         if self.monitor:
             self.monitor.kill()
-        if self.transport is not None:
-            self.transport.kill()
-            self.transport = None
+
+    async def _close_components_async(self) -> None:
+        """Async version of _close_components that properly awaits transport cleanup."""
+        self._close_components()
+        cleanup_task = self._close_transport()
+        if cleanup_task is not None:
+            await cleanup_task
 
     def close(  # type: ignore[override]
         self,
@@ -941,7 +953,7 @@ async def _flush_and_close(
         ) -> None:
 
             await self._flush_async(timeout=timeout, callback=callback)
-            self._close_components()
+            await self._close_components_async()
 
         if self.transport is not None:
             if isinstance(self.transport, AsyncHttpTransport):
@@ -959,6 +971,8 @@ async def _flush_and_close(
             else:
                 self.flush(timeout=timeout, callback=callback)
                 self._close_components()
+                self._close_transport()
+
         return None
 
     def flush(  # type: ignore[override]

sentry_sdk/transport.py

@@ -790,7 +790,7 @@ def kill(self: Self) -> Optional[asyncio.Task[None]]:  # type: ignore
         self.background_tasks.clear()
         try:
             # Return the pool cleanup task so caller can await it if needed
-            return self._loop.create_task(self._pool.aclose())  # type: ignore
+            return self.loop.create_task(self._pool.aclose())  # type: ignore
         except RuntimeError:
             logger.warning("Event loop not running, aborting kill.")
             return None