Merge remote-tracking branch 'origin/main' into arve/gocritic

aknuds1 · aknuds1 · commit 2f532ba50ca1 · 2025-08-27T06:51:51.000+02:00
Signed-off-by: Arve Knudsen &lt;arve.knudsen@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -7,7 +7,7 @@ linters:
     - exptostd
     #- fatcontext
     - gocritic
-    #- godot
+    - godot
     - govet
     - loggercheck
     - misspell
@@ -19,9 +19,9 @@ linters:
     - revive
     - sloglint
     - testifylint
-    #- unconvert
+    - unconvert
     - unused
-    #- usestdlibvars
+    - usestdlibvars
     - whitespace
   exclusions:
     generated: lax
diff --git a/config/http_config.go b/config/http_config.go
@@ -72,7 +72,7 @@ var TLSVersions = map[string]TLSVersion{
 
 func (tv *TLSVersion) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var s string
-	err := unmarshal((*string)(&s))
+	err := unmarshal(&s)
 	if err != nil {
 		return err
 	}
@@ -245,7 +245,7 @@ type OAuth2 struct {
 	ProxyConfig     `yaml:",inline"`
 }
 
-// UnmarshalYAML implements the yaml.Unmarshaler interface
+// UnmarshalYAML implements the yaml.Unmarshaler interface.
 func (o *OAuth2) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	type plain OAuth2
 	if err := unmarshal((*plain)(o)); err != nil {
@@ -363,7 +363,7 @@ func (c *HTTPClientConfig) Validate() error {
 	if (c.BasicAuth != nil || c.OAuth2 != nil) && (len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0) {
 		return errors.New("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")
 	}
-	if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Username) != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {
+	if c.BasicAuth != nil && nonZeroCount(c.BasicAuth.Username != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {
 		return errors.New("at most one of basic_auth username, username_file & username_ref must be configured")
 	}
 	if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Password) != "", c.BasicAuth.PasswordFile != "", c.BasicAuth.PasswordRef != "") > 1 {
@@ -423,7 +423,7 @@ func (c *HTTPClientConfig) Validate() error {
 	return nil
 }
 
-// UnmarshalYAML implements the yaml.Unmarshaler interface
+// UnmarshalYAML implements the yaml.Unmarshaler interface.
 func (c *HTTPClientConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	type plain HTTPClientConfig
 	*c = DefaultHTTPClientConfig
@@ -1224,7 +1224,7 @@ func (c *TLSConfig) getClientCertificate(ctx context.Context, secretManager Secr
 		}
 	}
 
-	keySecret, err := toSecret(secretManager, Secret(c.Key), c.KeyFile, c.KeyRef)
+	keySecret, err := toSecret(secretManager, c.Key, c.KeyFile, c.KeyRef)
 	if err != nil {
 		return nil, fmt.Errorf("unable to use client key: %w", err)
 	}
diff --git a/config/http_config_test.go b/config/http_config_test.go
@@ -706,7 +706,7 @@ func TestBearerAuthRoundTripper(t *testing.T) {
 
 	// Normal flow.
 	bearerAuthRoundTripper := NewAuthorizationCredentialsRoundTripper("Bearer", NewInlineSecret(BearerToken), fakeRoundTripper)
-	request, _ := http.NewRequest("GET", "/hitchhiker", nil)
+	request, _ := http.NewRequest(http.MethodGet, "/hitchhiker", nil)
 	request.Header.Set("User-Agent", "Douglas Adams mind")
 	_, err := bearerAuthRoundTripper.RoundTrip(request)
 	if err != nil {
@@ -715,7 +715,7 @@ func TestBearerAuthRoundTripper(t *testing.T) {
 
 	// Should honor already Authorization header set.
 	bearerAuthRoundTripperShouldNotModifyExistingAuthorization := NewAuthorizationCredentialsRoundTripper("Bearer", NewInlineSecret(newBearerToken), fakeRoundTripper)
-	request, _ = http.NewRequest("GET", "/hitchhiker", nil)
+	request, _ = http.NewRequest(http.MethodGet, "/hitchhiker", nil)
 	request.Header.Set("Authorization", ExpectedBearer)
 	_, err = bearerAuthRoundTripperShouldNotModifyExistingAuthorization.RoundTrip(request)
 	if err != nil {
@@ -734,7 +734,7 @@ func TestBearerAuthFileRoundTripper(t *testing.T) {
 
 	// Normal flow.
 	bearerAuthRoundTripper := NewAuthorizationCredentialsRoundTripper("Bearer", &FileSecret{file: BearerTokenFile}, fakeRoundTripper)
-	request, _ := http.NewRequest("GET", "/hitchhiker", nil)
+	request, _ := http.NewRequest(http.MethodGet, "/hitchhiker", nil)
 	request.Header.Set("User-Agent", "Douglas Adams mind")
 	_, err := bearerAuthRoundTripper.RoundTrip(request)
 	if err != nil {
@@ -743,7 +743,7 @@ func TestBearerAuthFileRoundTripper(t *testing.T) {
 
 	// Should honor already Authorization header set.
 	bearerAuthRoundTripperShouldNotModifyExistingAuthorization := NewAuthorizationCredentialsRoundTripper("Bearer", &FileSecret{file: MissingBearerTokenFile}, fakeRoundTripper)
-	request, _ = http.NewRequest("GET", "/hitchhiker", nil)
+	request, _ = http.NewRequest(http.MethodGet, "/hitchhiker", nil)
 	request.Header.Set("Authorization", ExpectedBearer)
 	_, err = bearerAuthRoundTripperShouldNotModifyExistingAuthorization.RoundTrip(request)
 	if err != nil {
@@ -1749,7 +1749,7 @@ func TestUnmarshalEmptyURL(t *testing.T) {
 	}
 }
 
-// checks if u equals to &url.URL{}
+// checks if u equals to &url.URL{}.
 func isEmptyNonNilURL(u *url.URL) bool {
 	return u != nil && *u == url.URL{}
 }
@@ -2105,7 +2105,7 @@ no_proxy: promcon.io,cncf.io`, proxyServer.URL),
 				os.Setenv("NO_PROXY", tc.noProxyEnv)
 			}
 
-			req := httptest.NewRequest("GET", tc.targetURL, nil)
+			req := httptest.NewRequest(http.MethodGet, tc.targetURL, nil)
 
 			proxyFunc := proxyConfig.Proxy()
 			resultURL, err := proxyFunc(req)
diff --git a/expfmt/expfmt_test.go b/expfmt/expfmt_test.go
@@ -21,9 +21,7 @@ import (
 	"github.com/prometheus/common/model"
 )
 
-// Test Format to Escapting Scheme conversion
-// Path: expfmt/expfmt_test.go
-// Compare this snippet from expfmt/expfmt.go:
+// Test Format to Escaping Scheme conversion.
 func TestToFormatType(t *testing.T) {
 	tests := []struct {
 		format   Format
diff --git a/model/metric.go b/model/metric.go
@@ -238,7 +238,7 @@ const (
 	// Accept header, the default NameEscapingScheme will be used.
 	EscapingKey = "escaping"
 
-	// Possible values for Escaping Key:
+	// Possible values for Escaping Key.
 	AllowUTF8         = "allow-utf-8" // No escaping required.
 	EscapeUnderscores = "underscores"
 	EscapeDots        = "dots"
@@ -472,7 +472,7 @@ func EscapeName(name string, scheme EscapingScheme) string {
 	}
 }
 
-// lower function taken from strconv.atoi
+// lower function taken from strconv.atoi.
 func lower(c byte) byte {
 	return c | ('x' - 'X')
 }
diff --git a/model/metric_test.go b/model/metric_test.go
@@ -354,7 +354,7 @@ func TestValidationScheme_IsMetricNameValid(t *testing.T) {
 			if LegacyValidation.IsValidMetricName(s.mn) != s.legacyValid {
 				t.Errorf("Expected %v for %q using LegacyValidation.IsValidMetricName", s.legacyValid, s.mn)
 			}
-			if MetricNameRE.MatchString(string(s.mn)) != s.legacyValid {
+			if MetricNameRE.MatchString(s.mn) != s.legacyValid {
 				t.Errorf("Expected %v for %q using regexp matching", s.legacyValid, s.mn)
 			}
 			if UTF8Validation.IsValidMetricName(s.mn) != s.utf8Valid {
diff --git a/model/time.go b/model/time.go
@@ -126,14 +126,14 @@ func (t *Time) UnmarshalJSON(b []byte) error {
 	p := strings.Split(string(b), ".")
 	switch len(p) {
 	case 1:
-		v, err := strconv.ParseInt(string(p[0]), 10, 64)
+		v, err := strconv.ParseInt(p[0], 10, 64)
 		if err != nil {
 			return err
 		}
 		*t = Time(v * second)
 
 	case 2:
-		v, err := strconv.ParseInt(string(p[0]), 10, 64)
+		v, err := strconv.ParseInt(p[0], 10, 64)
 		if err != nil {
 			return err
 		}
@@ -170,14 +170,14 @@ func (t *Time) UnmarshalJSON(b []byte) error {
 // This type should not propagate beyond the scope of input/output processing.
 type Duration time.Duration
 
-// Set implements pflag/flag.Value
+// Set implements pflag/flag.Value.
 func (d *Duration) Set(s string) error {
 	var err error
 	*d, err = ParseDuration(s)
 	return err
 }
 
-// Type implements pflag.Value
+// Type implements pflag.Value.
 func (d *Duration) Type() string {
 	return "duration"
 }
diff --git a/model/value.go b/model/value.go
@@ -259,7 +259,7 @@ func (s Scalar) String() string {
 // MarshalJSON implements json.Marshaler.
 func (s Scalar) MarshalJSON() ([]byte, error) {
 	v := strconv.FormatFloat(float64(s.Value), 'f', -1, 64)
-	return json.Marshal([...]interface{}{s.Timestamp, string(v)})
+	return json.Marshal([...]interface{}{s.Timestamp, v})
 }
 
 // UnmarshalJSON implements json.Unmarshaler.
diff --git a/promslog/flag/flag.go b/promslog/flag/flag.go
@@ -40,7 +40,7 @@ const FormatFlagName = "log.format"
 var FormatFlagHelp = "Output format of log messages. One of: [" + strings.Join(promslog.FormatFlagOptions, ", ") + "]"
 
 // AddFlags adds the flags used by this package to the Kingpin application.
-// To use the default Kingpin application, call AddFlags(kingpin.CommandLine)
+// To use the default Kingpin application, call AddFlags(kingpin.CommandLine).
 func AddFlags(a *kingpin.Application, config *promslog.Config) {
 	config.Level = promslog.NewLevel()
 	a.Flag(LevelFlagName, LevelFlagHelp).
diff --git a/promslog/slog.go b/promslog/slog.go
@@ -138,7 +138,7 @@ func (f *Format) Set(s string) error {
 	return nil
 }
 
-// Config is a struct containing configurable settings for the logger
+// Config is a struct containing configurable settings for the logger.
 type Config struct {
 	Level  *Level
 	Format *Format
diff --git a/route/route_test.go b/route/route_test.go
@@ -24,7 +24,7 @@ import (
 func TestRedirect(t *testing.T) {
 	router := New().WithPrefix("/test/prefix")
 	w := httptest.NewRecorder()
-	r, err := http.NewRequest("GET", "http://localhost:9090/foo", nil)
+	r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/foo", nil)
 	require.NoErrorf(t, err, "Error building test request: %s", err)
 
 	router.Redirect(w, r, "/some/endpoint", http.StatusFound)
@@ -43,7 +43,7 @@ func TestContext(t *testing.T) {
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
 	})
 
-	r, err := http.NewRequest("GET", "http://localhost:9090/test/bar/", nil)
+	r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/test/bar/", nil)
 	require.NoErrorf(t, err, "Error building test request: %s", err)
 	router.ServeHTTP(nil, r)
 }
@@ -62,7 +62,7 @@ func TestContextWithValue(t *testing.T) {
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
 	})
 
-	r, err := http.NewRequest("GET", "http://localhost:9090/test/bar/", nil)
+	r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/test/bar/", nil)
 	require.NoErrorf(t, err, "Error building test request: %s", err)
 	params := map[string]string{
 		"lorem": "ipsum",
@@ -85,7 +85,7 @@ func TestContextWithoutValue(t *testing.T) {
 		require.Equalf(t, want, got, "Unexpected context value: want %q, got %q", want, got)
 	})
 
-	r, err := http.NewRequest("GET", "http://localhost:9090/test", nil)
+	r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/test", nil)
 	require.NoErrorf(t, err, "Error building test request: %s", err)
 	router.ServeHTTP(nil, r)
 }
@@ -111,7 +111,7 @@ func TestInstrumentation(t *testing.T) {
 	for _, c := range cases {
 		c.router.Get("/foo", func(w http.ResponseWriter, r *http.Request) {})
 
-		r, err := http.NewRequest("GET", "http://localhost:9090/foo", nil)
+		r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/foo", nil)
 		require.NoErrorf(t, err, "Error building test request: %s", err)
 		c.router.ServeHTTP(nil, r)
 		require.Equalf(t, c.want, got, "Unexpected value: want %q, got %q", c.want, got)
@@ -151,7 +151,7 @@ func TestInstrumentations(t *testing.T) {
 	for _, c := range cases {
 		c.router.Get("/foo", func(w http.ResponseWriter, r *http.Request) {})
 
-		r, err := http.NewRequest("GET", "http://localhost:9090/foo", nil)
+		r, err := http.NewRequest(http.MethodGet, "http://localhost:9090/foo", nil)
 		require.NoErrorf(t, err, "Error building test request: %s", err)
 		c.router.ServeHTTP(nil, r)
 		require.Lenf(t, got, len(c.want), "Unexpected value: want %q, got %q", c.want, got)
diff --git a/server/static_file_server_test.go b/server/static_file_server_test.go
@@ -68,7 +68,7 @@ func TestServeHttp(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			rr := httptest.NewRecorder()
-			req, err := http.NewRequest("GET", "http://localhost/"+c.path, nil)
+			req, err := http.NewRequest(http.MethodGet, "http://localhost/"+c.path, nil)
 			require.NoError(t, err)
 
 			s := StaticFileServer(dummyFileSystem{})

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ var TLSVersions = map[string]TLSVersion{`
`72`	`72`
`73`	`73`	`func (tv *TLSVersion) UnmarshalYAML(unmarshal func(interface{}) error) error {`
`74`	`74`	`var s string`
`75`		`- err := unmarshal((*string)(&s))`
	`75`	`+ err := unmarshal(&s)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return err`
`78`	`78`	`}`
`@@ -245,7 +245,7 @@ type OAuth2 struct {`
`245`	`245`	ProxyConfig `yaml:",inline"`
`246`	`246`	`}`
`247`	`247`
`248`		`-// UnmarshalYAML implements the yaml.Unmarshaler interface`
	`248`	`+// UnmarshalYAML implements the yaml.Unmarshaler interface.`
`249`	`249`	`func (o *OAuth2) UnmarshalYAML(unmarshal func(interface{}) error) error {`
`250`	`250`	`type plain OAuth2`
`251`	`251`	`if err := unmarshal((*plain)(o)); err != nil {`
`@@ -363,7 +363,7 @@ func (c *HTTPClientConfig) Validate() error {`
`363`	`363`	`if (c.BasicAuth != nil \|\| c.OAuth2 != nil) && (len(c.BearerToken) > 0 \|\| len(c.BearerTokenFile) > 0) {`
`364`	`364`	`return errors.New("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")`
`365`	`365`	`}`
`366`		`- if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Username) != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {`
	`366`	`+ if c.BasicAuth != nil && nonZeroCount(c.BasicAuth.Username != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {`
`367`	`367`	`return errors.New("at most one of basic_auth username, username_file & username_ref must be configured")`
`368`	`368`	`}`
`369`	`369`	`if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Password) != "", c.BasicAuth.PasswordFile != "", c.BasicAuth.PasswordRef != "") > 1 {`
`@@ -423,7 +423,7 @@ func (c *HTTPClientConfig) Validate() error {`
`423`	`423`	`return nil`
`424`	`424`	`}`
`425`	`425`
`426`		`-// UnmarshalYAML implements the yaml.Unmarshaler interface`
	`426`	`+// UnmarshalYAML implements the yaml.Unmarshaler interface.`
`427`	`427`	`func (c *HTTPClientConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {`
`428`	`428`	`type plain HTTPClientConfig`
`429`	`429`	`*c = DefaultHTTPClientConfig`
`@@ -1224,7 +1224,7 @@ func (c *TLSConfig) getClientCertificate(ctx context.Context, secretManager Secr`
`1224`	`1224`	`}`
`1225`	`1225`	`}`
`1226`	`1226`
`1227`		`- keySecret, err := toSecret(secretManager, Secret(c.Key), c.KeyFile, c.KeyRef)`
	`1227`	`+ keySecret, err := toSecret(secretManager, c.Key, c.KeyFile, c.KeyRef)`
`1228`	`1228`	`if err != nil {`
`1229`	`1229`	`return nil, fmt.Errorf("unable to use client key: %w", err)`
`1230`	`1230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ const (`
`238`	`238`	`// Accept header, the default NameEscapingScheme will be used.`
`239`	`239`	`EscapingKey = "escaping"`
`240`	`240`
`241`		`- // Possible values for Escaping Key:`
	`241`	`+ // Possible values for Escaping Key.`
`242`	`242`	`AllowUTF8 = "allow-utf-8" // No escaping required.`
`243`	`243`	`EscapeUnderscores = "underscores"`
`244`	`244`	`EscapeDots = "dots"`
`@@ -472,7 +472,7 @@ func EscapeName(name string, scheme EscapingScheme) string {`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`
`475`		`-// lower function taken from strconv.atoi`
	`475`	`+// lower function taken from strconv.atoi.`
`476`	`476`	`func lower(c byte) byte {`
`477`	`477`	`return c \| ('x' - 'X')`
`478`	`478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ func TestValidationScheme_IsMetricNameValid(t *testing.T) {`
`354`	`354`	`if LegacyValidation.IsValidMetricName(s.mn) != s.legacyValid {`
`355`	`355`	`t.Errorf("Expected %v for %q using LegacyValidation.IsValidMetricName", s.legacyValid, s.mn)`
`356`	`356`	`}`
`357`		`- if MetricNameRE.MatchString(string(s.mn)) != s.legacyValid {`
	`357`	`+ if MetricNameRE.MatchString(s.mn) != s.legacyValid {`
`358`	`358`	`t.Errorf("Expected %v for %q using regexp matching", s.legacyValid, s.mn)`
`359`	`359`	`}`
`360`	`360`	`if UTF8Validation.IsValidMetricName(s.mn) != s.utf8Valid {`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func (s Scalar) String() string {`
`259`	`259`	`// MarshalJSON implements json.Marshaler.`
`260`	`260`	`func (s Scalar) MarshalJSON() ([]byte, error) {`
`261`	`261`	`v := strconv.FormatFloat(float64(s.Value), 'f', -1, 64)`
`262`		`- return json.Marshal([...]interface{}{s.Timestamp, string(v)})`
	`262`	`+ return json.Marshal([...]interface{}{s.Timestamp, v})`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`// UnmarshalJSON implements json.Unmarshaler.`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (f *Format) Set(s string) error {`
`138`	`138`	`return nil`
`139`	`139`	`}`
`140`	`140`
`141`		`-// Config is a struct containing configurable settings for the logger`
	`141`	`+// Config is a struct containing configurable settings for the logger.`
`142`	`142`	`type Config struct {`
`143`	`143`	`Level *Level`
`144`	`144`	`Format *Format`