Update the metrics approach

1 files changed, 11 insertions, 8 deletions

diff --git a/guix-qa-frontpage/server.scm b/guix-qa-frontpage/server.scm
index ab0680a..8db6aae 100644
--- a/guix-qa-frontpage/server.scm
+++ b/guix-qa-frontpage/server.scm
@@ -40,7 +40,6 @@
                 #:select (parse-query-string))
   #:use-module ((guix-build-coordinator utils)
                 #:select (with-time-logging
-                          get-port-metrics-updater
                           call-with-delay-logging))
   #:use-module ((guix-build-coordinator utils fibers)
                 #:select (run-server/patched call-with-sigint))
@@ -98,17 +97,20 @@
         (static-asset-from-store-renderer doc-dir)
         (static-asset-from-directory-renderer doc-dir)))
 
+  (define plain-metrics-registry
+    (make-metrics-registry))
+
   (define gc-metrics-updater!
-    (get-gc-metrics-updater metrics-registry))
+    (get-gc-metrics-updater plain-metrics-registry))
 
-  (define port-metrics-updater!
-    (get-port-metrics-updater metrics-registry))
+  (define process-metrics-updater!
+    (get-process-metrics-updater plain-metrics-registry))
 
   (define guile-time-metrics-updater
     (let ((internal-real-time
-           (make-gauge-metric metrics-registry "guile_internal_real_time"))
+           (make-gauge-metric plain-metrics-registry "guile_internal_real_time"))
           (internal-run-time
-           (make-gauge-metric metrics-registry "guile_internal_run_time")))
+           (make-gauge-metric plain-metrics-registry "guile_internal_run_time")))
       (lambda ()
         (metric-set internal-real-time
                     (get-internal-real-time))
@@ -143,14 +145,15 @@
                    (request-uri request))))))
       (('GET "metrics")
        (gc-metrics-updater!)
-       (port-metrics-updater!)
+       (process-metrics-updater!)
        (guile-time-metrics-updater)
        (list (build-response
               #:code 200
               #:headers '((content-type . (text/plain))
                           (vary . (accept))))
              (lambda (port)
-               (write-metrics metrics-registry port))))
+               (write-metrics metrics-registry port)
+               (write-metrics plain-metrics-registry port))))
       (('GET "branches")
        (let ((branches
               (with-sqlite-cache