Fix 'asyncio.CancelledError' capturing for 'AioHttpIntegration' (getsentry#571)

Nick Gashkov · untitaker · commit 029c6475f1df · 2019-12-04T13:47:15.000+01:00
* Add failing test for 'asyncio.CancelledError'

* Fix 'asyncio.CancelledError' capturing

* Add 'cancelled' to the span's status

* Make 'black' happy
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
@@ -82,6 +82,9 @@ async def inner():
                         except HTTPException as e:
                             span.set_http_status(e.status_code)
                             raise
+                        except asyncio.CancelledError:
+                            span.set_status("cancelled")
+                            raise
                         except Exception:
                             # This will probably map to a 500 but seems like we
                             # have no way to tell. Do not set span status.
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
@@ -1,6 +1,9 @@
+import asyncio
 import json
+from contextlib import suppress
 
 from aiohttp import web
+from aiohttp.client import ServerDisconnectedError
 
 from sentry_sdk.integrations.aiohttp import AioHttpIntegration
 
@@ -120,6 +123,28 @@ async def hello(request):
     assert not events
 
 
+async def test_cancelled_error_not_captured(
+    sentry_init, aiohttp_client, loop, capture_events
+):
+    sentry_init(integrations=[AioHttpIntegration()])
+
+    async def hello(request):
+        raise asyncio.CancelledError()
+
+    app = web.Application()
+    app.router.add_get("/", hello)
+
+    events = capture_events()
+    client = await aiohttp_client(app)
+
+    with suppress(ServerDisconnectedError):
+        # Intended `aiohttp` interaction: server will disconnect if it
+        # encounters `asyncio.CancelledError`
+        await client.get("/")
+
+    assert not events
+
+
 async def test_half_initialized(sentry_init, aiohttp_client, loop, capture_events):
     sentry_init(integrations=[AioHttpIntegration()])
     sentry_init()
