Skip to content

Commit 84eeb59

Browse files
cristiangrecocristiangreco
authored
Update prometheus/common and prometheus/client_golang (#1749)
Signed-off-by: Cristian Greco <cristian@regolo.cc>
1 parent 46f55eb commit 84eeb59

File tree

7 files changed

+34
-28
lines changed

7 files changed

+34
-28
lines changed

‎cmd/yace/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Version: %s
5252
var sem = semaphore.NewWeighted(1)
5353

5454
const (
55+
defaultLogLevel = "info"
5556
defaultLogFormat = "json"
5657
)
5758

@@ -76,7 +77,7 @@ func main() {
7677
if err := app.Run(os.Args); err != nil {
7778
// if we exit very early we'll not have set up the logger yet
7879
if logger == nil {
79-
jsonFmt := &promslog.AllowedFormat{}
80+
jsonFmt := promslog.NewFormat()
8081
_ = jsonFmt.Set("json")
8182
logger = promslog.New(&promslog.Config{Format: jsonFmt})
8283
}
@@ -113,7 +114,7 @@ func NewYACEApp() *cli.App {
113114
},
114115
&cli.StringFlag{
115116
Name: "log.level",
116-
Value: "",
117+
Value: defaultLogLevel,
117118
Usage: promslogflag.LevelFlagHelp,
118119
Destination: &logLevel,
119120
Action: func(_ *cli.Context, s string) error {
@@ -354,10 +355,10 @@ func newLogger(format, level string) *slog.Logger {
354355
// If flag parsing was successful, then we know that format and level
355356
// are both valid options; no need to error check their returns, just
356357
// set their values.
357-
f := &promslog.AllowedFormat{}
358+
f := promslog.NewFormat()
358359
_ = f.Set(format)
359360

360-
lvl := &promslog.AllowedLevel{}
361+
lvl := promslog.NewLevel()
361362
_ = lvl.Set(level)
362363

363364
return promslog.New(&promslog.Config{Format: f, Level: lvl})

‎go.mod‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ require (
2121
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4
2222
github.com/aws/smithy-go v1.23.0
2323
github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da
24-
github.com/prometheus/client_golang v1.22.0
24+
github.com/prometheus/client_golang v1.23.1
2525
github.com/prometheus/client_model v0.6.2
26-
github.com/prometheus/common v0.62.0
26+
github.com/prometheus/common v0.66.1
2727
github.com/r3labs/diff/v3 v3.0.1
2828
github.com/stretchr/testify v1.11.1
2929
github.com/urfave/cli/v2 v2.27.7
@@ -52,13 +52,14 @@ require (
5252
github.com/kr/text v0.2.0 // indirect
5353
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5454
github.com/pmezard/go-difflib v1.0.0 // indirect
55-
github.com/prometheus/procfs v0.15.1 // indirect
55+
github.com/prometheus/procfs v0.16.1 // indirect
5656
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5757
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
5858
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
5959
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
6060
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
61-
golang.org/x/sys v0.30.0 // indirect
62-
google.golang.org/protobuf v1.36.6 // indirect
61+
go.yaml.in/yaml/v2 v2.4.2 // indirect
62+
golang.org/x/sys v0.35.0 // indirect
63+
google.golang.org/protobuf v1.36.8 // indirect
6364
gopkg.in/yaml.v3 v3.0.1 // indirect
6465
)

‎go.sum‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
8282
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
8383
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
8484
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
85-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
86-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
85+
github.com/prometheus/client_golang v1.23.1 h1:w6gXMLQGgd0jXXlote9lRHMe0nG01EbnJT+C0EJru2Y=
86+
github.com/prometheus/client_golang v1.23.1/go.mod h1:br8j//v2eg2K5Vvna5klK8Ku5pcU5r4ll73v6ik5dIQ=
8787
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
8888
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
89-
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
90-
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
91-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
92-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
89+
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
90+
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
91+
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
92+
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
9393
github.com/r3labs/diff/v3 v3.0.1 h1:CBKqf3XmNRHXKmdU7mZP1w7TV0pDyVCis1AUHtA4Xtg=
9494
github.com/r3labs/diff/v3 v3.0.1/go.mod h1:f1S9bourRbiM66NskseyUdo0fTmEE0qKrikYJX63dgo=
9595
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -113,14 +113,18 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC
113113
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
114114
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
115115
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
116+
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
117+
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
118+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
119+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
116120
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
117121
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
118122
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
119123
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
120-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
121-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
122-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
123-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
124+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
125+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
126+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
127+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
124128
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
125129
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
126130
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎pkg/exporter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func UpdateMetrics(
184184
optFuncs ...OptionsFunc,
185185
) error {
186186
// Use legacy validation as that's the behaviour of former releases.
187-
prom.NameValidationScheme = prom.LegacyValidation
187+
prom.NameValidationScheme = prom.LegacyValidation //nolint:staticcheck
188188

189189
options := defaultOptions()
190190
for _, f := range optFuncs {

‎pkg/job/scraper_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ func TestScrapeRunner_Run(t *testing.T) {
541541
MetadataRunFunc: tc.metadataRunFunc,
542542
CloudwatchRunFunc: tc.cloudwatchRunFunc,
543543
}
544-
lvl := &promslog.AllowedLevel{}
544+
lvl := promslog.NewLevel()
545545
_ = lvl.Set("debug")
546546
sr := job.NewScraper(promslog.New(&promslog.Config{Level: lvl}), tc.jobsCfg, &rf)
547547
resources, metrics, errs := sr.Scrape(context.Background())

‎pkg/promutil/prometheus.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func PromStringTag(text string, labelsSnakeCase bool) (bool, string) {
211211
} else {
212212
s = sanitize(text)
213213
}
214-
return model.LabelName(s).IsValid(), s
214+
return model.LabelName(s).IsValid(), s //nolint:staticcheck
215215
}
216216

217217
// sanitize replaces some invalid chars with an underscore

‎pkg/promutil/prometheus_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ func TestSanitize(t *testing.T) {
4848
}
4949

5050
func TestPromStringTag(t *testing.T) {
51-
originalValidationScheme := model.NameValidationScheme
52-
model.NameValidationScheme = model.LegacyValidation
51+
originalValidationScheme := model.NameValidationScheme //nolint:staticcheck
52+
model.NameValidationScheme = model.LegacyValidation //nolint:staticcheck
5353
defer func() {
54-
model.NameValidationScheme = originalValidationScheme
54+
model.NameValidationScheme = originalValidationScheme //nolint:staticcheck
5555
}()
5656

5757
testCases := []struct {
@@ -117,10 +117,10 @@ func TestPromStringTag(t *testing.T) {
117117
}
118118

119119
func TestNewPrometheusCollector_CanReportMetricsAndErrors(t *testing.T) {
120-
originalValidationScheme := model.NameValidationScheme
121-
model.NameValidationScheme = model.LegacyValidation
120+
originalValidationScheme := model.NameValidationScheme //nolint:staticcheck
121+
model.NameValidationScheme = model.LegacyValidation //nolint:staticcheck
122122
defer func() {
123-
model.NameValidationScheme = originalValidationScheme
123+
model.NameValidationScheme = originalValidationScheme //nolint:staticcheck
124124
}()
125125

126126
metrics := []*PrometheusMetric{

0 commit comments

Comments
 (0)