Skip to content
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.

Sign up for GitHub

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

Add debug flag&handler for request #1050

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

Add debug flag&handler for request #1050

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aacb925
Add debug handler for request
alex-ak1 Jul 26, 2024
b356472
Add debug handler for request
alex-ak1 Jul 26, 2024
0941262
Add debug handler for request
alex-ak1 Jul 26, 2024
274670d
Add debug handler for request
alex-ak1 Jul 26, 2024
0d8b1c0
Add debug handler for request
alex-ak1 Jul 26, 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
13 changes: 12 additions & 1 deletion prometheus_client/exposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,13 @@ def log_message(self, format, *args):
"""Log nothing."""


class _PrintHandler(WSGIRequestHandler):
Copy link
Member

Choose a reason for hiding this comment

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

I think we could just use WSGIRequestHandler instead of creating a new handler. It will log by default.

"""WSGI handler that print log requests to console."""

def log_message(self, format, *args):
print(format % args)


class ThreadingWSGIServer(ThreadingMixIn, WSGIServer):
"""Thread per request HTTP server."""
# Make worker threads "fire and forget". Beginning with Python 3.7 this
Expand Down Expand Up @@ -210,6 +217,7 @@ def start_wsgi_server(
client_capath: Optional[str] = None,
protocol: int = ssl.PROTOCOL_TLS_SERVER,
client_auth_required: bool = False,
debug: bool = False
Copy link
Member

Choose a reason for hiding this comment

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

Rather than just a debug flag, I wonder if we should let users specify the handler_class they are interested in using. That would be more flexible than having flags for everything.

) -> Tuple[WSGIServer, threading.Thread]:
"""Starts a WSGI server for prometheus metrics as a daemon thread."""

Expand All @@ -218,7 +226,10 @@ class TmpServer(ThreadingWSGIServer):

TmpServer.address_family, addr = _get_best_family(addr, port)
app = make_wsgi_app(registry)
httpd = make_server(addr, port, app, TmpServer, handler_class=_SilentHandler)
if debug:
httpd = make_server(addr, port, app, TmpServer, handler_class=_PrintHandler)
else:
httpd = make_server(addr, port, app, TmpServer, handler_class=_SilentHandler)
if certfile and keyfile:
context = _get_ssl_ctx(certfile, keyfile, protocol, client_cafile, client_capath, client_auth_required)
httpd.socket = context.wrap_socket(httpd.socket, server_side=True)
Expand Down