-
Notifications
You must be signed in to change notification settings - Fork 44
feat: add request correlation IDs #298
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Heet27
wants to merge
5
commits into
main
Choose a base branch
from
feature/26t2-be-hg-001-request-correlation-id
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
745d018
feat: add request correlation IDs
Heet27 159eecc
fix: address middleware lint checks
Heet27 637e924
feat: add request correlation IDs and address Bandit findings
Heet27 a0391b0
fix: correct auth callback indentation
Heet27 27335af
chore: revert unintended dependency changes
Heet27 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,42 @@ | ||
| import logging | ||
| import time | ||
| from uuid import uuid4 | ||
|
|
||
| from starlette.middleware.base import BaseHTTPMiddleware | ||
|
|
||
| logger = logging.getLogger("api") | ||
|
|
||
| REQUEST_ID_HEADER = "X-Request-ID" | ||
| MAX_REQUEST_ID_LENGTH = 128 | ||
|
|
||
|
|
||
| class RequestLoggingMiddleware(BaseHTTPMiddleware): | ||
| async def dispatch(self, request, call_next): | ||
| start_time = time.time() | ||
|
|
||
| # Process request | ||
| supplied_request_id = request.headers.get(REQUEST_ID_HEADER) | ||
|
|
||
| if supplied_request_id and len(supplied_request_id) <= MAX_REQUEST_ID_LENGTH: | ||
| request_id = supplied_request_id | ||
| else: | ||
| request_id = str(uuid4()) | ||
|
|
||
| request.state.request_id = request_id | ||
|
|
||
| response = await call_next(request) | ||
|
|
||
| duration = round(time.time() - start_time, 3) | ||
|
|
||
| # Log only metadata | ||
| logger.info({ | ||
| "method": request.method, | ||
| "path": request.url.path, | ||
| "status_code": response.status_code, | ||
| "duration": duration | ||
| }) | ||
| response.headers[REQUEST_ID_HEADER] = request_id | ||
|
|
||
| logger.info( | ||
| { | ||
| "request_id": request_id, | ||
| "method": request.method, | ||
| "path": request.url.path, | ||
| "status_code": response.status_code, | ||
| "duration": duration, | ||
| } | ||
| ) | ||
|
|
||
| return response | ||
| return response | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When an endpoint or dependency raises an unhandled exception,
call_nextpropagates it before the response header and request log are written. Starlette's outerServerErrorMiddlewarethen creates the 500 response after this middleware has exited, so that response has noX-Request-IDand no correlation log—the failure scenario where the ID is most needed. Handle this path so the generated or supplied ID is logged and included on the resulting error response.Useful? React with 👍 / 👎.