mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-25 05:34:05 -08:00
chore: enable all rules of perfsprint lint
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
parent
cd1f8ac129
commit
2cc716d2cf
|
@ -108,8 +108,16 @@ linters-settings:
|
|||
gofumpt:
|
||||
extra-rules: true
|
||||
perfsprint:
|
||||
# Optimizes `fmt.Errorf`.
|
||||
# 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:
|
||||
# By default, revive will enable only the linting rules that are named in the configuration file.
|
||||
# So, it's needed to explicitly enable all required rules here.
|
||||
|
|
|
@ -153,7 +153,7 @@ func init() {
|
|||
|
||||
// serverOnlyFlag creates server-only kingpin flag.
|
||||
func serverOnlyFlag(app *kingpin.Application, name, help string) *kingpin.FlagClause {
|
||||
return app.Flag(name, fmt.Sprintf("%s Use with server mode only.", help)).
|
||||
return app.Flag(name, help+" Use with server mode only.").
|
||||
PreAction(func(parseContext *kingpin.ParseContext) error {
|
||||
// This will be invoked only if flag is actually provided by user.
|
||||
serverOnlyFlags = append(serverOnlyFlags, "--"+name)
|
||||
|
@ -163,7 +163,7 @@ func serverOnlyFlag(app *kingpin.Application, name, help string) *kingpin.FlagCl
|
|||
|
||||
// agentOnlyFlag creates agent-only kingpin flag.
|
||||
func agentOnlyFlag(app *kingpin.Application, name, help string) *kingpin.FlagClause {
|
||||
return app.Flag(name, fmt.Sprintf("%s Use with agent mode only.", help)).
|
||||
return app.Flag(name, help+" Use with agent mode only.").
|
||||
PreAction(func(parseContext *kingpin.ParseContext) error {
|
||||
// This will be invoked only if flag is actually provided by user.
|
||||
agentOnlyFlags = append(agentOnlyFlags, "--"+name)
|
||||
|
|
|
@ -60,7 +60,7 @@ func (p *queryLogTest) skip(t *testing.T) {
|
|||
t.Skip("changing prefix has no effect on rules")
|
||||
}
|
||||
// Some systems don't support IPv4 or IPv6.
|
||||
l, err := net.Listen("tcp", fmt.Sprintf("%s:0", p.host))
|
||||
l, err := net.Listen("tcp", p.host+":0")
|
||||
if err != nil {
|
||||
t.Skip("ip version not supported")
|
||||
}
|
||||
|
|
|
@ -71,7 +71,7 @@ const (
|
|||
)
|
||||
|
||||
var (
|
||||
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
userAgent = "Prometheus/" + version.Version
|
||||
|
||||
// DefaultSDConfig is the default Azure SD configuration.
|
||||
DefaultSDConfig = SDConfig{
|
||||
|
|
|
@ -132,7 +132,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
|
|||
Transport: rt,
|
||||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
},
|
||||
godo.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
|
||||
godo.SetUserAgent("Prometheus/"+version.Version),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error setting up digital ocean agent: %w", err)
|
||||
|
|
|
@ -56,7 +56,7 @@ const tokenID = "3c9a75a2-24fd-4508-b4f2-11f18aa97411"
|
|||
// HandleDropletsList mocks droplet list.
|
||||
func (m *SDMock) HandleDropletsList() {
|
||||
m.Mux.HandleFunc("/v2/droplets", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", tokenID) {
|
||||
if r.Header.Get("Authorization") != "Bearer "+tokenID {
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ import (
|
|||
"github.com/prometheus/common/version"
|
||||
)
|
||||
|
||||
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var userAgent = "Prometheus/" + version.Version
|
||||
|
||||
type Applications struct {
|
||||
VersionsDelta int `xml:"versions__delta"`
|
||||
|
|
|
@ -56,7 +56,7 @@ const hcloudTestToken = "LRK9DAWQ1ZAEFSrCNEEzLCUwhYX1U3g7wMg4dTlkkDC96fyDuyJ39nV
|
|||
// HandleHcloudServers mocks the cloud servers list endpoint.
|
||||
func (m *SDMock) HandleHcloudServers() {
|
||||
m.Mux.HandleFunc("/servers", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", hcloudTestToken) {
|
||||
if r.Header.Get("Authorization") != "Bearer "+hcloudTestToken {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
@ -432,7 +432,7 @@ func (m *SDMock) HandleHcloudServers() {
|
|||
// HandleHcloudNetworks mocks the cloud networks list endpoint.
|
||||
func (m *SDMock) HandleHcloudNetworks() {
|
||||
m.Mux.HandleFunc("/networks", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", hcloudTestToken) {
|
||||
if r.Header.Get("Authorization") != "Bearer "+hcloudTestToken {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ const (
|
|||
hetznerLabelRobotCancelled = hetznerRobotLabelPrefix + "cancelled"
|
||||
)
|
||||
|
||||
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var userAgent = "Prometheus/" + version.Version
|
||||
|
||||
// Discovery periodically performs Hetzner Robot requests. It implements
|
||||
// the Discoverer interface.
|
||||
|
|
|
@ -44,7 +44,7 @@ var (
|
|||
HTTPClientConfig: config.DefaultHTTPClientConfig,
|
||||
RefreshInterval: model.Duration(60 * time.Second),
|
||||
}
|
||||
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
userAgent = "Prometheus/" + version.Version
|
||||
matchContentType = regexp.MustCompile(`^(?i:application\/json(;\s*charset=("utf-8"|utf-8))?)$`)
|
||||
)
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ package ionos
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
"net/http"
|
||||
|
@ -77,7 +76,7 @@ func newServerDiscovery(conf *SDConfig, _ *slog.Logger) (*serverDiscovery, error
|
|||
Transport: rt,
|
||||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
}
|
||||
cfg.UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
cfg.UserAgent = "Prometheus/" + version.Version
|
||||
|
||||
d.client = ionoscloud.NewAPIClient(cfg)
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ func mockIONOSServers(w http.ResponseWriter, r *http.Request) {
|
|||
return
|
||||
}
|
||||
if r.URL.Path != fmt.Sprintf("%s/datacenters/%s/servers", ionoscloud.DefaultIonosBasePath, ionosTestDatacenterID) {
|
||||
http.Error(w, fmt.Sprintf("bad url: %s", r.URL.Path), http.StatusNotFound)
|
||||
http.Error(w, "bad url: "+r.URL.Path, http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
|
|
@ -61,7 +61,7 @@ const (
|
|||
|
||||
var (
|
||||
// Http header.
|
||||
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
userAgent = "Prometheus/" + version.Version
|
||||
// DefaultSDConfig is the default Kubernetes SD configuration.
|
||||
DefaultSDConfig = SDConfig{
|
||||
HTTPClientConfig: config.DefaultHTTPClientConfig,
|
||||
|
|
|
@ -15,7 +15,6 @@ package kubernetes
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/prometheus/common/model"
|
||||
|
@ -55,7 +54,7 @@ func makeMultiPortService() *v1.Service {
|
|||
func makeSuffixedService(suffix string) *v1.Service {
|
||||
return &v1.Service{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: fmt.Sprintf("testservice%s", suffix),
|
||||
Name: "testservice" + suffix,
|
||||
Namespace: "default",
|
||||
},
|
||||
Spec: v1.ServiceSpec{
|
||||
|
|
|
@ -165,7 +165,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
|
|||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
},
|
||||
)
|
||||
client.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version))
|
||||
client.SetUserAgent("Prometheus/" + version.Version)
|
||||
d.client = &client
|
||||
|
||||
d.Discovery = refresh.NewDiscovery(
|
||||
|
|
|
@ -15,7 +15,6 @@ package linode
|
|||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
|
@ -56,7 +55,7 @@ func (m *SDMock) Setup() {
|
|||
func (m *SDMock) SetupHandlers() {
|
||||
for _, handler := range []string{"/v4/account/events", "/v4/linode/instances", "/v4/networking/ips", "/v4/networking/ipv6/ranges"} {
|
||||
m.Mux.HandleFunc(handler, func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", tokenID) {
|
||||
if r.Header.Get("Authorization") != "Bearer "+tokenID {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ const (
|
|||
swarmLabel = model.MetaLabelPrefix + "dockerswarm_"
|
||||
)
|
||||
|
||||
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var userAgent = "Prometheus/" + version.Version
|
||||
|
||||
// DefaultDockerSwarmSDConfig is the default Docker Swarm SD configuration.
|
||||
var DefaultDockerSwarmSDConfig = DockerSwarmSDConfig{
|
||||
|
|
|
@ -64,7 +64,7 @@ var (
|
|||
HTTPClientConfig: config.DefaultHTTPClientConfig,
|
||||
}
|
||||
matchContentType = regexp.MustCompile(`^(?i:application\/json(;\s*charset=("utf-8"|utf-8))?)$`)
|
||||
userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
userAgent = "Prometheus/" + version.Version
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
|
|
@ -93,7 +93,7 @@ func newBaremetalDiscovery(conf *SDConfig) (*baremetalDiscovery, error) {
|
|||
Transport: rt,
|
||||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
}),
|
||||
scw.WithUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
|
||||
scw.WithUserAgent("Prometheus/"+version.Version),
|
||||
scw.WithProfile(profile),
|
||||
)
|
||||
if err != nil {
|
||||
|
|
|
@ -104,7 +104,7 @@ func newInstanceDiscovery(conf *SDConfig) (*instanceDiscovery, error) {
|
|||
Transport: rt,
|
||||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
}),
|
||||
scw.WithUserAgent(fmt.Sprintf("Prometheus/%s", version.Version)),
|
||||
scw.WithUserAgent("Prometheus/"+version.Version),
|
||||
scw.WithProfile(profile),
|
||||
)
|
||||
if err != nil {
|
||||
|
|
|
@ -55,7 +55,7 @@ const APIKey = "ABCBTDG35OTGH2UKCC3S6CNMDUPCN3ZWSGFQ"
|
|||
// HandleInstanceList mocks vultr instances list.
|
||||
func (m *SDMock) HandleInstanceList() {
|
||||
m.Mux.HandleFunc("/v2/instances", func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Header.Get("Authorization") != fmt.Sprintf("Bearer %s", APIKey) {
|
||||
if r.Header.Get("Authorization") != "Bearer "+APIKey {
|
||||
w.WriteHeader(http.StatusForbidden)
|
||||
return
|
||||
}
|
||||
|
|
|
@ -135,7 +135,7 @@ func NewDiscovery(conf *SDConfig, logger *slog.Logger, metrics discovery.Discove
|
|||
Timeout: time.Duration(conf.RefreshInterval),
|
||||
})
|
||||
|
||||
d.client.SetUserAgent(fmt.Sprintf("Prometheus/%s", version.Version))
|
||||
d.client.SetUserAgent("Prometheus/" + version.Version)
|
||||
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error setting up vultr agent: %w", err)
|
||||
|
|
|
@ -30,7 +30,7 @@ import (
|
|||
"github.com/prometheus/common/version"
|
||||
)
|
||||
|
||||
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var userAgent = "Prometheus/" + version.Version
|
||||
|
||||
// ResourceClient exposes the xDS protocol for a single resource type.
|
||||
// See https://www.envoyproxy.io/docs/envoy/latest/api-docs/xds_protocol#rest-json-polling-subscriptions .
|
||||
|
@ -140,7 +140,7 @@ func makeXDSResourceHTTPEndpointURL(protocolVersion ProtocolVersion, serverURL *
|
|||
return nil, errors.New("invalid xDS server URL protocol. must be either 'http' or 'https'")
|
||||
}
|
||||
|
||||
serverURL.Path = path.Join(serverURL.Path, string(protocolVersion), fmt.Sprintf("discovery:%s", resourceType))
|
||||
serverURL.Path = path.Join(serverURL.Path, string(protocolVersion), "discovery:"+resourceType)
|
||||
|
||||
return serverURL, nil
|
||||
}
|
||||
|
|
|
@ -56,7 +56,7 @@ const (
|
|||
alertmanagerLabel = "alertmanager"
|
||||
)
|
||||
|
||||
var userAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var userAgent = "Prometheus/" + version.Version
|
||||
|
||||
// Alert is a generic representation of an alert in the Prometheus eco-system.
|
||||
type Alert struct {
|
||||
|
|
|
@ -571,7 +571,7 @@ func BenchmarkParser(b *testing.B) {
|
|||
})
|
||||
}
|
||||
for _, c := range errCases {
|
||||
name := fmt.Sprintf("%s (should fail)", c)
|
||||
name := c + " (should fail)"
|
||||
b.Run(name, func(b *testing.B) {
|
||||
b.ReportAllocs()
|
||||
for i := 0; i < b.N; i++ {
|
||||
|
|
|
@ -102,15 +102,15 @@ type (
|
|||
)
|
||||
|
||||
func (e ErrQueryTimeout) Error() string {
|
||||
return fmt.Sprintf("query timed out in %s", string(e))
|
||||
return "query timed out in " + string(e)
|
||||
}
|
||||
|
||||
func (e ErrQueryCanceled) Error() string {
|
||||
return fmt.Sprintf("query was canceled in %s", string(e))
|
||||
return "query was canceled in " + string(e)
|
||||
}
|
||||
|
||||
func (e ErrTooManySamples) Error() string {
|
||||
return fmt.Sprintf("query processing would load too many samples into memory in %s", string(e))
|
||||
return "query processing would load too many samples into memory in " + string(e)
|
||||
}
|
||||
|
||||
func (e ErrStorage) Error() string {
|
||||
|
|
|
@ -58,7 +58,7 @@ func (e *AggregateExpr) Pretty(level int) string {
|
|||
s += "(\n"
|
||||
|
||||
if e.Op.IsAggregatorWithParam() {
|
||||
s += fmt.Sprintf("%s,\n", e.Param.Pretty(level+1))
|
||||
s += e.Param.Pretty(level+1) + ",\n"
|
||||
}
|
||||
s += fmt.Sprintf("%s\n%s)", e.Expr.Pretty(level+1), indent(level))
|
||||
return s
|
||||
|
@ -97,7 +97,7 @@ func (e Expressions) Pretty(level int) string {
|
|||
// Do not prefix the indent since respective nodes will indent itself.
|
||||
s := ""
|
||||
for i := range e {
|
||||
s += fmt.Sprintf("%s,\n", e[i].Pretty(level))
|
||||
s += e[i].Pretty(level) + ",\n"
|
||||
}
|
||||
return s[:len(s)-2]
|
||||
}
|
||||
|
|
|
@ -589,7 +589,7 @@ func (r *AlertingRule) String() string {
|
|||
|
||||
byt, err := yaml.Marshal(ar)
|
||||
if err != nil {
|
||||
return fmt.Sprintf("error marshaling alerting rule: %s", err.Error())
|
||||
return "error marshaling alerting rule: " + err.Error()
|
||||
}
|
||||
|
||||
return string(byt)
|
||||
|
|
|
@ -15,7 +15,6 @@ package rules
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"math"
|
||||
"os"
|
||||
|
@ -195,7 +194,7 @@ func TestAlertingRule(t *testing.T) {
|
|||
|
||||
func TestForStateAddSamples(t *testing.T) {
|
||||
for _, queryOffset := range []time.Duration{0, time.Minute} {
|
||||
t.Run(fmt.Sprintf("queryOffset %s", queryOffset.String()), func(t *testing.T) {
|
||||
t.Run("queryOffset "+queryOffset.String(), func(t *testing.T) {
|
||||
storage := promqltest.LoadedStorage(t, `
|
||||
load 5m
|
||||
http_requests{job="app-server", instance="0", group="canary", severity="overwrite-me"} 75 85 95 105 105 95 85
|
||||
|
@ -357,7 +356,7 @@ func sortAlerts(items []*Alert) {
|
|||
|
||||
func TestForStateRestore(t *testing.T) {
|
||||
for _, queryOffset := range []time.Duration{0, time.Minute} {
|
||||
t.Run(fmt.Sprintf("queryOffset %s", queryOffset.String()), func(t *testing.T) {
|
||||
t.Run("queryOffset "+queryOffset.String(), func(t *testing.T) {
|
||||
storage := promqltest.LoadedStorage(t, `
|
||||
load 5m
|
||||
http_requests{job="app-server", instance="0", group="canary", severity="overwrite-me"} 75 85 50 0 0 25 0 0 40 0 120
|
||||
|
@ -842,7 +841,7 @@ func TestUpdate(t *testing.T) {
|
|||
// Change group rules and reload.
|
||||
for i, g := range rgs.Groups {
|
||||
for j, r := range g.Rules {
|
||||
rgs.Groups[i].Rules[j].Expr.SetString(fmt.Sprintf("%s * 0", r.Expr.Value))
|
||||
rgs.Groups[i].Rules[j].Expr.SetString(r.Expr.Value + " * 0")
|
||||
}
|
||||
}
|
||||
reloadAndValidate(rgs, t, tmpFile, ruleManager, ogs)
|
||||
|
|
|
@ -786,7 +786,7 @@ func acceptEncodingHeader(enableCompression bool) string {
|
|||
return "identity"
|
||||
}
|
||||
|
||||
var UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
var UserAgent = "Prometheus/" + version.Version
|
||||
|
||||
func (s *targetScraper) scrape(ctx context.Context) (*http.Response, error) {
|
||||
if s.req == nil {
|
||||
|
|
|
@ -66,7 +66,7 @@ const (
|
|||
|
||||
var (
|
||||
// UserAgent represents Prometheus version to use for user agent header.
|
||||
UserAgent = fmt.Sprintf("Prometheus/%s", version.Version)
|
||||
UserAgent = "Prometheus/" + version.Version
|
||||
|
||||
remoteWriteContentTypeHeaders = map[config.RemoteWriteProtoMsg]string{
|
||||
config.RemoteWriteProtoMsgV1: appProtoContentType, // Also application/x-protobuf;proto=prometheus.WriteRequest but simplified for compatibility with 1.x spec.
|
||||
|
|
|
@ -184,7 +184,7 @@ func ChunkFromSamplesGeneric(s Samples) (Meta, error) {
|
|||
return emptyChunk, errors.New("did not expect to start a second chunk")
|
||||
}
|
||||
default:
|
||||
panic(fmt.Sprintf("unknown sample type %s", sampleType.String()))
|
||||
panic("unknown sample type " + sampleType.String())
|
||||
}
|
||||
}
|
||||
return Meta{
|
||||
|
|
|
@ -1645,7 +1645,7 @@ func TestSparseHistogramSpaceSavings(t *testing.T) {
|
|||
lbls := labels.FromStrings(
|
||||
"__name__", fmt.Sprintf("rpc_durations_%d_histogram_seconds", i),
|
||||
"instance", "localhost:8080",
|
||||
"job", fmt.Sprintf("sparse_histogram_schema_%s", schemaDescription[sid]),
|
||||
"job", "sparse_histogram_schema_"+schemaDescription[sid],
|
||||
)
|
||||
allSparseSeries = append(allSparseSeries, struct {
|
||||
baseLabels labels.Labels
|
||||
|
|
|
@ -5673,7 +5673,7 @@ func testQuerierOOOQuery(t *testing.T,
|
|||
},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
opts.OutOfOrderCapMax = tc.oooCap
|
||||
db := openTestDB(t, opts, nil)
|
||||
db.DisableCompactions()
|
||||
|
@ -6004,7 +6004,7 @@ func testChunkQuerierOOOQuery(t *testing.T,
|
|||
},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
opts.OutOfOrderCapMax = tc.oooCap
|
||||
db := openTestDB(t, opts, nil)
|
||||
db.DisableCompactions()
|
||||
|
@ -6187,7 +6187,7 @@ func testOOONativeHistogramsWithCounterResets(t *testing.T, scenario sampleTypeS
|
|||
},
|
||||
}
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
db := openTestDB(t, opts, nil)
|
||||
db.DisableCompactions()
|
||||
db.EnableOOONativeHistograms()
|
||||
|
|
|
@ -839,7 +839,7 @@ func testOOOHeadChunkReader_Chunk(t *testing.T, scenario sampleTypeScenario) {
|
|||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
db := newTestDBWithOpts(t, opts)
|
||||
|
||||
app := db.Appender(context.Background())
|
||||
|
@ -1010,7 +1010,7 @@ func testOOOHeadChunkReader_Chunk_ConsistentQueryResponseDespiteOfHeadExpanding(
|
|||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
db := newTestDBWithOpts(t, opts)
|
||||
|
||||
app := db.Appender(context.Background())
|
||||
|
@ -1117,7 +1117,7 @@ func TestSortMetaByMinTimeAndMinRef(t *testing.T) {
|
|||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
t.Run(fmt.Sprintf("name=%s", tc.name), func(t *testing.T) {
|
||||
t.Run("name="+tc.name, func(t *testing.T) {
|
||||
slices.SortFunc(tc.inputMetas, lessByMinTimeAndMinRef)
|
||||
require.Equal(t, tc.expMetas, tc.inputMetas)
|
||||
})
|
||||
|
|
|
@ -82,7 +82,7 @@ func createFlagRow(flag *kingpin.FlagModel) []string {
|
|||
}
|
||||
if valueType.Kind() == reflect.Struct {
|
||||
if _, found := valueType.FieldByName("slice"); found {
|
||||
name = fmt.Sprintf(`%s <code class="text-nowrap">...<code class="text-nowrap">`, name)
|
||||
name += " <code class=\"text-nowrap\">...<code class=\"text-nowrap\">"
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -105,7 +105,7 @@ func writeFlagTable(writer io.Writer, level int, fgm *kingpin.FlagGroupModel) er
|
|||
}
|
||||
}
|
||||
|
||||
return writeTable(writer, rows, fmt.Sprintf("%s Flags", strings.Repeat("#", level+2)))
|
||||
return writeTable(writer, rows, strings.Repeat("#", level+2)+" Flags")
|
||||
}
|
||||
|
||||
func createArgRow(arg *kingpin.ArgModel) []string {
|
||||
|
@ -136,7 +136,7 @@ func writeArgTable(writer io.Writer, level int, agm *kingpin.ArgGroupModel) erro
|
|||
rows = append(rows, row)
|
||||
}
|
||||
|
||||
return writeTable(writer, rows, fmt.Sprintf("%s Arguments", strings.Repeat("#", level+2)))
|
||||
return writeTable(writer, rows, strings.Repeat("#", level+2)+" Arguments")
|
||||
}
|
||||
|
||||
func createCmdRow(cmd *kingpin.CmdModel) []string {
|
||||
|
|
|
@ -3464,7 +3464,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
|
|||
r.RemoteAddr = "127.0.0.1:20201"
|
||||
return r, err
|
||||
}
|
||||
r, err := http.NewRequest(m, fmt.Sprintf("http://example.com?%s", q.Encode()), nil)
|
||||
r, err := http.NewRequest(m, "http://example.com?"+q.Encode(), nil)
|
||||
r.RemoteAddr = "127.0.0.1:20201"
|
||||
return r, err
|
||||
}
|
||||
|
@ -3773,7 +3773,7 @@ func TestAdminEndpoints(t *testing.T) {
|
|||
}
|
||||
|
||||
endpoint := tc.endpoint(api)
|
||||
req, err := http.NewRequest(tc.method, fmt.Sprintf("?%s", tc.values.Encode()), nil)
|
||||
req, err := http.NewRequest(tc.method, "?"+tc.values.Encode(), nil)
|
||||
require.NoError(t, err)
|
||||
|
||||
res := setUnavailStatusOnTSDBNotReady(endpoint(req))
|
||||
|
@ -4149,7 +4149,7 @@ func TestTSDBStatus(t *testing.T) {
|
|||
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
||||
api := &API{db: tc.db, gatherer: prometheus.DefaultGatherer}
|
||||
endpoint := tc.endpoint(api)
|
||||
req, err := http.NewRequest(tc.method, fmt.Sprintf("?%s", tc.values.Encode()), nil)
|
||||
req, err := http.NewRequest(tc.method, "?"+tc.values.Encode(), nil)
|
||||
require.NoError(t, err, "Error when creating test request")
|
||||
res := endpoint(req)
|
||||
assertAPIError(t, res.err, tc.errType)
|
||||
|
@ -4479,7 +4479,7 @@ func TestQueryTimeout(t *testing.T) {
|
|||
"timeout": []string{"1s"},
|
||||
}
|
||||
ctx := context.Background()
|
||||
req, err := http.NewRequest(tc.method, fmt.Sprintf("http://example.com?%s", query.Encode()), nil)
|
||||
req, err := http.NewRequest(tc.method, "http://example.com?"+query.Encode(), nil)
|
||||
require.NoError(t, err)
|
||||
req.RemoteAddr = "127.0.0.1:20201"
|
||||
|
||||
|
|
Loading…
Reference in a new issue