From 09156d59bfcc10a2537ee35340c2ea5c20638ee0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 00:06:13 +0000 Subject: [PATCH] build(deps): bump github.com/kubernetes-csi/csi-lib-utils Bumps [github.com/kubernetes-csi/csi-lib-utils](https://github.com/kubernetes-csi/csi-lib-utils) from 0.20.0 to 0.21.0. - [Release notes](https://github.com/kubernetes-csi/csi-lib-utils/releases) - [Commits](https://github.com/kubernetes-csi/csi-lib-utils/compare/v0.20.0...v0.21.0) --- updated-dependencies: - dependency-name: github.com/kubernetes-csi/csi-lib-utils dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +-- .../csi-lib-utils/metrics/metrics.go | 25 ++++++++++++++----- .../protosanitizer/protosanitizer.go | 6 ++++- vendor/modules.txt | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 5bca36da..dd83b976 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/IBM/csi-volume-group-operator v0.9.2 github.com/csi-addons/spec v0.2.0 github.com/go-logr/logr v1.4.2 - github.com/kubernetes-csi/csi-lib-utils v0.20.0 + github.com/kubernetes-csi/csi-lib-utils v0.21.0 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index 4ac0f8c3..64810aea 100644 --- a/go.sum +++ b/go.sum @@ -69,8 +69,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes-csi/csi-lib-utils v0.20.0 h1:JTvHRJugn+cByMnIU4nCnqPqOOUhuPzhlLqRvenwjDA= -github.com/kubernetes-csi/csi-lib-utils v0.20.0/go.mod h1:3b/HFVURW11oxV/gUAKyhhkvFpxXO/zRdvh1wdEfCZY= +github.com/kubernetes-csi/csi-lib-utils v0.21.0 h1:dUN/iIgXLucAxyML2iPyhniIlACQumIeAJmIzsMBddc= +github.com/kubernetes-csi/csi-lib-utils v0.21.0/go.mod h1:ZCVRTYuup+bwX9tOeE5Q3LDw64QvltSwMUQ3M3g2T+Q= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= diff --git a/vendor/github.com/kubernetes-csi/csi-lib-utils/metrics/metrics.go b/vendor/github.com/kubernetes-csi/csi-lib-utils/metrics/metrics.go index 33b64c7c..305e7997 100644 --- a/vendor/github.com/kubernetes-csi/csi-lib-utils/metrics/metrics.go +++ b/vendor/github.com/kubernetes-csi/csi-lib-utils/metrics/metrics.go @@ -25,6 +25,7 @@ import ( "strings" "time" + "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/component-base/metrics" @@ -91,6 +92,11 @@ type CSIMetricsManager interface { // value is defined in the metrics manager HaveAdditionalLabel(name string) bool + // WithAdditionalRegistry can be used to ensure additional non-CSI registries are served through RegisterToServer + // + // registry - Any registry which implements Gather() (e.g. metrics.KubeRegistry, prometheus.Registry, etc.) + WithAdditionalRegistry(registry prometheus.Gatherer) CSIMetricsManager + // SetDriverName is called to update the CSI driver name. This should be done // as soon as possible, otherwise metrics recorded by this manager will be // recorded with an "unknown-driver" driver_name. @@ -242,11 +248,6 @@ func NewCSIMetricsManagerWithOptions(driverName string, options ...MetricsManage // https://github.com/open-telemetry/opentelemetry-collector/issues/969 // Add process_start_time_seconds into the metric to let the start time be parsed correctly metrics.RegisterProcessStartTime(cmm.registry.Register) - // TODO: This is a bug in component-base library. We need to remove this after upgrade component-base dependency - // BugFix: https://github.com/kubernetes/kubernetes/pull/96435 - // The first call to RegisterProcessStartTime can only create the metric, so we need a second call to actually - // register the metric. - metrics.RegisterProcessStartTime(cmm.registry.Register) } labels := []string{labelCSIDriverName, labelCSIOperationName, labelGrpcStatusCode} @@ -266,6 +267,9 @@ func NewCSIMetricsManagerWithOptions(driverName string, options ...MetricsManage ) cmm.SetDriverName(driverName) cmm.registerMetrics() + cmm.gatherers = prometheus.Gatherers{ + cmm.GetRegistry(), + } return &cmm } @@ -278,6 +282,7 @@ type csiMetricsManager struct { driverName string additionalLabelNames []string additionalLabels []label + gatherers prometheus.Gatherers csiOperationsLatencyMetric *metrics.HistogramVec registerProcessStartTime bool } @@ -367,6 +372,14 @@ func (cmm *csiMetricsManager) HaveAdditionalLabel(name string) bool { return false } +// WithAdditionalRegistry can be used to ensure additional non-CSI registries are served through RegisterToServer +// +// registry - Any registry which implements Gather() (e.g. metrics.KubeRegistry, prometheus.Registry, etc.) +func (cmm *csiMetricsManager) WithAdditionalRegistry(registry prometheus.Gatherer) CSIMetricsManager { + cmm.gatherers = append(cmm.gatherers, registry) + return cmm +} + // RecordMetrics passes the stored values as to the implementation. func (cmmv *csiMetricsManagerWithValues) RecordMetrics( operationName string, @@ -390,7 +403,7 @@ func (cmm *csiMetricsManager) SetDriverName(driverName string) { // given server at the specified address/path. func (cmm *csiMetricsManager) RegisterToServer(s Server, metricsPath string) { s.Handle(metricsPath, metrics.HandlerFor( - cmm.GetRegistry(), + cmm.gatherers, metrics.HandlerOpts{ ErrorHandling: metrics.ContinueOnError})) } diff --git a/vendor/github.com/kubernetes-csi/csi-lib-utils/protosanitizer/protosanitizer.go b/vendor/github.com/kubernetes-csi/csi-lib-utils/protosanitizer/protosanitizer.go index 2b63f249..253116de 100644 --- a/vendor/github.com/kubernetes-csi/csi-lib-utils/protosanitizer/protosanitizer.go +++ b/vendor/github.com/kubernetes-csi/csi-lib-utils/protosanitizer/protosanitizer.go @@ -68,7 +68,11 @@ func stripSingleValue(field protoreflect.FieldDescriptor, v protoreflect.Value) case protoreflect.MessageKind: return stripMessage(v.Message()) case protoreflect.EnumKind: - return field.Enum().Values().ByNumber(v.Enum()).Name() + desc := field.Enum().Values().ByNumber(v.Enum()) + if desc == nil { + return v.Enum() + } + return desc.Name() default: return v.Interface() } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3d4860ff..6248aab1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -106,7 +106,7 @@ github.com/klauspost/compress/internal/cpuinfo github.com/klauspost/compress/internal/snapref github.com/klauspost/compress/zstd github.com/klauspost/compress/zstd/internal/xxhash -# github.com/kubernetes-csi/csi-lib-utils v0.20.0 +# github.com/kubernetes-csi/csi-lib-utils v0.21.0 ## explicit; go 1.23.1 github.com/kubernetes-csi/csi-lib-utils/connection github.com/kubernetes-csi/csi-lib-utils/metrics