From e3089669f1fbc91cf56a19e190f5aa8d29aaa4ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Mar 2025 11:06:02 +0100
Subject: [PATCH] Bump github.com/prometheus/client_golang from 1.20.5 to
1.21.1 (#598)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.5 to 1.21.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.20.5...v1.21.1)
---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
go.mod | 2 +-
go.sum | 4 +-
.../client_golang/prometheus/atomic_update.go | 50 -------------------
.../client_golang/prometheus/counter.go | 10 ++--
.../client_golang/prometheus/gauge.go | 10 ++--
.../client_golang/prometheus/histogram.go | 10 ++--
.../prometheus/process_collector_darwin.go | 2 +
...n.c => process_collector_mem_cgo_darwin.c} | 2 +-
...go => process_collector_mem_cgo_darwin.go} | 2 +-
... => process_collector_mem_nocgo_darwin.go} | 2 +-
....go => process_collector_not_supported.go} | 4 +-
....go => process_collector_procfsenabled.go} | 0
.../client_golang/prometheus/summary.go | 25 ++++++----
vendor/modules.txt | 2 +-
14 files changed, 47 insertions(+), 78 deletions(-)
delete mode 100644 vendor/github.com/prometheus/client_golang/prometheus/atomic_update.go
rename vendor/github.com/prometheus/client_golang/prometheus/{process_collector_cgo_darwin.c => process_collector_mem_cgo_darwin.c} (98%)
rename vendor/github.com/prometheus/client_golang/prometheus/{process_collector_cgo_darwin.go => process_collector_mem_cgo_darwin.go} (97%)
rename vendor/github.com/prometheus/client_golang/prometheus/{process_collector_nocgo_darwin.go => process_collector_mem_nocgo_darwin.go} (97%)
rename vendor/github.com/prometheus/client_golang/prometheus/{process_collector_wasip1_js.go => process_collector_not_supported.go} (95%)
rename vendor/github.com/prometheus/client_golang/prometheus/{process_collector_other.go => process_collector_procfsenabled.go} (100%)
diff --git a/go.mod b/go.mod
index a16a1313..3784399d 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
github.com/netobserv/gopipes v0.3.0
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250227173154-57a2590a1d16
github.com/paulbellamy/ratecounter v0.2.0
- github.com/prometheus/client_golang v1.21.0
+ github.com/prometheus/client_golang v1.21.1
github.com/segmentio/kafka-go v0.4.47
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
diff --git a/go.sum b/go.sum
index 3f0ad843..c77a9846 100644
--- a/go.sum
+++ b/go.sum
@@ -799,8 +799,8 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O
github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
-github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/atomic_update.go b/vendor/github.com/prometheus/client_golang/prometheus/atomic_update.go
deleted file mode 100644
index b65896a3..00000000
--- a/vendor/github.com/prometheus/client_golang/prometheus/atomic_update.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package prometheus
-
-import (
- "math"
- "sync/atomic"
- "time"
-)
-
-// atomicUpdateFloat atomically updates the float64 value pointed to by bits
-// using the provided updateFunc, with an exponential backoff on contention.
-func atomicUpdateFloat(bits *uint64, updateFunc func(float64) float64) {
- const (
- // both numbers are derived from empirical observations
- // documented in this PR: https://github.com/prometheus/client_golang/pull/1661
- maxBackoff = 320 * time.Millisecond
- initialBackoff = 10 * time.Millisecond
- )
- backoff := initialBackoff
-
- for {
- loadedBits := atomic.LoadUint64(bits)
- oldFloat := math.Float64frombits(loadedBits)
- newFloat := updateFunc(oldFloat)
- newBits := math.Float64bits(newFloat)
-
- if atomic.CompareAndSwapUint64(bits, loadedBits, newBits) {
- break
- } else {
- // Exponential backoff with sleep and cap to avoid infinite wait
- time.Sleep(backoff)
- backoff *= 2
- if backoff > maxBackoff {
- backoff = maxBackoff
- }
- }
- }
-}
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/counter.go b/vendor/github.com/prometheus/client_golang/prometheus/counter.go
index 2996aef6..4ce84e7a 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/counter.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/counter.go
@@ -134,9 +134,13 @@ func (c *counter) Add(v float64) {
return
}
- atomicUpdateFloat(&c.valBits, func(oldVal float64) float64 {
- return oldVal + v
- })
+ for {
+ oldBits := atomic.LoadUint64(&c.valBits)
+ newBits := math.Float64bits(math.Float64frombits(oldBits) + v)
+ if atomic.CompareAndSwapUint64(&c.valBits, oldBits, newBits) {
+ return
+ }
+ }
}
func (c *counter) AddWithExemplar(v float64, e Labels) {
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/gauge.go b/vendor/github.com/prometheus/client_golang/prometheus/gauge.go
index aa184636..dd2eac94 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/gauge.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/gauge.go
@@ -120,9 +120,13 @@ func (g *gauge) Dec() {
}
func (g *gauge) Add(val float64) {
- atomicUpdateFloat(&g.valBits, func(oldVal float64) float64 {
- return oldVal + val
- })
+ for {
+ oldBits := atomic.LoadUint64(&g.valBits)
+ newBits := math.Float64bits(math.Float64frombits(oldBits) + val)
+ if atomic.CompareAndSwapUint64(&g.valBits, oldBits, newBits) {
+ return
+ }
+ }
}
func (g *gauge) Sub(val float64) {
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/histogram.go b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
index 1a279035..c453b754 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
@@ -1647,9 +1647,13 @@ func waitForCooldown(count uint64, counts *histogramCounts) {
// atomicAddFloat adds the provided float atomically to another float
// represented by the bit pattern the bits pointer is pointing to.
func atomicAddFloat(bits *uint64, v float64) {
- atomicUpdateFloat(bits, func(oldVal float64) float64 {
- return oldVal + v
- })
+ for {
+ loadedBits := atomic.LoadUint64(bits)
+ newBits := math.Float64bits(math.Float64frombits(loadedBits) + v)
+ if atomic.CompareAndSwapUint64(bits, loadedBits, newBits) {
+ break
+ }
+ }
}
// atomicDecUint32 atomically decrements the uint32 p points to. See
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go
index 50eb860a..0a61b984 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go
@@ -11,6 +11,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+//go:build darwin && !ios
+
package prometheus
import (
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.c b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.c
similarity index 98%
rename from vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.c
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.c
index 1554f674..d00a2431 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.c
+++ b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.c
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build darwin && cgo
+//go:build darwin && !ios && cgo
#include <mach/mach_init.h>
#include <mach/task.h>
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.go
similarity index 97%
rename from vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.go
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.go
index b375c3a7..9ac53f99 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_cgo_darwin.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_cgo_darwin.go
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build darwin && cgo
+//go:build darwin && !ios && cgo
package prometheus
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_nocgo_darwin.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_nocgo_darwin.go
similarity index 97%
rename from vendor/github.com/prometheus/client_golang/prometheus/process_collector_nocgo_darwin.go
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_nocgo_darwin.go
index 51650473..8ddb0995 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_nocgo_darwin.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_mem_nocgo_darwin.go
@@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build darwin && !cgo
+//go:build darwin && !ios && !cgo
package prometheus
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_wasip1_js.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_not_supported.go
similarity index 95%
rename from vendor/github.com/prometheus/client_golang/prometheus/process_collector_wasip1_js.go
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector_not_supported.go
index c68f7f85..7732b7f3 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_wasip1_js.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_not_supported.go
@@ -11,8 +11,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build wasip1 || js
-// +build wasip1 js
+//go:build wasip1 || js || ios
+// +build wasip1 js ios
package prometheus
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/process_collector_other.go b/vendor/github.com/prometheus/client_golang/prometheus/process_collector_procfsenabled.go
similarity index 100%
rename from vendor/github.com/prometheus/client_golang/prometheus/process_collector_other.go
rename to vendor/github.com/prometheus/client_golang/prometheus/process_collector_procfsenabled.go
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/summary.go b/vendor/github.com/prometheus/client_golang/prometheus/summary.go
index 76a9e12f..ac5203c6 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/summary.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/summary.go
@@ -471,9 +471,13 @@ func (s *noObjectivesSummary) Observe(v float64) {
n := atomic.AddUint64(&s.countAndHotIdx, 1)
hotCounts := s.counts[n>>63]
- atomicUpdateFloat(&hotCounts.sumBits, func(oldVal float64) float64 {
- return oldVal + v
- })
+ for {
+ oldBits := atomic.LoadUint64(&hotCounts.sumBits)
+ newBits := math.Float64bits(math.Float64frombits(oldBits) + v)
+ if atomic.CompareAndSwapUint64(&hotCounts.sumBits, oldBits, newBits) {
+ break
+ }
+ }
// Increment count last as we take it as a signal that the observation
// is complete.
atomic.AddUint64(&hotCounts.count, 1)
@@ -515,13 +519,14 @@ func (s *noObjectivesSummary) Write(out *dto.Metric) error {
// Finally add all the cold counts to the new hot counts and reset the cold counts.
atomic.AddUint64(&hotCounts.count, count)
atomic.StoreUint64(&coldCounts.count, 0)
-
- // Use atomicUpdateFloat to update hotCounts.sumBits atomically.
- atomicUpdateFloat(&hotCounts.sumBits, func(oldVal float64) float64 {
- return oldVal + sum.GetSampleSum()
- })
- atomic.StoreUint64(&coldCounts.sumBits, 0)
-
+ for {
+ oldBits := atomic.LoadUint64(&hotCounts.sumBits)
+ newBits := math.Float64bits(math.Float64frombits(oldBits) + sum.GetSampleSum())
+ if atomic.CompareAndSwapUint64(&hotCounts.sumBits, oldBits, newBits) {
+ atomic.StoreUint64(&coldCounts.sumBits, 0)
+ break
+ }
+ }
return nil
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1883c83a..93f8647d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -416,7 +416,7 @@ github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
## explicit
github.com/pmezard/go-difflib/difflib
-# github.com/prometheus/client_golang v1.21.0
+# github.com/prometheus/client_golang v1.21.1
## explicit; go 1.21
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil/header
--
GitLab