From 87a0113a6948405c47474517d33de79d5cf9b1b0 Mon Sep 17 00:00:00 2001 From: Etienne Perot Date: Tue, 21 Feb 2023 14:59:00 -0800 Subject: [PATCH] `runsc metric-server`: Export aggregate metrics about number of sandboxes. These metrics were defined but not actually populated. PiperOrigin-RevId: 511314252 --- runsc/cmd/metric_server.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runsc/cmd/metric_server.go b/runsc/cmd/metric_server.go index 57932a66a..8170890ba 100644 --- a/runsc/cmd/metric_server.go +++ b/runsc/cmd/metric_server.go @@ -556,6 +556,7 @@ func (m *MetricServer) serveMetrics(w http.ResponseWriter, req *http.Request) ht loadedSandboxes = append(loadedSandboxes, <-loadedSandboxesCh) } close(loadedSandboxesCh) + numSandboxesTotal := m.numSandboxes m.mu.Unlock() // Now iterate over all sandboxes. @@ -683,6 +684,11 @@ func (m *MetricServer) serveMetrics(w http.ResponseWriter, req *http.Request) ht snapshotsToOptions[snapshotAndOptions.snapshot] = snapshotAndOptions.options } + // Add our own metrics. + selfMetrics.Add(prometheus.NewIntData(&NumRunningSandboxesMetric, meta.numRunningSandboxes)) + selfMetrics.Add(prometheus.NewIntData(&NumCannotExportSandboxesMetric, meta.numCannotExportSandboxes)) + selfMetrics.Add(prometheus.NewIntData(&NumTotalSandboxesMetric, numSandboxesTotal)) + // Write out all data. lastMetricsWrittenSize := int(m.lastMetricsWrittenSize.Load()) metricsWritten := make(map[string]bool, lastMetricsWrittenSize)