improve metric naming

Author: khvn26

README.md

@@ -64,8 +64,8 @@ Flagsmith uses Prometheus to track performance metrics.
 The following default metrics are exposed:
 
 - `flagsmith_build_info`: Has the labels `version` and `ci_commit_sha`.
-- `http_request_duration_seconds`: Histogram labeled with `method`, `path`, and `response_status`.
-- `http_requests_total`: Counter labeled with `method`, `path`, and `response_status`.
+- `http_server_request_duration_seconds`: Histogram labeled with `method`, `path`, and `response_status`.
+- `http_server_requests_total`: Counter labeled with `method`, `path`, and `response_status`.
 
 ##### Guidelines
 

src/common/gunicorn/logging.py

@@ -60,10 +60,10 @@ def access(
             "method": environ.get("REQUEST_METHOD"),
             "response_status": resp.status_code,
         }
-        with_labels(metrics.http_request_duration_seconds, **labels).observe(
+        with_labels(metrics.http_server_request_duration_seconds, **labels).observe(
             duration_seconds
         )
-        with_labels(metrics.http_requests_total, **labels).inc()
+        with_labels(metrics.http_server_requests_total, **labels).inc()
 
 
 class GunicornJsonCapableLogger(PrometheusGunicornLogger):

src/common/gunicorn/metrics.py

@@ -1,13 +1,13 @@
 import prometheus_client
 from django.conf import settings
 
-http_requests_total = prometheus_client.Counter(
-    "http_requests_total",
+http_server_requests_total = prometheus_client.Counter(
+    "http_server_requests_total",
     "Total number of HTTP requests",
     ["path", "method", "response_status"],
 )
-http_request_duration_seconds = prometheus_client.Histogram(
-    "http_request_duration_seconds",
+http_server_request_duration_seconds = prometheus_client.Histogram(
+    "http_server_request_duration_seconds",
     "HTTP request duration in seconds",
     ["path", "method", "response_status"],
     buckets=settings.PROMETHEUS_HISTOGRAM_BUCKETS,

tests/unit/common/gunicorn/test_logging.py

@@ -97,12 +97,12 @@ def test_gunicorn_prometheus_gunicorn_logger__expected_metrics(
 
     # Then
     assert_metric(
-        name="http_requests_total",
+        name="http_server_requests_total",
         value=1.0,
         labels={"method": "GET", "path": "^health", "response_status": "200"},
     )
     assert_metric(
-        name="http_request_duration_seconds_sum",
+        name="http_server_request_duration_seconds_sum",
         value=0.101,
         labels={"method": "GET", "path": "^health", "response_status": "200"},
     )