wrap in try finally

Author: alexander-alderman-webb

sentry_sdk/integrations/fastapi.py

@@ -112,32 +112,33 @@ async def _sentry_app(*args, **kwargs):
             sentry_scope = sentry_sdk.get_isolation_scope()
             sentry_scope._name = FastApiIntegration.identifier
 
-            response = await old_app(*args, **kwargs)
-
-            extractor = StarletteRequestExtractor(request)
-            info = await extractor.extract_request_info()
-
-            def _make_request_event_processor(req, integration):
-                # type: (Any, Any) -> Callable[[Event, Dict[str, Any]], Event]
-                def event_processor(event, hint):
-                    # type: (Event, Dict[str, Any]) -> Event
-
-                    # Extract information from request
-                    request_info = event.get("request", {})
-                    if info:
-                        if "cookies" in info and should_send_default_pii():
-                            request_info["cookies"] = info["cookies"]
-                        if "data" in info:
-                            request_info["data"] = info["data"]
-                    event["request"] = deepcopy(request_info)
-
-                    return event
-
-                return event_processor
-
-            sentry_scope.add_event_processor(
-                _make_request_event_processor(request, integration)
-            )
+            try:
+                response = await old_app(*args, **kwargs)
+            finally:
+                extractor = StarletteRequestExtractor(request)
+                info = await extractor.extract_request_info()
+
+                def _make_request_event_processor(req, integration):
+                    # type: (Any, Any) -> Callable[[Event, Dict[str, Any]], Event]
+                    def event_processor(event, hint):
+                        # type: (Event, Dict[str, Any]) -> Event
+
+                        # Extract information from request
+                        request_info = event.get("request", {})
+                        if info:
+                            if "cookies" in info and should_send_default_pii():
+                                request_info["cookies"] = info["cookies"]
+                            if "data" in info:
+                                request_info["data"] = info["data"]
+                        event["request"] = deepcopy(request_info)
+
+                        return event
+
+                    return event_processor
+
+                sentry_scope.add_event_processor(
+                    _make_request_event_processor(request, integration)
+                )
 
             return response