Skip to content

Enhance process_request to handle non-numeric content length #430

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enhance process_request to handle non-numeric content length #430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca5d882
Enhance process_request to handle non-numeric content length
helloleonguan Jul 15, 2024
4f2b970
Enhance process_request to handle non-numeric content length
helloleonguan Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion django_prometheus/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,10 @@ def process_request(self, request):
if request.META.get("HTTP_X_REQUESTED_WITH") == "XMLHttpRequest":
self.label_metric(self.metrics.requests_ajax, request).inc()

content_length = int(request.META.get("CONTENT_LENGTH") or 0)
content_length = 0
raw_content_length = request.META.get("CONTENT_LENGTH", "")
if raw_content_length.isdigit():
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't bother with the isdigit() call, but use try..except ValueError, TypeError instead: isdigit would return True for digits that int() would still fail to convert, for example ₂. It is unlikely that this would happen in real world, but it is theoretically possible.

I would also add a unit test for this change.

content_length = int(raw_content_length)
self.label_metric(self.metrics.requests_body_bytes, request).observe(content_length)
request.prometheus_after_middleware_event = Time()

Expand Down