Bump prometheus/common to v0.63.0 (prometheus#16210)

ArthurSens · web-flow · commit 95f49dd84be7 · 2025-03-13T20:42:42.000+01:00
* Bump prometheus/common to v0.63.0

Signed-off-by: Arthur Silva Sens &lt;arthursens2005@gmail.com&gt;

* nolint usage of deprecated model.NameValidationScheme

Signed-off-by: Arthur Silva Sens &lt;arthursens2005@gmail.com&gt;

---------

Signed-off-by: Arthur Silva Sens &lt;arthursens2005@gmail.com&gt;
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
@@ -141,6 +141,7 @@ var (
 
 func init() {
 	// This can be removed when the legacy global mode is fully deprecated.
+	//nolint:staticcheck
 	model.NameValidationScheme = model.UTF8Validation
 
 	prometheus.MustRegister(versioncollector.NewCollector(strings.ReplaceAll(appName, "-", "_")))
diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go
@@ -45,6 +45,7 @@ import (
 
 func init() {
 	// This can be removed when the legacy global mode is fully deprecated.
+	//nolint:staticcheck
 	model.NameValidationScheme = model.UTF8Validation
 }
 
diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go
@@ -64,6 +64,7 @@ import (
 
 func init() {
 	// This can be removed when the legacy global mode is fully deprecated.
+	//nolint:staticcheck
 	model.NameValidationScheme = model.UTF8Validation
 }
 
diff --git a/cmd/promtool/main_test.go b/cmd/promtool/main_test.go
@@ -41,6 +41,7 @@ import (
 
 func init() {
 	// This can be removed when the legacy global mode is fully deprecated.
+	//nolint:staticcheck
 	model.NameValidationScheme = model.UTF8Validation
 }
 
diff --git a/config/config.go b/config/config.go
@@ -837,6 +837,7 @@ func (c *ScrapeConfig) Validate(globalConfig GlobalConfig) error {
 		}
 	}
 
+	//nolint:staticcheck
 	if model.NameValidationScheme != model.UTF8Validation {
 		return errors.New("model.NameValidationScheme must be set to UTF8")
 	}
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/prometheus/alertmanager v0.28.0
 	github.com/prometheus/client_golang v1.21.0-rc.0
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.62.0
+	github.com/prometheus/common v0.63.0
 	github.com/prometheus/common/assets v0.2.0
 	github.com/prometheus/exporter-toolkit v0.14.0
 	github.com/prometheus/sigv4 v0.1.2
diff --git a/go.sum b/go.sum
@@ -441,8 +441,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-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/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
 github.com/prometheus/common/assets v0.2.0 h1:0P5OrzoHrYBOSM1OigWL3mY8ZvV2N4zIE/5AahrSrfM=
 github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI=
 github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
diff --git a/util/logging/file.go b/util/logging/file.go
@@ -45,7 +45,7 @@ func NewJSONFileLogger(s string) (*JSONFileLogger, error) {
 		return nil, fmt.Errorf("can't create json log file: %w", err)
 	}
 
-	jsonFmt := &promslog.AllowedFormat{}
+	jsonFmt := promslog.NewFormat()
 	_ = jsonFmt.Set("json")
 	return &JSONFileLogger{
 		handler: promslog.New(&promslog.Config{Format: jsonFmt, Writer: f}).Handler(),
diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go
@@ -480,15 +480,15 @@ func TestEndpoints(t *testing.T) {
 		u, err := url.Parse(server.URL)
 		require.NoError(t, err)
 
-		al := promslog.AllowedLevel{}
+		al := promslog.NewLevel()
 		require.NoError(t, al.Set("debug"))
 
-		af := promslog.AllowedFormat{}
+		af := promslog.NewFormat()
 		require.NoError(t, af.Set("logfmt"))
 
 		promslogConfig := promslog.Config{
-			Level:  &al,
-			Format: &af,
+			Level:  al,
+			Format: af,
 		}
 
 		dbDir := t.TempDir()

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ import (`
`45`	`45`
`46`	`46`	`func init() {`
`47`	`47`	`// This can be removed when the legacy global mode is fully deprecated.`
	`48`	`+ //nolint:staticcheck`
`48`	`49`	`model.NameValidationScheme = model.UTF8Validation`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ import (`
`64`	`64`
`65`	`65`	`func init() {`
`66`	`66`	`// This can be removed when the legacy global mode is fully deprecated.`
	`67`	`+ //nolint:staticcheck`
`67`	`68`	`model.NameValidationScheme = model.UTF8Validation`
`68`	`69`	`}`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ import (`
`41`	`41`
`42`	`42`	`func init() {`
`43`	`43`	`// This can be removed when the legacy global mode is fully deprecated.`
	`44`	`+ //nolint:staticcheck`
`44`	`45`	`model.NameValidationScheme = model.UTF8Validation`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -837,6 +837,7 @@ func (c *ScrapeConfig) Validate(globalConfig GlobalConfig) error {`
`837`	`837`	`}`
`838`	`838`	`}`
`839`	`839`
	`840`	`+ //nolint:staticcheck`
`840`	`841`	`if model.NameValidationScheme != model.UTF8Validation {`
`841`	`842`	`return errors.New("model.NameValidationScheme must be set to UTF8")`
`842`	`843`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func NewJSONFileLogger(s string) (*JSONFileLogger, error) {`
`45`	`45`	`return nil, fmt.Errorf("can't create json log file: %w", err)`
`46`	`46`	`}`
`47`	`47`
`48`		`- jsonFmt := &promslog.AllowedFormat{}`
	`48`	`+ jsonFmt := promslog.NewFormat()`
`49`	`49`	`_ = jsonFmt.Set("json")`
`50`	`50`	`return &JSONFileLogger{`
`51`	`51`	`handler: promslog.New(&promslog.Config{Format: jsonFmt, Writer: f}).Handler(),`