|
10 | 10 | class StructuredLoggingMiddleware(BaseHTTPMiddleware): |
11 | 11 | async def dispatch(self, request: Request, call_next): |
12 | 12 | started_at = time.perf_counter() |
13 | | - response = await call_next(request) |
14 | | - latency_ms = round((time.perf_counter() - started_at) * 1000, 2) |
| 13 | + try: |
| 14 | + response = await call_next(request) |
| 15 | + except Exception as exc: |
| 16 | + self._log_request( |
| 17 | + request=request, |
| 18 | + started_at=started_at, |
| 19 | + status_code=500, |
| 20 | + level=logging.ERROR, |
| 21 | + message="request failed", |
| 22 | + error_type=type(exc).__name__, |
| 23 | + ) |
| 24 | + raise |
| 25 | + |
| 26 | + self._log_request( |
| 27 | + request=request, |
| 28 | + started_at=started_at, |
| 29 | + status_code=response.status_code, |
| 30 | + level=logging.INFO, |
| 31 | + message="request completed", |
| 32 | + ) |
| 33 | + return response |
15 | 34 |
|
16 | | - logger.info( |
17 | | - "request completed", |
| 35 | + @staticmethod |
| 36 | + def _log_request( |
| 37 | + request: Request, |
| 38 | + started_at: float, |
| 39 | + status_code: int, |
| 40 | + level: int, |
| 41 | + message: str, |
| 42 | + error_type: str | None = None, |
| 43 | + ) -> None: |
| 44 | + latency_ms = round((time.perf_counter() - started_at) * 1000, 2) |
| 45 | + logger.log( |
| 46 | + level, |
| 47 | + message, |
18 | 48 | extra={ |
19 | 49 | "method": request.method, |
20 | 50 | "path": request.url.path, |
21 | | - "status_code": response.status_code, |
| 51 | + "status_code": status_code, |
22 | 52 | "latency_ms": latency_ms, |
23 | 53 | "request_id": getattr(request.state, "request_id", None), |
24 | 54 | "user_id": getattr(request.state, "user_id", None), |
| 55 | + "error_type": error_type, |
25 | 56 | }, |
26 | 57 | ) |
27 | | - return response |
|
0 commit comments