WIP: update csi-lib-utils 0.9.0

go.mod

@@ -99,3 +99,5 @@ replace (
 // - https://github.com/kubernetes/kubernetes/pull/94647
 // - https://github.com/kubernetes/kubernetes/pull/93930
 replace k8s.io/kubernetes => github.com/pohly/kubernetes v1.10.0-alpha.3.0.20200909111025-b4fda25e0e77
+
+replace github.com/kubernetes-csi/csi-lib-utils => /nvme/gopath/src/github.com/kubernetes-csi/csi-lib-utils

go.sum

@@ -447,8 +447,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kubernetes-csi/csi-lib-utils v0.8.1 h1:DHFs4MgzjSGF/FH95TEdLVa7R1CCi9UJ76jTUPO8iF0=
-github.com/kubernetes-csi/csi-lib-utils v0.8.1/go.mod h1:FZflf0cCYlCquPQxVHa6Tyy0i/so6VAZTiEVK1do7CU=
 github.com/kubernetes-csi/csi-test/v3 v3.1.1 h1:mFxPbUf7pti663WTCsfaT3YRPVIzy0yLx8HWbVKfN4I=
 github.com/kubernetes-csi/csi-test/v3 v3.1.1/go.mod h1:UWxYP5cDlD6iSNVKEiLFqfJnJinuhtI7MLt61rQQOfI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
@@ -1097,8 +1095,6 @@ k8s.io/csi-translation-lib v0.19.0/go.mod h1:zGS1YqV8U2So/t4Hz8SoRXMx5y5/KSKnA6B
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=

pkg/pmem-csi-driver/pmem-csi-driver.go

@@ -309,7 +309,11 @@ func (csid *csiDriver) Run() error {
 
 	// On the csi.sock endpoint we gather statistics for incoming
 	// CSI method calls like any other CSI driver.
-	cmm := metrics.NewCSIMetricsManagerForPlugin(csid.cfg.DriverName)
+	cmm := metrics.NewCSIMetricsManagerWithOptions(
+		csid.cfg.DriverName,
+		metrics.WithSubsystem(metrics.SubsystemPlugin),
+		metrics.WithProcessStartTime(false), // must be disabled because we get it from the Prometheus Golang collector
+	)
 	csid.gatherers = append(csid.gatherers, cmm.GetRegistry())
 
 	switch csid.cfg.Mode {
@@ -350,6 +354,7 @@ func (csid *csiDriver) Run() error {
 			// Always add the instance label to allow correlating with
 			// the controller calls.
 			metrics.WithLabels(map[string]string{registryserver.NodeLabel: csid.cfg.NodeID}),
+			metrics.WithProcessStartTime(false), // must be disabled because we get it from the Prometheus Golang collector
 		)
 		csid.gatherers = append(csid.gatherers, cmmInternal.GetRegistry())
 		if err := s.Start(csid.cfg.ControllerEndpoint, csid.serverTLSConfig, cmmInternal, cs); err != nil {