14873: Updates test for fix deprecation warning.

[arvados.git] / services / keepstore / mounts_test.go

diff --git a/services/keepstore/mounts_test.go b/services/keepstore/mounts_test.go
index 588bb4299c531ff72d6633b95464790c7e9bb0b6..7c932ee023b2a188433e34bbf773cc0eb8b64b08 100644 (file)
--- a/services/keepstore/mounts_test.go
+++ b/services/keepstore/mounts_test.go
@@ -12,6 +12,7 @@ import (
        "net/http/httptest"
 
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+       "github.com/prometheus/client_golang/prometheus"
        check "gopkg.in/check.v1"
 )
 
@@ -28,15 +29,16 @@ func (s *MountsSuite) SetUpTest(c *check.C) {
        theConfig = DefaultConfig()
        theConfig.systemAuthToken = arvadostest.DataManagerToken
        theConfig.ManagementToken = arvadostest.ManagementToken
-       theConfig.Start()
-       s.rtr = MakeRESTRouter(testCluster)
+       r := prometheus.NewRegistry()
+       theConfig.Start(r)
+       s.rtr = MakeRESTRouter(testCluster, r)
 }
 
 func (s *MountsSuite) TearDownTest(c *check.C) {
        s.vm.Close()
        KeepVM = nil
        theConfig = DefaultConfig()
-       theConfig.Start()
+       theConfig.Start(prometheus.NewRegistry())
 }
 
 func (s *MountsSuite) TestMounts(c *check.C) {
@@ -147,15 +149,15 @@ func (s *MountsSuite) TestMetrics(c *check.C) {
        c.Check(found["time_to_status_seconds"], check.Equals, true)
 
        metricsNames := []string{
-               "arvados_keepstore_bufferpool_buffers_in_use",
-               "arvados_keepstore_bufferpool_buffers_max",
-               "arvados_keepstore_bufferpool_bytes_allocated",
-               "arvados_keepstore_pull_queue_in_progress",
-               "arvados_keepstore_pull_queue_queued",
-               "arvados_keepstore_requests_current",
-               "arvados_keepstore_requests_max",
-               "arvados_keepstore_trash_queue_in_progress",
-               "arvados_keepstore_trash_queue_queued",
+               "arvados_keepstore_bufferpool_inuse_buffers",
+               "arvados_keepstore_bufferpool_max_buffers",
+               "arvados_keepstore_bufferpool_allocated_bytes",
+               "arvados_keepstore_pull_queue_inprogress_entries",
+               "arvados_keepstore_pull_queue_pending_entries",
+               "arvados_keepstore_concurrent_requests",
+               "arvados_keepstore_max_concurrent_requests",
+               "arvados_keepstore_trash_queue_inprogress_entries",
+               "arvados_keepstore_trash_queue_pending_entries",
                "request_duration_seconds",
                "time_to_status_seconds",
        }