From 126139084160563c2b4fe3969461c40ecbbf6951 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Fri, 18 Sep 2020 14:40:11 -0400 Subject: [PATCH] 16838: implement review feedback. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- lib/dispatchcloud/worker/pool.go | 3 --- lib/dispatchcloud/worker/worker_test.go | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go index 78c51dee10..72d5ca56e7 100644 --- a/lib/dispatchcloud/worker/pool.go +++ b/lib/dispatchcloud/worker/pool.go @@ -690,9 +690,6 @@ func (wp *Pool) registerMetrics(reg *prometheus.Registry) { Help: "Number of seconds per runProbe call.", Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.95: 0.005, 0.99: 0.001}, }, []string{"outcome"}) - for _, v := range []string{"success", "fail"} { - wp.mRunProbeDuration.WithLabelValues(v).Observe(0) - } reg.MustRegister(wp.mRunProbeDuration) } diff --git a/lib/dispatchcloud/worker/worker_test.go b/lib/dispatchcloud/worker/worker_test.go index a4c2a6370f..cfb7a1bfb7 100644 --- a/lib/dispatchcloud/worker/worker_test.go +++ b/lib/dispatchcloud/worker/worker_test.go @@ -17,6 +17,7 @@ import ( "git.arvados.org/arvados.git/lib/dispatchcloud/test" "git.arvados.org/arvados.git/sdk/go/arvados" "git.arvados.org/arvados.git/sdk/go/ctxlog" + "github.com/prometheus/client_golang/prometheus" check "gopkg.in/check.v1" ) @@ -239,6 +240,7 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) { runnerData: trial.deployRunner, runnerMD5: md5.Sum(trial.deployRunner), } + wp.registerMetrics(prometheus.NewRegistry()) if trial.deployRunner != nil { svHash := md5.Sum(trial.deployRunner) wp.runnerCmd = fmt.Sprintf("/var/run/arvados/crunch-run~%x", svHash) -- 2.30.2