Fix missing namespace in metric names.

refs #14285

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go
index f42383297f3fd41067cd44766c10fa4c4066f5fc..e1b92005f340674050ec2a4c34a91b9ca399e6a4 100644 (file)
--- a/services/keep-balance/balance_run_test.go
+++ b/services/keep-balance/balance_run_test.go
@@ -460,9 +460,9 @@ func (s *runSuite) TestCommit(c *check.C) {
        c.Check(bal.stats.pulls, check.Equals, 2)
 
        metrics := s.getMetrics(c, srv)
-       c.Check(metrics, check.Matches, `(?ms).*\nkeep_total_bytes 15\n.*`)
-       c.Check(metrics, check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_sum [0-9\.]+\n.*`)
-       c.Check(metrics, check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_count 1\n.*`)
+       c.Check(metrics, check.Matches, `(?ms).*\narvados_keep_total_bytes 15\n.*`)
+       c.Check(metrics, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_sum [0-9\.]+\n.*`)
+       c.Check(metrics, check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count 1\n.*`)
 }
 
 func (s *runSuite) TestRunForever(c *check.C) {
@@ -504,7 +504,7 @@ func (s *runSuite) TestRunForever(c *check.C) {
        <-done
        c.Check(pullReqs.Count() >= 16, check.Equals, true)
        c.Check(trashReqs.Count(), check.Equals, pullReqs.Count()+4)
-       c.Check(s.getMetrics(c, srv), check.Matches, `(?ms).*\nkeepbalance_changeset_compute_seconds_count `+fmt.Sprintf("%d", pullReqs.Count()/4)+`\n.*`)
+       c.Check(s.getMetrics(c, srv), check.Matches, `(?ms).*\narvados_keepbalance_changeset_compute_seconds_count `+fmt.Sprintf("%d", pullReqs.Count()/4)+`\n.*`)
 }
 
 func (s *runSuite) getMetrics(c *check.C, srv *Server) string {

diff --git a/services/keep-balance/metrics.go b/services/keep-balance/metrics.go
index 96ee66ce56bd010299c9ef209a7ecc221bc606cd..0564d46cdae76c471129c4bfbf087ed2d06748db 100644 (file)
--- a/services/keep-balance/metrics.go
+++ b/services/keep-balance/metrics.go
@@ -39,6 +39,7 @@ func (m *metrics) DurationObserver(name, help string) observer {
                return obs
        }
        summary := prometheus.NewSummary(prometheus.SummaryOpts{
+               Namespace: "arvados",
                Name:      name,
                Subsystem: "keepbalance",
                Help:      help,
@@ -68,6 +69,7 @@ func (m *metrics) UpdateStats(s balancerStats) {
                // Register gauge(s) for each balancerStats field.
                addGauge := func(name, help string) {
                        g := prometheus.NewGauge(prometheus.GaugeOpts{
+                               Namespace: "arvados",
                                Name:      name,
                                Subsystem: "keep",
                                Help:      help,