Measure request durations

optimus/prometheus.py

@@ -1,14 +1,23 @@
-from prometheus_client import Counter, start_http_server
+from prometheus_client import Counter, Histogram, start_http_server
 
 from optimus.logging.logger import log
 
-inbound_rqc = Counter("inbound_requests", "Total Requests Received")
-served_rqc = Counter("served_requests", "Total Requests Processed")
-erred_rqc = Counter("erred_requests", "Total Requests Failed")
+inbound_rqc = Counter("inbound_dns_requests", "Total Requests Received")
+served_rqc = Counter("served_dns_requests", "Total Requests Processed")
+erred_rqc = Counter("erred_dns_requests", "Total Requests Failed")
+
+req_duration_hist = Histogram("duration_dns_request", "Total time taken to process the request")
+
 PORT = 8000
 
 
 def record_metrics(func):
+    """
+    Requires a running Prometheus Metrics server
+    TODO: Check whether Prometheus server is up and running on `PORT`
+    """
+
+    @req_duration_hist.time()
     def wrapper(*args, **kwargs):
         inbound_rqc.inc(1)
         was_success: bool = func(*args, **kwargs)
@@ -19,7 +28,7 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def with_prometheus_monitoring(func):
+def with_prometheus_metrics_server(func):
     def wrapper(*args, **kwargs):
         start_http_server(PORT)
         log(f"Started Prometheus Server on Port {PORT}")

optimus/server/udp_listener.py

@@ -3,12 +3,12 @@
 
 from optimus.logging.logger import log
 from optimus.networking.cache import socket_cache
-from optimus.prometheus import with_prometheus_monitoring
+from optimus.prometheus import with_prometheus_metrics_server
 from optimus.server.context import warmup_cache
 from optimus.server.router import handle_request
 
 
-@with_prometheus_monitoring
+@with_prometheus_metrics_server
 @warmup_cache(socket_cache)
 def run_forever(port: int, worker_threads: int):
     master_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)