Use the #:namespace argument for metric registries

1 files changed, 6 insertions, 16 deletions

diff --git a/guix-build-coordinator/agent-messaging/http.scm b/guix-build-coordinator/agent-messaging/http.scm
index 1a9a9e9..91b686b 100644
--- a/guix-build-coordinator/agent-messaging/http.scm
+++ b/guix-build-coordinator/agent-messaging/http.scm
@@ -142,9 +142,6 @@ port. Also, the port used can be changed by passing the --port option.\n"
         ""))
 
 (define (base-datastore-metrics-updater build-coordinator)
-  (define namespace
-    "guixbuildcoordinator")
-
   (define datastore
     (build-coordinator-datastore build-coordinator))
 
@@ -152,34 +149,27 @@ port. Also, the port used can be changed by passing the --port option.\n"
     (build-coordinator-metrics-registry build-coordinator))
 
   (let ((builds-total
-         (make-gauge-metric registry
-                            (string-append namespace
-                                           "_builds_total")
+         (make-gauge-metric registry "builds_total"
                             #:labels '(system)))
         (allocated-builds-total
          (make-gauge-metric registry
-                            (string-append namespace
-                                           "_allocated_builds_total")
+                            "allocated_builds_total"
                             #:labels '(agent_id)))
         (build-results-total
          (make-gauge-metric registry
-                            (string-append namespace
-                                           "_build_results_total")
+                            "build_results_total"
                             #:labels '(agent_id result)))
         (setup-failures-total
          (make-gauge-metric registry
-                            (string-append namespace
-                                           "_setup_failures_total")
+                            "setup_failures_total"
                             #:labels '(agent_id reason)))
         (build-allocation-plan-total
          (make-gauge-metric registry
-                            (string-append namespace
-                                           "_build_allocation_plan_total")
+                            "build_allocation_plan_total"
                             #:labels '(agent_id)))
         (unprocessed-hook-events-total
          (make-gauge-metric registry
-                            (string-append namespace
-                                           "_unprocessed_hook_events_total")
+                            "unprocessed_hook_events_total"
                             #:labels '(event))))
     (define (zero-metric-for-agents metric)
       (for-each (lambda (agent-details)