chore: enable perfsprint linter (#717)

mmorel-35 · web-flow · commit 937c5b5a89f3 · 2024-11-07T20:43:46.000+01:00
Signed-off-by: Matthieu MOREL &lt;matthieu.morel35@gmail.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -11,13 +11,25 @@ linters:
     - govet
     - ineffassign
     - misspell
+    - perfsprint
     - revive
     - staticcheck
     - testifylint
     - unused
 linters-settings:
   goimports:
     local-prefixes: github.com/prometheus/common
+  perfsprint:
+    # Optimizes even if it requires an int or uint type cast.
+    int-conversion: true
+    # Optimizes into `err.Error()` even if it is only equivalent for non-nil errors.
+    err-error: true
+    # Optimizes `fmt.Errorf`.
+    errorf: true
+    # Optimizes `fmt.Sprintf` with only one argument.
+    sprintf1: true
+    # Optimizes into strings concatenation.
+    strconcat: false
   revive:
     rules:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
diff --git a/config/http_config.go b/config/http_config.go
@@ -357,33 +357,33 @@ func nonZeroCount[T comparable](values ...T) int {
 func (c *HTTPClientConfig) Validate() error {
 	// Backwards compatibility with the bearer_token field.
 	if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 {
-		return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured")
+		return errors.New("at most one of bearer_token & bearer_token_file must be configured")
 	}
 	if (c.BasicAuth != nil || c.OAuth2 != nil) && (len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0) {
-		return fmt.Errorf("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")
+		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 {
-		return fmt.Errorf("at most one of basic_auth username, username_file & username_ref must be configured")
+		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 {
-		return fmt.Errorf("at most one of basic_auth password, password_file & password_ref must be configured")
+		return errors.New("at most one of basic_auth password, password_file & password_ref must be configured")
 	}
 	if c.Authorization != nil {
 		if len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0 {
-			return fmt.Errorf("authorization is not compatible with bearer_token & bearer_token_file")
+			return errors.New("authorization is not compatible with bearer_token & bearer_token_file")
 		}
 		if nonZeroCount(string(c.Authorization.Credentials) != "", c.Authorization.CredentialsFile != "", c.Authorization.CredentialsRef != "") > 1 {
-			return fmt.Errorf("at most one of authorization credentials & credentials_file must be configured")
+			return errors.New("at most one of authorization credentials & credentials_file must be configured")
 		}
 		c.Authorization.Type = strings.TrimSpace(c.Authorization.Type)
 		if len(c.Authorization.Type) == 0 {
 			c.Authorization.Type = "Bearer"
 		}
 		if strings.ToLower(c.Authorization.Type) == "basic" {
-			return fmt.Errorf(`authorization type cannot be set to "basic", use "basic_auth" instead`)
+			return errors.New(`authorization type cannot be set to "basic", use "basic_auth" instead`)
 		}
 		if c.BasicAuth != nil || c.OAuth2 != nil {
-			return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")
+			return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")
 		}
 	} else {
 		if len(c.BearerToken) > 0 {
@@ -399,16 +399,16 @@ func (c *HTTPClientConfig) Validate() error {
 	}
 	if c.OAuth2 != nil {
 		if c.BasicAuth != nil {
-			return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")
+			return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")
 		}
 		if len(c.OAuth2.ClientID) == 0 {
-			return fmt.Errorf("oauth2 client_id must be configured")
+			return errors.New("oauth2 client_id must be configured")
 		}
 		if len(c.OAuth2.TokenURL) == 0 {
-			return fmt.Errorf("oauth2 token_url must be configured")
+			return errors.New("oauth2 token_url must be configured")
 		}
 		if nonZeroCount(len(c.OAuth2.ClientSecret) > 0, len(c.OAuth2.ClientSecretFile) > 0, len(c.OAuth2.ClientSecretRef) > 0) > 1 {
-			return fmt.Errorf("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")
+			return errors.New("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")
 		}
 	}
 	if err := c.ProxyConfig.Validate(); err != nil {
@@ -735,7 +735,7 @@ func (s *FileSecret) Fetch(ctx context.Context) (string, error) {
 }
 
 func (s *FileSecret) Description() string {
-	return fmt.Sprintf("file %s", s.file)
+	return "file " + s.file
 }
 
 func (s *FileSecret) Immutable() bool {
@@ -753,7 +753,7 @@ func (s *refSecret) Fetch(ctx context.Context) (string, error) {
 }
 
 func (s *refSecret) Description() string {
-	return fmt.Sprintf("ref %s", s.ref)
+	return "ref " + s.ref
 }
 
 func (s *refSecret) Immutable() bool {
@@ -1045,7 +1045,7 @@ func NewTLSConfigWithContext(ctx context.Context, cfg *TLSConfig, optFuncs ...TL
 
 	if cfg.MaxVersion != 0 && cfg.MinVersion != 0 {
 		if cfg.MaxVersion < cfg.MinVersion {
-			return nil, fmt.Errorf("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")
+			return nil, errors.New("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")
 		}
 	}
 
@@ -1144,19 +1144,19 @@ func (c *TLSConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 // used.
 func (c *TLSConfig) Validate() error {
 	if nonZeroCount(len(c.CA) > 0, len(c.CAFile) > 0, len(c.CARef) > 0) > 1 {
-		return fmt.Errorf("at most one of ca, ca_file & ca_ref must be configured")
+		return errors.New("at most one of ca, ca_file & ca_ref must be configured")
 	}
 	if nonZeroCount(len(c.Cert) > 0, len(c.CertFile) > 0, len(c.CertRef) > 0) > 1 {
-		return fmt.Errorf("at most one of cert, cert_file & cert_ref must be configured")
+		return errors.New("at most one of cert, cert_file & cert_ref must be configured")
 	}
 	if nonZeroCount(len(c.Key) > 0, len(c.KeyFile) > 0, len(c.KeyRef) > 0) > 1 {
-		return fmt.Errorf("at most one of key and key_file must be configured")
+		return errors.New("at most one of key and key_file must be configured")
 	}
 
 	if c.usingClientCert() && !c.usingClientKey() {
-		return fmt.Errorf("exactly one of key or key_file must be configured when a client certificate is configured")
+		return errors.New("exactly one of key or key_file must be configured when a client certificate is configured")
 	} else if c.usingClientKey() && !c.usingClientCert() {
-		return fmt.Errorf("exactly one of cert or cert_file must be configured when a client key is configured")
+		return errors.New("exactly one of cert or cert_file must be configured when a client key is configured")
 	}
 
 	return nil
@@ -1460,16 +1460,16 @@ type ProxyConfig struct {
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
 func (c *ProxyConfig) Validate() error {
 	if len(c.ProxyConnectHeader) > 0 && (!c.ProxyFromEnvironment && (c.ProxyURL.URL == nil || c.ProxyURL.String() == "")) {
-		return fmt.Errorf("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")
+		return errors.New("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")
 	}
 	if c.ProxyFromEnvironment && c.ProxyURL.URL != nil && c.ProxyURL.String() != "" {
-		return fmt.Errorf("if proxy_from_environment is configured, proxy_url must not be configured")
+		return errors.New("if proxy_from_environment is configured, proxy_url must not be configured")
 	}
 	if c.ProxyFromEnvironment && c.NoProxy != "" {
-		return fmt.Errorf("if proxy_from_environment is configured, no_proxy must not be configured")
+		return errors.New("if proxy_from_environment is configured, no_proxy must not be configured")
 	}
 	if c.ProxyURL.URL == nil && c.NoProxy != "" {
-		return fmt.Errorf("if no_proxy is configured, proxy_url must also be configured")
+		return errors.New("if no_proxy is configured, proxy_url must also be configured")
 	}
 	return nil
 }
diff --git a/config/http_config_test.go b/config/http_config_test.go
@@ -609,7 +609,7 @@ func TestNewClientFromInvalidConfig(t *testing.T) {
 					InsecureSkipVerify: true,
 				},
 			},
-			errorMsg: fmt.Sprintf("unable to read CA cert: unable to read file %s", MissingCA),
+			errorMsg: "unable to read CA cert: unable to read file " + MissingCA,
 		},
 		{
 			clientConfig: HTTPClientConfig{
@@ -618,7 +618,7 @@ func TestNewClientFromInvalidConfig(t *testing.T) {
 					InsecureSkipVerify: true,
 				},
 			},
-			errorMsg: fmt.Sprintf("unable to use specified CA cert file %s", InvalidCA),
+			errorMsg: "unable to use specified CA cert file " + InvalidCA,
 		},
 	}
 
@@ -864,7 +864,7 @@ func TestTLSConfigInvalidCA(t *testing.T) {
 				ServerName:         "",
 				InsecureSkipVerify: false,
 			},
-			errorMessage: fmt.Sprintf("unable to read CA cert: unable to read file %s", MissingCA),
+			errorMessage: "unable to read CA cert: unable to read file " + MissingCA,
 		},
 		{
 			configTLSConfig: TLSConfig{
@@ -874,7 +874,7 @@ func TestTLSConfigInvalidCA(t *testing.T) {
 				ServerName:         "",
 				InsecureSkipVerify: false,
 			},
-			errorMessage: fmt.Sprintf("unable to read specified client cert: unable to read file %s", MissingCert),
+			errorMessage: "unable to read specified client cert: unable to read file " + MissingCert,
 		},
 		{
 			configTLSConfig: TLSConfig{
@@ -884,7 +884,7 @@ func TestTLSConfigInvalidCA(t *testing.T) {
 				ServerName:         "",
 				InsecureSkipVerify: false,
 			},
-			errorMessage: fmt.Sprintf("unable to read specified client key: unable to read file %s", MissingKey),
+			errorMessage: "unable to read specified client key: unable to read file " + MissingKey,
 		},
 		{
 			configTLSConfig: TLSConfig{
@@ -1715,7 +1715,7 @@ func TestOAuth2UserAgent(t *testing.T) {
 		ClientSecret:   "2",
 		Scopes:         []string{"A", "B"},
 		EndpointParams: map[string]string{"hi": "hello"},
-		TokenURL:       fmt.Sprintf("%s/token", ts.URL),
+		TokenURL:       ts.URL + "/token",
 	}
 
 	rt, err := NewRoundTripperFromConfig(config, "test_oauth2", WithUserAgent("myuseragent"))
@@ -2281,7 +2281,7 @@ func TestProxyConfig_Proxy(t *testing.T) {
 		},
 		{
 			name:             "valid proxy_url and localhost",
-			proxyConfig:      fmt.Sprintf(`proxy_url: %s`, proxyServer.URL),
+			proxyConfig:      "proxy_url: " + proxyServer.URL,
 			expectedProxyURL: proxyServer.URL,
 			targetURL:        "http://localhost/",
 		},
@@ -2294,7 +2294,7 @@ no_proxy: prometheus.io`, proxyServer.URL),
 		},
 		{
 			name:             "valid proxy_url",
-			proxyConfig:      fmt.Sprintf(`proxy_url: %s`, proxyServer.URL),
+			proxyConfig:      "proxy_url: " + proxyServer.URL,
 			expectedProxyURL: proxyServer.URL,
 			targetURL:        "http://prometheus.io/",
 		},
diff --git a/config/tls_config_test.go b/config/tls_config_test.go
@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -159,7 +160,7 @@ func TestTLSVersionMarshalYAML(t *testing.T) {
 		{
 			input:    TLSVersion(999),
 			expected: "",
-			err:      fmt.Errorf("unknown TLS version: 999"),
+			err:      errors.New("unknown TLS version: 999"),
 		},
 	}
 
@@ -199,7 +200,7 @@ func TestTLSVersionMarshalJSON(t *testing.T) {
 		{
 			input:    TLSVersion(999),
 			expected: "",
-			err:      fmt.Errorf("unknown TLS version: 999"),
+			err:      errors.New("unknown TLS version: 999"),
 		},
 	}
 
diff --git a/expfmt/encode.go b/expfmt/encode.go
@@ -68,7 +68,7 @@ func Negotiate(h http.Header) Format {
 		if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
 			switch Format(escapeParam) {
 			case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
-				escapingScheme = Format(fmt.Sprintf("; escaping=%s", escapeParam))
+				escapingScheme = Format("; escaping=" + escapeParam)
 			default:
 				// If the escaping parameter is unknown, ignore it.
 			}
@@ -101,7 +101,7 @@ func NegotiateIncludingOpenMetrics(h http.Header) Format {
 		if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
 			switch Format(escapeParam) {
 			case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
-				escapingScheme = Format(fmt.Sprintf("; escaping=%s", escapeParam))
+				escapingScheme = Format("; escaping=" + escapeParam)
 			default:
 				// If the escaping parameter is unknown, ignore it.
 			}
diff --git a/expfmt/expfmt.go b/expfmt/expfmt.go
@@ -15,7 +15,7 @@
 package expfmt
 
 import (
-	"fmt"
+	"errors"
 	"strings"
 
 	"github.com/prometheus/common/model"
@@ -109,7 +109,7 @@ func NewOpenMetricsFormat(version string) (Format, error) {
 	if version == OpenMetricsVersion_1_0_0 {
 		return FmtOpenMetrics_1_0_0, nil
 	}
-	return FmtUnknown, fmt.Errorf("unknown open metrics version string")
+	return FmtUnknown, errors.New("unknown open metrics version string")
 }
 
 // WithEscapingScheme returns a copy of Format with the specified escaping
diff --git a/expfmt/openmetrics_create.go b/expfmt/openmetrics_create.go
@@ -152,8 +152,8 @@ func MetricFamilyToOpenMetrics(out io.Writer, in *dto.MetricFamily, options ...E
 	if metricType == dto.MetricType_COUNTER && strings.HasSuffix(compliantName, "_total") {
 		compliantName = name[:len(name)-6]
 	}
-	if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, fmt.Sprintf("_%s", *in.Unit)) {
-		compliantName = compliantName + fmt.Sprintf("_%s", *in.Unit)
+	if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, "_"+*in.Unit) {
+		compliantName = compliantName + "_" + *in.Unit
 	}
 
 	// Comments, first HELP, then TYPE.
diff --git a/expfmt/text_parse.go b/expfmt/text_parse.go
@@ -895,7 +895,7 @@ func histogramMetricName(name string) string {
 
 func parseFloat(s string) (float64, error) {
 	if strings.ContainsAny(s, "pP_") {
-		return 0, fmt.Errorf("unsupported character in float")
+		return 0, errors.New("unsupported character in float")
 	}
 	return strconv.ParseFloat(s, 64)
 }
diff --git a/model/alert.go b/model/alert.go
@@ -14,6 +14,7 @@
 package model
 
 import (
+	"errors"
 	"fmt"
 	"time"
 )
@@ -89,16 +90,16 @@ func (a *Alert) StatusAt(ts time.Time) AlertStatus {
 // Validate checks whether the alert data is inconsistent.
 func (a *Alert) Validate() error {
 	if a.StartsAt.IsZero() {
-		return fmt.Errorf("start time missing")
+		return errors.New("start time missing")
 	}
 	if !a.EndsAt.IsZero() && a.EndsAt.Before(a.StartsAt) {
-		return fmt.Errorf("start time must be before end time")
+		return errors.New("start time must be before end time")
 	}
 	if err := a.Labels.Validate(); err != nil {
 		return fmt.Errorf("invalid label set: %w", err)
 	}
 	if len(a.Labels) == 0 {
-		return fmt.Errorf("at least one label pair required")
+		return errors.New("at least one label pair required")
 	}
 	if err := a.Annotations.Validate(); err != nil {
 		return fmt.Errorf("invalid annotations: %w", err)
diff --git a/model/metric.go b/model/metric.go
@@ -14,6 +14,7 @@
 package model
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"sort"
@@ -443,7 +444,7 @@ func (e EscapingScheme) String() string {
 
 func ToEscapingScheme(s string) (EscapingScheme, error) {
 	if s == "" {
-		return NoEscaping, fmt.Errorf("got empty string instead of escaping scheme")
+		return NoEscaping, errors.New("got empty string instead of escaping scheme")
 	}
 	switch s {
 	case AllowUTF8:
diff --git a/model/silence.go b/model/silence.go
diff --git a/model/value_float.go b/model/value_float.go
diff --git a/model/value_histogram.go b/model/value_histogram.go
diff --git a/sigv4/sigv4.go b/sigv4/sigv4.go
diff --git a/sigv4/sigv4_config.go b/sigv4/sigv4_config.go

Original file line number	Diff line number	Diff line change
`@@ -357,33 +357,33 @@ func nonZeroCount[T comparable](values ...T) int {`
`357`	`357`	`func (c *HTTPClientConfig) Validate() error {`
`358`	`358`	`// Backwards compatibility with the bearer_token field.`
`359`	`359`	`if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 {`
`360`		`- return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured")`
	`360`	`+ return errors.New("at most one of bearer_token & bearer_token_file must be configured")`
`361`	`361`	`}`
`362`	`362`	`if (c.BasicAuth != nil \|\| c.OAuth2 != nil) && (len(c.BearerToken) > 0 \|\| len(c.BearerTokenFile) > 0) {`
`363`		`- return fmt.Errorf("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")`
	`363`	`+ return errors.New("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")`
`364`	`364`	`}`
`365`	`365`	`if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Username) != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {`
`366`		`- return fmt.Errorf("at most one of basic_auth username, username_file & username_ref must be configured")`
	`366`	`+ return errors.New("at most one of basic_auth username, username_file & username_ref must be configured")`
`367`	`367`	`}`
`368`	`368`	`if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Password) != "", c.BasicAuth.PasswordFile != "", c.BasicAuth.PasswordRef != "") > 1 {`
`369`		`- return fmt.Errorf("at most one of basic_auth password, password_file & password_ref must be configured")`
	`369`	`+ return errors.New("at most one of basic_auth password, password_file & password_ref must be configured")`
`370`	`370`	`}`
`371`	`371`	`if c.Authorization != nil {`
`372`	`372`	`if len(c.BearerToken) > 0 \|\| len(c.BearerTokenFile) > 0 {`
`373`		`- return fmt.Errorf("authorization is not compatible with bearer_token & bearer_token_file")`
	`373`	`+ return errors.New("authorization is not compatible with bearer_token & bearer_token_file")`
`374`	`374`	`}`
`375`	`375`	`if nonZeroCount(string(c.Authorization.Credentials) != "", c.Authorization.CredentialsFile != "", c.Authorization.CredentialsRef != "") > 1 {`
`376`		`- return fmt.Errorf("at most one of authorization credentials & credentials_file must be configured")`
	`376`	`+ return errors.New("at most one of authorization credentials & credentials_file must be configured")`
`377`	`377`	`}`
`378`	`378`	`c.Authorization.Type = strings.TrimSpace(c.Authorization.Type)`
`379`	`379`	`if len(c.Authorization.Type) == 0 {`
`380`	`380`	`c.Authorization.Type = "Bearer"`
`381`	`381`	`}`
`382`	`382`	`if strings.ToLower(c.Authorization.Type) == "basic" {`
`383`		- return fmt.Errorf(`authorization type cannot be set to "basic", use "basic_auth" instead`)
	`383`	+ return errors.New(`authorization type cannot be set to "basic", use "basic_auth" instead`)
`384`	`384`	`}`
`385`	`385`	`if c.BasicAuth != nil \|\| c.OAuth2 != nil {`
`386`		`- return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")`
	`386`	`+ return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")`
`387`	`387`	`}`
`388`	`388`	`} else {`
`389`	`389`	`if len(c.BearerToken) > 0 {`
`@@ -399,16 +399,16 @@ func (c *HTTPClientConfig) Validate() error {`
`399`	`399`	`}`
`400`	`400`	`if c.OAuth2 != nil {`
`401`	`401`	`if c.BasicAuth != nil {`
`402`		`- return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")`
	`402`	`+ return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")`
`403`	`403`	`}`
`404`	`404`	`if len(c.OAuth2.ClientID) == 0 {`
`405`		`- return fmt.Errorf("oauth2 client_id must be configured")`
	`405`	`+ return errors.New("oauth2 client_id must be configured")`
`406`	`406`	`}`
`407`	`407`	`if len(c.OAuth2.TokenURL) == 0 {`
`408`		`- return fmt.Errorf("oauth2 token_url must be configured")`
	`408`	`+ return errors.New("oauth2 token_url must be configured")`
`409`	`409`	`}`
`410`	`410`	`if nonZeroCount(len(c.OAuth2.ClientSecret) > 0, len(c.OAuth2.ClientSecretFile) > 0, len(c.OAuth2.ClientSecretRef) > 0) > 1 {`
`411`		`- return fmt.Errorf("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")`
	`411`	`+ return errors.New("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`	`if err := c.ProxyConfig.Validate(); err != nil {`
`@@ -735,7 +735,7 @@ func (s *FileSecret) Fetch(ctx context.Context) (string, error) {`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`func (s *FileSecret) Description() string {`
`738`		`- return fmt.Sprintf("file %s", s.file)`
	`738`	`+ return "file " + s.file`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`func (s *FileSecret) Immutable() bool {`
`@@ -753,7 +753,7 @@ func (s *refSecret) Fetch(ctx context.Context) (string, error) {`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`func (s *refSecret) Description() string {`
`756`		`- return fmt.Sprintf("ref %s", s.ref)`
	`756`	`+ return "ref " + s.ref`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`func (s *refSecret) Immutable() bool {`
`@@ -1045,7 +1045,7 @@ func NewTLSConfigWithContext(ctx context.Context, cfg *TLSConfig, optFuncs ...TL`
`1045`	`1045`
`1046`	`1046`	`if cfg.MaxVersion != 0 && cfg.MinVersion != 0 {`
`1047`	`1047`	`if cfg.MaxVersion < cfg.MinVersion {`
`1048`		`- return nil, fmt.Errorf("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")`
	`1048`	`+ return nil, errors.New("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")`
`1049`	`1049`	`}`
`1050`	`1050`	`}`
`1051`	`1051`
`@@ -1144,19 +1144,19 @@ func (c *TLSConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {`
`1144`	`1144`	`// used.`
`1145`	`1145`	`func (c *TLSConfig) Validate() error {`
`1146`	`1146`	`if nonZeroCount(len(c.CA) > 0, len(c.CAFile) > 0, len(c.CARef) > 0) > 1 {`
`1147`		`- return fmt.Errorf("at most one of ca, ca_file & ca_ref must be configured")`
	`1147`	`+ return errors.New("at most one of ca, ca_file & ca_ref must be configured")`
`1148`	`1148`	`}`
`1149`	`1149`	`if nonZeroCount(len(c.Cert) > 0, len(c.CertFile) > 0, len(c.CertRef) > 0) > 1 {`
`1150`		`- return fmt.Errorf("at most one of cert, cert_file & cert_ref must be configured")`
	`1150`	`+ return errors.New("at most one of cert, cert_file & cert_ref must be configured")`
`1151`	`1151`	`}`
`1152`	`1152`	`if nonZeroCount(len(c.Key) > 0, len(c.KeyFile) > 0, len(c.KeyRef) > 0) > 1 {`
`1153`		`- return fmt.Errorf("at most one of key and key_file must be configured")`
	`1153`	`+ return errors.New("at most one of key and key_file must be configured")`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`	`1156`	`if c.usingClientCert() && !c.usingClientKey() {`
`1157`		`- return fmt.Errorf("exactly one of key or key_file must be configured when a client certificate is configured")`
	`1157`	`+ return errors.New("exactly one of key or key_file must be configured when a client certificate is configured")`
`1158`	`1158`	`} else if c.usingClientKey() && !c.usingClientCert() {`
`1159`		`- return fmt.Errorf("exactly one of cert or cert_file must be configured when a client key is configured")`
	`1159`	`+ return errors.New("exactly one of cert or cert_file must be configured when a client key is configured")`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`	`1162`	`return nil`
`@@ -1460,16 +1460,16 @@ type ProxyConfig struct {`
`1460`	`1460`	`// UnmarshalYAML implements the yaml.Unmarshaler interface.`
`1461`	`1461`	`func (c *ProxyConfig) Validate() error {`
`1462`	`1462`	`if len(c.ProxyConnectHeader) > 0 && (!c.ProxyFromEnvironment && (c.ProxyURL.URL == nil \|\| c.ProxyURL.String() == "")) {`
`1463`		`- return fmt.Errorf("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")`
	`1463`	`+ return errors.New("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")`
`1464`	`1464`	`}`
`1465`	`1465`	`if c.ProxyFromEnvironment && c.ProxyURL.URL != nil && c.ProxyURL.String() != "" {`
`1466`		`- return fmt.Errorf("if proxy_from_environment is configured, proxy_url must not be configured")`
	`1466`	`+ return errors.New("if proxy_from_environment is configured, proxy_url must not be configured")`
`1467`	`1467`	`}`
`1468`	`1468`	`if c.ProxyFromEnvironment && c.NoProxy != "" {`
`1469`		`- return fmt.Errorf("if proxy_from_environment is configured, no_proxy must not be configured")`
	`1469`	`+ return errors.New("if proxy_from_environment is configured, no_proxy must not be configured")`
`1470`	`1470`	`}`
`1471`	`1471`	`if c.ProxyURL.URL == nil && c.NoProxy != "" {`
`1472`		`- return fmt.Errorf("if no_proxy is configured, proxy_url must also be configured")`
	`1472`	`+ return errors.New("if no_proxy is configured, proxy_url must also be configured")`
`1473`	`1473`	`}`
`1474`	`1474`	`return nil`
`1475`	`1475`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`"bytes"`
`18`	`18`	`"crypto/tls"`
`19`	`19`	`"encoding/json"`
	`20`	`+ "errors"`
`20`	`21`	`"fmt"`
`21`	`22`	`"os"`
`22`	`23`	`"path/filepath"`
`@@ -159,7 +160,7 @@ func TestTLSVersionMarshalYAML(t *testing.T) {`
`159`	`160`	`{`
`160`	`161`	`input: TLSVersion(999),`
`161`	`162`	`expected: "",`
`162`		`- err: fmt.Errorf("unknown TLS version: 999"),`
	`163`	`+ err: errors.New("unknown TLS version: 999"),`
`163`	`164`	`},`
`164`	`165`	`}`
`165`	`166`
`@@ -199,7 +200,7 @@ func TestTLSVersionMarshalJSON(t *testing.T) {`
`199`	`200`	`{`
`200`	`201`	`input: TLSVersion(999),`
`201`	`202`	`expected: "",`
`202`		`- err: fmt.Errorf("unknown TLS version: 999"),`
	`203`	`+ err: errors.New("unknown TLS version: 999"),`
`203`	`204`	`},`
`204`	`205`	`}`
`205`	`206`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`package expfmt`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "fmt"`
	`18`	`+ "errors"`
`19`	`19`	`"strings"`
`20`	`20`
`21`	`21`	`"github.com/prometheus/common/model"`
`@@ -109,7 +109,7 @@ func NewOpenMetricsFormat(version string) (Format, error) {`
`109`	`109`	`if version == OpenMetricsVersion_1_0_0 {`
`110`	`110`	`return FmtOpenMetrics_1_0_0, nil`
`111`	`111`	`}`
`112`		`- return FmtUnknown, fmt.Errorf("unknown open metrics version string")`
	`112`	`+ return FmtUnknown, errors.New("unknown open metrics version string")`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// WithEscapingScheme returns a copy of Format with the specified escaping`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,8 @@ func MetricFamilyToOpenMetrics(out io.Writer, in *dto.MetricFamily, options ...E`
`152`	`152`	`if metricType == dto.MetricType_COUNTER && strings.HasSuffix(compliantName, "_total") {`
`153`	`153`	`compliantName = name[:len(name)-6]`
`154`	`154`	`}`
`155`		`- if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, fmt.Sprintf("_%s", *in.Unit)) {`
`156`		`- compliantName = compliantName + fmt.Sprintf("_%s", *in.Unit)`
	`155`	`+ if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, "_"+*in.Unit) {`
	`156`	`+ compliantName = compliantName + "_" + *in.Unit`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`// Comments, first HELP, then TYPE.`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ func histogramMetricName(name string) string {`
`895`	`895`
`896`	`896`	`func parseFloat(s string) (float64, error) {`
`897`	`897`	`if strings.ContainsAny(s, "pP_") {`
`898`		`- return 0, fmt.Errorf("unsupported character in float")`
	`898`	`+ return 0, errors.New("unsupported character in float")`
`899`	`899`	`}`
`900`	`900`	`return strconv.ParseFloat(s, 64)`
`901`	`901`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`package model`
`15`	`15`
`16`	`16`	`import (`
	`17`	`+ "errors"`
`17`	`18`	`"fmt"`
`18`	`19`	`"time"`
`19`	`20`	`)`
`@@ -89,16 +90,16 @@ func (a *Alert) StatusAt(ts time.Time) AlertStatus {`
`89`	`90`	`// Validate checks whether the alert data is inconsistent.`
`90`	`91`	`func (a *Alert) Validate() error {`
`91`	`92`	`if a.StartsAt.IsZero() {`
`92`		`- return fmt.Errorf("start time missing")`
	`93`	`+ return errors.New("start time missing")`
`93`	`94`	`}`
`94`	`95`	`if !a.EndsAt.IsZero() && a.EndsAt.Before(a.StartsAt) {`
`95`		`- return fmt.Errorf("start time must be before end time")`
	`96`	`+ return errors.New("start time must be before end time")`
`96`	`97`	`}`
`97`	`98`	`if err := a.Labels.Validate(); err != nil {`
`98`	`99`	`return fmt.Errorf("invalid label set: %w", err)`
`99`	`100`	`}`
`100`	`101`	`if len(a.Labels) == 0 {`
`101`		`- return fmt.Errorf("at least one label pair required")`
	`102`	`+ return errors.New("at least one label pair required")`
`102`	`103`	`}`
`103`	`104`	`if err := a.Annotations.Validate(); err != nil {`
`104`	`105`	`return fmt.Errorf("invalid annotations: %w", err)`