Skip to content

Update prometheus/common and prometheus/client_golang #1749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
Merged

Update prometheus/common and prometheus/client_golang #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cmd/yace/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Version: %s
var sem = semaphore.NewWeighted(1)

const (
defaultLogLevel = "info"
defaultLogFormat = "json"
)

Expand All @@ -76,7 +77,7 @@ func main() {
if err := app.Run(os.Args); err != nil {
// if we exit very early we'll not have set up the logger yet
if logger == nil {
jsonFmt := &promslog.AllowedFormat{}
jsonFmt := promslog.NewFormat()
_ = jsonFmt.Set("json")
logger = promslog.New(&promslog.Config{Format: jsonFmt})
}
Expand Down Expand Up @@ -113,7 +114,7 @@ func NewYACEApp() *cli.App {
},
&cli.StringFlag{
Name: "log.level",
Value: "",
Value: defaultLogLevel,
Usage: promslogflag.LevelFlagHelp,
Destination: &logLevel,
Action: func(_ *cli.Context, s string) error {
Expand Down Expand Up @@ -354,10 +355,10 @@ func newLogger(format, level string) *slog.Logger {
// If flag parsing was successful, then we know that format and level
// are both valid options; no need to error check their returns, just
// set their values.
f := &promslog.AllowedFormat{}
f := promslog.NewFormat()
_ = f.Set(format)

lvl := &promslog.AllowedLevel{}
lvl := promslog.NewLevel()
_ = lvl.Set(level)

return promslog.New(&promslog.Config{Format: f, Level: lvl})
Expand Down
11 changes: 6 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.38.4
github.com/aws/smithy-go v1.23.0
github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/client_golang v1.23.1
github.com/prometheus/client_model v0.6.2
github.com/prometheus/common v0.62.0
github.com/prometheus/common v0.66.1
github.com/r3labs/diff/v3 v3.0.1
github.com/stretchr/testify v1.11.1
github.com/urfave/cli/v2 v2.27.7
Expand Down Expand Up @@ -52,13 +52,14 @@ require (
github.com/kr/text v0.2.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
golang.org/x/sys v0.30.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/sys v0.35.0 // indirect
google.golang.org/protobuf v1.36.8 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
24 changes: 14 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
github.com/prometheus/client_golang v1.23.1 h1:w6gXMLQGgd0jXXlote9lRHMe0nG01EbnJT+C0EJru2Y=
github.com/prometheus/client_golang v1.23.1/go.mod h1:br8j//v2eg2K5Vvna5klK8Ku5pcU5r4ll73v6ik5dIQ=
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/r3labs/diff/v3 v3.0.1 h1:CBKqf3XmNRHXKmdU7mZP1w7TV0pDyVCis1AUHtA4Xtg=
github.com/r3labs/diff/v3 v3.0.1/go.mod h1:f1S9bourRbiM66NskseyUdo0fTmEE0qKrikYJX63dgo=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
Expand All @@ -113,14 +113,18 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
Expand Down
2 changes: 1 addition & 1 deletion pkg/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func UpdateMetrics(
optFuncs ...OptionsFunc,
) error {
// Use legacy validation as that's the behaviour of former releases.
prom.NameValidationScheme = prom.LegacyValidation
prom.NameValidationScheme = prom.LegacyValidation //nolint:staticcheck

options := defaultOptions()
for _, f := range optFuncs {
Expand Down
2 changes: 1 addition & 1 deletion pkg/job/scraper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ func TestScrapeRunner_Run(t *testing.T) {
MetadataRunFunc: tc.metadataRunFunc,
CloudwatchRunFunc: tc.cloudwatchRunFunc,
}
lvl := &promslog.AllowedLevel{}
lvl := promslog.NewLevel()
_ = lvl.Set("debug")
sr := job.NewScraper(promslog.New(&promslog.Config{Level: lvl}), tc.jobsCfg, &rf)
resources, metrics, errs := sr.Scrape(context.Background())
Expand Down
2 changes: 1 addition & 1 deletion pkg/promutil/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func PromStringTag(text string, labelsSnakeCase bool) (bool, string) {
} else {
s = sanitize(text)
}
return model.LabelName(s).IsValid(), s
return model.LabelName(s).IsValid(), s //nolint:staticcheck
}

// sanitize replaces some invalid chars with an underscore
Expand Down
12 changes: 6 additions & 6 deletions pkg/promutil/prometheus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ func TestSanitize(t *testing.T) {
}

func TestPromStringTag(t *testing.T) {
originalValidationScheme := model.NameValidationScheme
model.NameValidationScheme = model.LegacyValidation
originalValidationScheme := model.NameValidationScheme //nolint:staticcheck
model.NameValidationScheme = model.LegacyValidation //nolint:staticcheck
defer func() {
model.NameValidationScheme = originalValidationScheme
model.NameValidationScheme = originalValidationScheme //nolint:staticcheck
}()

testCases := []struct {
Expand Down Expand Up @@ -117,10 +117,10 @@ func TestPromStringTag(t *testing.T) {
}

func TestNewPrometheusCollector_CanReportMetricsAndErrors(t *testing.T) {
originalValidationScheme := model.NameValidationScheme
model.NameValidationScheme = model.LegacyValidation
originalValidationScheme := model.NameValidationScheme //nolint:staticcheck
model.NameValidationScheme = model.LegacyValidation //nolint:staticcheck
defer func() {
model.NameValidationScheme = originalValidationScheme
model.NameValidationScheme = originalValidationScheme //nolint:staticcheck
}()

metrics := []*PrometheusMetric{
Expand Down
Loading