Tweak metrics delay logging

Just instrument the update-managed-metrics! function, and move some code
around so this is clearer in the logs.

1 files changed, 19 insertions, 20 deletions

diff --git a/guix-build-coordinator/agent-messaging/http/server.scm b/guix-build-coordinator/agent-messaging/http/server.scm
index 255d105..5edfaa0 100644
--- a/guix-build-coordinator/agent-messaging/http/server.scm
+++ b/guix-build-coordinator/agent-messaging/http/server.scm
@@ -75,16 +75,16 @@ if there was no request body."
 (define (http-agent-messaging-start-server port host secret-key-base
                                            build-coordinator
                                            chunked-request-channel)
-  (define update-managed-metrics!
-    (let ((datastore-metrics-updater
-           (base-datastore-metrics-updater build-coordinator))
-          (gc-metrics-updater
-           (get-gc-metrics-updater
-            (build-coordinator-metrics-registry build-coordinator))))
-    (lambda ()
-      (call-with-delay-logging datastore-metrics-updater)
-      (gc-metrics-updater))))
+  (define gc-metrics-updater
+    (get-gc-metrics-updater
+     (build-coordinator-metrics-registry build-coordinator)))
+
+  (define datastore-metrics-updater
+    (base-datastore-metrics-updater build-coordinator))
 
+  (define (update-managed-metrics!)
+    (call-with-delay-logging datastore-metrics-updater)
+    (call-with-delay-logging gc-metrics-updater))
 
   (call-with-error-handling
    (lambda ()
@@ -659,17 +659,16 @@ port. Also, the port used can be changed by passing the --port option.\n"
               '(("error" . "access denied"))
               #:code 403))))
       (('GET "metrics")
-       (call-with-delay-logging
-        (lambda ()
-          (update-managed-metrics!)
-          (list (build-response
-                 #:code 200
-                 #:headers '((content-type . (text/plain))
-                             (vary . (accept))))
-                (lambda (port)
-                  (write-metrics (build-coordinator-metrics-registry
-                                  build-coordinator)
-                                 port))))))
+       (call-with-delay-logging update-managed-metrics!
+                                #:threshold 0)
+       (list (build-response
+              #:code 200
+              #:headers '((content-type . (text/plain))
+                          (vary . (accept))))
+             (lambda (port)
+               (write-metrics (build-coordinator-metrics-registry
+                               build-coordinator)
+                              port))))
       (_
        (render-json
         "not-found"