16838: implement review feedback.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/lib/dispatchcloud/worker/pool.go b/lib/dispatchcloud/worker/pool.go
index 78c51dee10c9c3496d07585ff174324c0400625f..72d5ca56e75bcc7c3fc2893c20f34303e08a6652 100644 (file)
--- 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 a4c2a6370f3d5ce3803484b18ac811abec7e6bc1..cfb7a1bfb7a72b8924d5950deb7fc478f20873b0 100644 (file)
--- 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)