cbaines pushed a commit to branch master
in repository data-service.
commit 5d0e84bac46e14db19f2508446e7418008d19169
Author: Christopher Baines <m...@cbaines.net>
AuthorDate: Sat Mar 30 21:37:16 2024 +0000
Make changes for the guile-prometheus update
---
guix-data-service/utils.scm | 51 ------------------------------------
guix-data-service/web/controller.scm | 6 ++---
2 files changed, 3 insertions(+), 54 deletions(-)
diff --git a/guix-data-service/utils.scm b/guix-data-service/utils.scm
index d72fa55..3a1ea95 100644
--- a/guix-data-service/utils.scm
+++ b/guix-data-service/utils.scm
@@ -55,8 +55,6 @@
delete-duplicates/sort!
- get-gc-metrics-updater
- get-port-metrics-updater
get-guix-metrics-updater
call-with-sigint
@@ -580,55 +578,6 @@ available. Return the resource once PROC has returned."
(cons current-element
result)))))))))
-(define (get-gc-metrics-updater registry)
- (define metrics
- `((gc-time-taken
- . ,(make-gauge-metric registry "guile_gc_time_taken"))
- (heap-size
- . ,(make-gauge-metric registry "guile_heap_size"))
- (heap-free-size
- . ,(make-gauge-metric registry "guile_heap_free_size"))
- (heap-total-allocated
- . ,(make-gauge-metric registry "guile_heap_total_allocated"))
- (heap-allocated-since-gc
- . ,(make-gauge-metric registry "guile_allocated_since_gc"))
- (protected-objects
- . ,(make-gauge-metric registry "guile_gc_protected_objects"))
- (gc-times
- . ,(make-gauge-metric registry "guile_gc_times"))))
-
- (lambda ()
- (let ((stats (gc-stats)))
- (for-each
- (match-lambda
- ((name . metric)
- (let ((value (assq-ref stats name)))
- (metric-set metric value))))
- metrics))))
-
-(define (get-port-metrics-updater registry)
- (let ((ports-metric
- (make-gauge-metric registry "guile_ports_total"))
- (fds-metric
- (make-gauge-metric registry "file_descriptors_total")))
- (lambda ()
- (let ((count 0))
- (port-for-each
- (lambda _
- (set! count (+ 1 count))))
-
- (metric-set ports-metric count))
-
- (metric-set
- fds-metric
- (length
- ;; In theory 'scandir' cannot return #f, but in practice,
- ;; we've seen it before.
- (or (scandir "/proc/self/fd"
- (lambda (file)
- (not (member file '("." "..")))))
- '()))))))
-
(define (get-guix-metrics-updater registry)
(define guix-db "/var/guix/db/db.sqlite")
(define guix-db-wal (string-append guix-db "-wal"))
diff --git a/guix-data-service/web/controller.scm
b/guix-data-service/web/controller.scm
index 1fb369c..d503052 100644
--- a/guix-data-service/web/controller.scm
+++ b/guix-data-service/web/controller.scm
@@ -200,8 +200,8 @@
(gc-metrics-updater
(get-gc-metrics-updater registry))
- (port-metrics-updater
- (get-port-metrics-updater registry))
+ (process-metrics-updater
+ (get-process-metrics-updater registry))
(guix-metrics-updater
(get-guix-metrics-updater registry)))
@@ -439,7 +439,7 @@
(or load-new-guix-revision-job-metrics '()))
(gc-metrics-updater)
- (port-metrics-updater)
+ (process-metrics-updater)
(guix-metrics-updater)
(guile-time-metrics-updater)
