From 95f49dd84be7f2ef5471f6ce5cf448b6a14d8598 Mon Sep 17 00:00:00 2001 From: Arthur Silva Sens Date: Thu, 13 Mar 2025 16:42:42 -0300 Subject: [PATCH] Bump prometheus/common to v0.63.0 (#16210) * Bump prometheus/common to v0.63.0 Signed-off-by: Arthur Silva Sens * nolint usage of deprecated model.NameValidationScheme Signed-off-by: Arthur Silva Sens --------- Signed-off-by: Arthur Silva Sens --- cmd/prometheus/main.go | 1 + cmd/prometheus/main_test.go | 1 + cmd/promtool/main.go | 1 + cmd/promtool/main_test.go | 1 + config/config.go | 1 + go.mod | 2 +- go.sum | 4 ++-- util/logging/file.go | 2 +- web/api/v1/api_test.go | 8 ++++---- 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go index e73fb2570c..347bae470c 100644 --- 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 index ccd49b349e..532ee5d271 100644 --- 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 index 6aafacb455..5955cc0655 100644 --- 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 index ec32b0ac6c..d3804da5e2 100644 --- 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 index 1970346e1c..a38080f22a 100644 --- 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 index acaf9aa291..a2abdabf7a 100644 --- 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 index ebc7eee143..b379fb0d25 100644 --- 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 index 27fdec2758..3f97b17f09 100644 --- 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 index 61106e70be..79026037c6 100644 --- 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()