13937: Simplifies volume counter stats assignments. Fixes test.

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

diff --git a/services/keepstore/azure_blob_volume.go b/services/keepstore/azure_blob_volume.go
index 66956b89ee83928261bc67dcedba075c20b78397..6b5b233c2a6701912ce06b1356fdb864778d0cf8 100644 (file)
--- a/services/keepstore/azure_blob_volume.go
+++ b/services/keepstore/azure_blob_volume.go
@@ -148,7 +148,7 @@ func (v *AzureBlobVolume) Type() string {
 }
 
 // Start implements Volume.
-func (v *AzureBlobVolume) Start(opsCounters, errCounters, ioBytes *prometheus.CounterVec) error {
+func (v *AzureBlobVolume) Start(vm *volumeMetricsVecs) error {
        if v.ContainerName == "" {
                return errors.New("no container name given")
        }
@@ -186,9 +186,7 @@ func (v *AzureBlobVolume) Start(opsCounters, errCounters, ioBytes *prometheus.Co
        }
        // Set up prometheus metrics
        lbls := prometheus.Labels{"device_id": v.DeviceID()}
-       v.container.stats.opsCounters = opsCounters.MustCurryWith(lbls)
-       v.container.stats.errCounters = errCounters.MustCurryWith(lbls)
-       v.container.stats.ioBytes = ioBytes.MustCurryWith(lbls)
+       v.container.stats.opsCounters, v.container.stats.errCounters, v.container.stats.ioBytes = vm.getCounterVecsFor(lbls)
 
        return nil
 }