Skip to content

Commit 3e6383f

Browse files
dependabot[bot]adleong
dependabot[bot]
and
adleong
authored
build(deps): bump github.com/prometheus/common from 0.65.0 to 0.66.0 (#14446)
* build(deps): bump github.com/prometheus/common from 0.65.0 to 0.66.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.65.0 to 0.66.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.65.0...v0.66.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-version: 0.66.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * use NewTextParser instead of zero-value TextParser Signed-off-by: Alex Leong <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Alex Leong <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Leong <[email protected]>
1 parent 560a172 commit 3e6383f

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

‎cli/cmd/metrics_diagnostics_util.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/linkerd/linkerd2/pkg/k8s"
1313
"github.com/prometheus/common/expfmt"
14+
"github.com/prometheus/common/model"
1415
corev1 "k8s.io/api/core/v1"
1516
)
1617

@@ -133,7 +134,7 @@ var obfuscationMap = map[string]struct{}{
133134
func obfuscateMetrics(metrics []byte) ([]byte, error) {
134135
reader := bytes.NewReader(metrics)
135136

136-
var metricsParser expfmt.TextParser
137+
metricsParser := expfmt.NewTextParser(model.LegacyValidation)
137138

138139
parsedMetrics, err := metricsParser.TextToMetricFamilies(reader)
139140
if err != nil {

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15
2929
github.com/prometheus/client_golang v1.23.0
3030
github.com/prometheus/client_model v0.6.2
31-
github.com/prometheus/common v0.65.0
31+
github.com/prometheus/common v0.66.0
3232
github.com/sergi/go-diff v1.4.0
3333
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
3434
github.com/sirupsen/logrus v1.9.3
@@ -56,6 +56,7 @@ require (
5656
)
5757

5858
require (
59+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5960
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6061
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
6162
)

‎go.sum‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
217217
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
218218
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
219219
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
220+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
221+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
220222
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b h1:NGgE5ELokSf2tZ/bydyDUKrvd/jP8lrAoPNeBuMOTOk=
221223
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b/go.mod h1:zT/uzhdQGTqlwTq7Lpbj3JoJQWfPfIJ1tE0OidAmih8=
222224
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -336,8 +338,8 @@ github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4
336338
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
337339
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
338340
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
339-
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
340-
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
341+
github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
342+
github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
341343
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
342344
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
343345
github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
@@ -386,8 +388,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
386388
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
387389
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
388390
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
389-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
390-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
391+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
392+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
391393
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
392394
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
393395
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
@@ -447,6 +449,8 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
447449
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
448450
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
449451
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
452+
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
453+
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
450454
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
451455
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
452456
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=

‎multicluster/cmd/check.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/linkerd/linkerd2/pkg/tls"
2020
"github.com/linkerd/linkerd2/pkg/version"
2121
"github.com/prometheus/common/expfmt"
22+
"github.com/prometheus/common/model"
2223
log "github.com/sirupsen/logrus"
2324
"github.com/spf13/cobra"
2425
corev1 "k8s.io/api/core/v1"
@@ -747,7 +748,7 @@ func (hc *healthChecker) checkIfGatewayMirrorsHaveEndpoints(ctx context.Context,
747748
continue
748749
}
749750

750-
var metricsParser expfmt.TextParser
751+
metricsParser := expfmt.NewTextParser(model.LegacyValidation)
751752
parsedMetrics, err := metricsParser.TextToMetricFamilies(bytes.NewReader(gatewayMetric.metrics))
752753
if err != nil {
753754
errors = append(errors, fmt.Errorf("failed to parse gateway metrics for target cluster %s: %w", link.Spec.TargetClusterName, err))

‎multicluster/cmd/gateways.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/linkerd/linkerd2/pkg/k8s"
1616
io_prometheus_client "github.com/prometheus/client_model/go"
1717
"github.com/prometheus/common/expfmt"
18+
"github.com/prometheus/common/model"
1819
"github.com/spf13/cobra"
1920
corev1 "k8s.io/api/core/v1"
2021
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -115,7 +116,7 @@ func newGatewaysCommand() *cobra.Command {
115116

116117
// Parse the gateway metrics so that we can extract liveness
117118
// and latency information.
118-
var metricsParser expfmt.TextParser
119+
metricsParser := expfmt.NewTextParser(model.LegacyValidation)
119120
parsedMetrics, err := metricsParser.TextToMetricFamilies(bytes.NewReader(gateway.metrics))
120121
if err != nil {
121122
fmt.Fprintf(os.Stderr, "Failed to parse metrics for %s: %s\n", gateway.clusterName, err)

‎testutil/prommatch/prommatch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func hasName(metricName string) Expression {
175175
func extractSamplesVectorFromString(s string) (model.Vector, error) {
176176
bb := bytes.NewBufferString(s)
177177

178-
p := &expfmt.TextParser{}
178+
p := expfmt.NewTextParser(model.LegacyValidation)
179179
metricFamilies, err := p.TextToMetricFamilies(bb)
180180
if err != nil {
181181
return nil, fmt.Errorf("failed to parse input as metrics: %w", err)

0 commit comments

Comments
 (0)