Browse Source

enable gocritic, unconvert and unused linters

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
pull/12241/head
Matthieu MOREL 2 years ago
parent
commit
fb3eb21230
  1. 2
      .github/workflows/ci.yml
  2. 11
      .golangci.yml
  3. 2
      cmd/prometheus/main.go
  4. 2
      cmd/prometheus/query_log_test.go
  5. 2
      cmd/promtool/backfill.go
  6. 2
      cmd/promtool/rules.go
  7. 2
      cmd/promtool/unittest.go
  8. 2
      discovery/kubernetes/endpointslice.go
  9. 7
      discovery/kubernetes/kubernetes.go
  10. 2
      discovery/legacymanager/registry.go
  11. 8
      discovery/linode/linode.go
  12. 7
      discovery/marathon/marathon.go
  13. 6
      discovery/ovhcloud/dedicated_server_test.go
  14. 6
      discovery/ovhcloud/vps_test.go
  15. 2
      discovery/registry.go
  16. 4
      discovery/vultr/vultr.go
  17. 11
      documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go
  18. 14
      model/labels/labels.go
  19. 2
      model/textparse/promparse_test.go
  20. 6
      promql/bench_test.go
  21. 24
      promql/engine.go
  22. 2
      promql/engine_test.go
  23. 8
      promql/functions.go
  24. 2
      promql/functions_test.go
  25. 11
      promql/parser/ast.go
  26. 14
      promql/parser/parse.go
  27. 2
      promql/parser/parse_test.go
  28. 21
      promql/parser/printer.go
  29. 7
      rules/manager.go
  30. 7
      rules/manager_test.go
  31. 6
      scrape/scrape.go
  32. 27
      scrape/scrape_test.go
  33. 4
      scrape/target.go
  34. 7
      storage/merge.go
  35. 27
      storage/remote/codec.go
  36. 8
      storage/remote/queue_manager.go
  37. 2
      template/template.go
  38. 3
      tsdb/agent/db_test.go
  39. 4
      tsdb/block_test.go
  40. 6
      tsdb/chunkenc/bstream.go
  41. 2
      tsdb/chunkenc/float_histogram.go
  42. 6
      tsdb/chunkenc/histogram.go
  43. 2
      tsdb/chunkenc/varbit.go
  44. 12
      tsdb/chunkenc/xor.go
  45. 4
      tsdb/chunks/head_chunks_test.go
  46. 2
      tsdb/compact.go
  47. 6
      tsdb/compact_test.go
  48. 6
      tsdb/db.go
  49. 4
      tsdb/db_test.go
  50. 18
      tsdb/exemplar.go
  51. 2
      tsdb/head.go
  52. 31
      tsdb/head_test.go
  53. 4
      tsdb/head_wal.go
  54. 2
      tsdb/index/index.go
  55. 13
      tsdb/index/postings.go
  56. 6
      tsdb/index/postingsstats.go
  57. 2
      tsdb/isolation.go
  58. 26
      tsdb/querier.go
  59. 4
      tsdb/querier_test.go
  60. 4
      tsdb/wal.go
  61. 4
      tsdb/wlog/wlog_test.go
  62. 2
      util/runtime/limits_default.go
  63. 8
      util/runtime/statfs_default.go
  64. 4
      web/api/v1/api.go
  65. 4
      web/api/v1/api_test.go
  66. 4
      web/web.go

2
.github/workflows/ci.yml

@ -149,6 +149,8 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3.4.0
with:
args: --verbose
skip-cache: true
version: v1.51.2
fuzzing:
uses: ./.github/workflows/fuzzing.yml

11
.golangci.yml

@ -1,5 +1,5 @@
run:
deadline: 5m
timeout: 15m
skip-files:
# Skip autogenerated files.
- ^.*\.(pb|y)\.go$
@ -10,14 +10,23 @@ output:
linters:
enable:
- depguard
- gocritic
- gofumpt
- goimports
- revive
- misspell
- unconvert
- unused
issues:
max-same-issues: 0
exclude-rules:
- linters:
- gocritic
text: "appendAssign"
- linters:
- gocritic
text: "singleCaseSwitch"
- path: _test.go
linters:
- errcheck

2
cmd/prometheus/main.go

@ -490,7 +490,7 @@ func main() {
if cfgFile.StorageConfig.ExemplarsConfig == nil {
cfgFile.StorageConfig.ExemplarsConfig = &config.DefaultExemplarsConfig
}
cfg.tsdb.MaxExemplars = int64(cfgFile.StorageConfig.ExemplarsConfig.MaxExemplars)
cfg.tsdb.MaxExemplars = cfgFile.StorageConfig.ExemplarsConfig.MaxExemplars
}
if cfgFile.StorageConfig.TSDBConfig != nil {
cfg.tsdb.OutOfOrderTimeWindow = cfgFile.StorageConfig.TSDBConfig.OutOfOrderTimeWindow

2
cmd/prometheus/query_log_test.go

@ -193,7 +193,7 @@ func (p *queryLogTest) String() string {
}
name = name + ", " + p.host + ":" + strconv.Itoa(p.port)
if p.enabledAtStart {
name = name + ", enabled at start"
name += ", enabled at start"
}
if p.prefix != "" {
name = name + ", with prefix " + p.prefix

2
cmd/promtool/backfill.go

@ -101,7 +101,7 @@ func createBlocks(input []byte, mint, maxt, maxBlockDuration int64, maxSamplesIn
nextSampleTs int64 = math.MaxInt64
)
for t := mint; t <= maxt; t = t + blockDuration {
for t := mint; t <= maxt; t += blockDuration {
tsUpper := t + blockDuration
if nextSampleTs != math.MaxInt64 && nextSampleTs >= tsUpper {
// The next sample is not in this timerange, we can avoid parsing

2
cmd/promtool/rules.go

@ -100,7 +100,7 @@ func (importer *ruleImporter) importRule(ctx context.Context, ruleExpr, ruleName
startInMs := start.Unix() * int64(time.Second/time.Millisecond)
endInMs := end.Unix() * int64(time.Second/time.Millisecond)
for startOfBlock := blockDuration * (startInMs / blockDuration); startOfBlock <= endInMs; startOfBlock = startOfBlock + blockDuration {
for startOfBlock := blockDuration * (startInMs / blockDuration); startOfBlock <= endInMs; startOfBlock += blockDuration {
endOfBlock := startOfBlock + blockDuration - 1
currStart := max(startOfBlock/int64(time.Second/time.Millisecond), start.Unix())

2
cmd/promtool/unittest.go

@ -130,7 +130,7 @@ func resolveAndGlobFilepaths(baseDir string, utf *unitTestFile) error {
if err != nil {
return err
}
if len(m) <= 0 {
if len(m) == 0 {
fmt.Fprintln(os.Stderr, " WARNING: no file match pattern", rf)
}
globbedFiles = append(globbedFiles, m...)

2
discovery/kubernetes/endpointslice.go

@ -300,7 +300,7 @@ func (e *EndpointSlice) buildEndpointSlice(eps endpointSliceAdaptor) *targetgrou
}
if port.protocol() != nil {
target[endpointSlicePortProtocolLabel] = lv(string(*port.protocol()))
target[endpointSlicePortProtocolLabel] = lv(*port.protocol())
}
if port.port() != nil {

7
discovery/kubernetes/kubernetes.go

@ -299,12 +299,13 @@ func New(l log.Logger, conf *SDConfig) (*Discovery, error) {
err error
ownNamespace string
)
if conf.KubeConfig != "" {
switch {
case conf.KubeConfig != "":
kcfg, err = clientcmd.BuildConfigFromFlags("", conf.KubeConfig)
if err != nil {
return nil, err
}
} else if conf.APIServer.URL == nil {
case conf.APIServer.URL == nil:
// Use the Kubernetes provided pod service account
// as described in https://kubernetes.io/docs/admin/service-accounts-admin/
kcfg, err = rest.InClusterConfig()
@ -324,7 +325,7 @@ func New(l log.Logger, conf *SDConfig) (*Discovery, error) {
}
level.Info(l).Log("msg", "Using pod service account via in-cluster config")
} else {
default:
rt, err := config.NewRoundTripperFromConfig(conf.HTTPClientConfig, "kubernetes_sd")
if err != nil {
return nil, err

2
discovery/legacymanager/registry.go

@ -254,7 +254,7 @@ func replaceYAMLTypeError(err error, oldTyp, newTyp reflect.Type) error {
oldStr := oldTyp.String()
newStr := newTyp.String()
for i, s := range e.Errors {
e.Errors[i] = strings.Replace(s, oldStr, newStr, -1)
e.Errors[i] = strings.ReplaceAll(s, oldStr, newStr)
}
}
return err

8
discovery/linode/linode.go

@ -249,20 +249,20 @@ func (d *Discovery) refreshData(ctx context.Context) ([]*targetgroup.Group, erro
if detailedIP.Address != ip.String() {
continue
}
if detailedIP.Public && publicIPv4 == "" {
switch {
case detailedIP.Public && publicIPv4 == "":
publicIPv4 = detailedIP.Address
if detailedIP.RDNS != "" && detailedIP.RDNS != "null" {
publicIPv4RDNS = detailedIP.RDNS
}
} else if !detailedIP.Public && privateIPv4 == "" {
case !detailedIP.Public && privateIPv4 == "":
privateIPv4 = detailedIP.Address
if detailedIP.RDNS != "" && detailedIP.RDNS != "null" {
privateIPv4RDNS = detailedIP.RDNS
}
} else {
default:
extraIPs = append(extraIPs, detailedIP.Address)
}
}

7
discovery/marathon/marathon.go

@ -400,19 +400,20 @@ func targetsForApp(app *app) []model.LabelSet {
var labels []map[string]string
var prefix string
if len(app.Container.PortMappings) != 0 {
switch {
case len(app.Container.PortMappings) != 0:
// In Marathon 1.5.x the "container.docker.portMappings" object was moved
// to "container.portMappings".
ports, labels = extractPortMapping(app.Container.PortMappings, app.isContainerNet())
prefix = portMappingLabelPrefix
} else if len(app.Container.Docker.PortMappings) != 0 {
case len(app.Container.Docker.PortMappings) != 0:
// Prior to Marathon 1.5 the port mappings could be found at the path
// "container.docker.portMappings".
ports, labels = extractPortMapping(app.Container.Docker.PortMappings, app.isContainerNet())
prefix = portMappingLabelPrefix
} else if len(app.PortDefinitions) != 0 {
case len(app.PortDefinitions) != 0:
// PortDefinitions deprecates the "ports" array and can be used to specify
// a list of ports with metadata in case a mapping is not required.
ports = make([]uint32, len(app.PortDefinitions))

6
discovery/ovhcloud/dedicated_server_test.go

@ -84,7 +84,7 @@ func MockDedicatedAPI(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
if string(r.URL.Path) == "/dedicated/server" {
if r.URL.Path == "/dedicated/server" {
dedicatedServersList, err := os.ReadFile("testdata/dedicated_server/dedicated_servers.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -96,7 +96,7 @@ func MockDedicatedAPI(w http.ResponseWriter, r *http.Request) {
return
}
}
if string(r.URL.Path) == "/dedicated/server/abcde" {
if r.URL.Path == "/dedicated/server/abcde" {
dedicatedServer, err := os.ReadFile("testdata/dedicated_server/dedicated_servers_details.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -108,7 +108,7 @@ func MockDedicatedAPI(w http.ResponseWriter, r *http.Request) {
return
}
}
if string(r.URL.Path) == "/dedicated/server/abcde/ips" {
if r.URL.Path == "/dedicated/server/abcde/ips" {
dedicatedServerIPs, err := os.ReadFile("testdata/dedicated_server/dedicated_servers_abcde_ips.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)

6
discovery/ovhcloud/vps_test.go

@ -91,7 +91,7 @@ func MockVpsAPI(w http.ResponseWriter, r *http.Request) {
return
}
w.Header().Set("Content-Type", "application/json")
if string(r.URL.Path) == "/vps" {
if r.URL.Path == "/vps" {
dedicatedServersList, err := os.ReadFile("testdata/vps/vps.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -103,7 +103,7 @@ func MockVpsAPI(w http.ResponseWriter, r *http.Request) {
return
}
}
if string(r.URL.Path) == "/vps/abc" {
if r.URL.Path == "/vps/abc" {
dedicatedServer, err := os.ReadFile("testdata/vps/vps_details.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@ -115,7 +115,7 @@ func MockVpsAPI(w http.ResponseWriter, r *http.Request) {
return
}
}
if string(r.URL.Path) == "/vps/abc/ips" {
if r.URL.Path == "/vps/abc/ips" {
dedicatedServerIPs, err := os.ReadFile("testdata/vps/vps_abc_ips.json")
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)

2
discovery/registry.go

@ -253,7 +253,7 @@ func replaceYAMLTypeError(err error, oldTyp, newTyp reflect.Type) error {
oldStr := oldTyp.String()
newStr := newTyp.String()
for i, s := range e.Errors {
e.Errors[i] = strings.Replace(s, oldStr, newStr, -1)
e.Errors[i] = strings.ReplaceAll(s, oldStr, newStr)
}
}
return err

4
discovery/vultr/vultr.go

@ -202,10 +202,8 @@ func (d *Discovery) listInstances(ctx context.Context) ([]govultr.Instance, erro
if meta.Links.Next == "" {
break
} else {
listOptions.Cursor = meta.Links.Next
continue
}
listOptions.Cursor = meta.Links.Next
}
return instances, nil

11
documentation/examples/remote_storage/remote_storage_adapter/influxdb/client.go

@ -184,11 +184,11 @@ func (c *Client) buildCommand(q *prompb.Query) (string, error) {
}
func escapeSingleQuotes(str string) string {
return strings.Replace(str, `'`, `\'`, -1)
return strings.ReplaceAll(str, `'`, `\'`)
}
func escapeSlashes(str string) string {
return strings.Replace(str, `/`, `\/`, -1)
return strings.ReplaceAll(str, `/`, `\/`)
}
func mergeResult(labelsToSeries map[string]*prompb.TimeSeries, results []influx.Result) error {
@ -290,13 +290,14 @@ func mergeSamples(a, b []prompb.Sample) []prompb.Sample {
result := make([]prompb.Sample, 0, len(a)+len(b))
i, j := 0, 0
for i < len(a) && j < len(b) {
if a[i].Timestamp < b[j].Timestamp {
switch {
case a[i].Timestamp < b[j].Timestamp:
result = append(result, a[i])
i++
} else if a[i].Timestamp > b[j].Timestamp {
case a[i].Timestamp > b[j].Timestamp:
result = append(result, b[j])
j++
} else {
default:
result = append(result, a[i])
i++
j++

14
model/labels/labels.go

@ -169,11 +169,12 @@ func (ls Labels) HashForLabels(b []byte, names ...string) (uint64, []byte) {
b = b[:0]
i, j := 0, 0
for i < len(ls) && j < len(names) {
if names[j] < ls[i].Name {
switch {
case names[j] < ls[i].Name:
j++
} else if ls[i].Name < names[j] {
case ls[i].Name < names[j]:
i++
} else {
default:
b = append(b, ls[i].Name...)
b = append(b, seps[0])
b = append(b, ls[i].Value...)
@ -213,11 +214,12 @@ func (ls Labels) BytesWithLabels(buf []byte, names ...string) []byte {
b.WriteByte(labelSep)
i, j := 0, 0
for i < len(ls) && j < len(names) {
if names[j] < ls[i].Name {
switch {
case names[j] < ls[i].Name:
j++
} else if ls[i].Name < names[j] {
case ls[i].Name < names[j]:
i++
} else {
default:
if b.Len() > 1 {
b.WriteByte(seps[0])
}

2
model/textparse/promparse_test.go

@ -512,7 +512,7 @@ func BenchmarkGzip(b *testing.B) {
k := b.N / promtestdataSampleCount
b.ReportAllocs()
b.SetBytes(int64(n) / promtestdataSampleCount)
b.SetBytes(n / promtestdataSampleCount)
b.ResetTimer()
total := 0

6
promql/bench_test.go

@ -194,9 +194,9 @@ func rangeQueryCases() []benchCase {
if !strings.Contains(c.expr, "X") {
tmp = append(tmp, c)
} else {
tmp = append(tmp, benchCase{expr: strings.Replace(c.expr, "X", "one", -1), steps: c.steps})
tmp = append(tmp, benchCase{expr: strings.Replace(c.expr, "X", "ten", -1), steps: c.steps})
tmp = append(tmp, benchCase{expr: strings.Replace(c.expr, "X", "hundred", -1), steps: c.steps})
tmp = append(tmp, benchCase{expr: strings.ReplaceAll(c.expr, "X", "one"), steps: c.steps})
tmp = append(tmp, benchCase{expr: strings.ReplaceAll(c.expr, "X", "ten"), steps: c.steps})
tmp = append(tmp, benchCase{expr: strings.ReplaceAll(c.expr, "X", "hundred"), steps: c.steps})
}
}
cases = tmp

24
promql/engine.go

@ -783,7 +783,6 @@ func (ng *Engine) findMinMaxTime(s *parser.EvalStmt) (int64, int64) {
maxTimestamp = end
}
evalRange = 0
case *parser.MatrixSelector:
evalRange = n.Range
}
@ -816,20 +815,20 @@ func (ng *Engine) getTimeRangesForSelector(s *parser.EvalStmt, n *parser.VectorS
} else {
offsetMilliseconds := durationMilliseconds(subqOffset)
start = start - offsetMilliseconds - durationMilliseconds(subqRange)
end = end - offsetMilliseconds
end -= offsetMilliseconds
}
if evalRange == 0 {
start = start - durationMilliseconds(s.LookbackDelta)
start -= durationMilliseconds(s.LookbackDelta)
} else {
// For all matrix queries we want to ensure that we have (end-start) + range selected
// this way we have `range` data before the start time
start = start - durationMilliseconds(evalRange)
start -= durationMilliseconds(evalRange)
}
offsetMilliseconds := durationMilliseconds(n.OriginalOffset)
start = start - offsetMilliseconds
end = end - offsetMilliseconds
start -= offsetMilliseconds
end -= offsetMilliseconds
return start, end
}
@ -1745,7 +1744,7 @@ func (ev *evaluator) eval(expr parser.Expr) (parser.Value, storage.Warnings) {
res, ws := newEv.eval(e.Expr)
ev.currentSamples = newEv.currentSamples
ev.samplesStats.UpdatePeakFromSubquery(newEv.samplesStats)
for ts, step := ev.startTimestamp, -1; ts <= ev.endTimestamp; ts = ts + ev.interval {
for ts, step := ev.startTimestamp, -1; ts <= ev.endTimestamp; ts += ev.interval {
step++
ev.samplesStats.IncrementSamplesAtStep(step, newEv.samplesStats.TotalSamples)
}
@ -1767,7 +1766,7 @@ func (ev *evaluator) eval(expr parser.Expr) (parser.Value, storage.Warnings) {
if len(mat[i].Floats)+len(mat[i].Histograms) != 1 {
panic(fmt.Errorf("unexpected number of samples"))
}
for ts := ev.startTimestamp + ev.interval; ts <= ev.endTimestamp; ts = ts + ev.interval {
for ts := ev.startTimestamp + ev.interval; ts <= ev.endTimestamp; ts += ev.interval {
if len(mat[i].Floats) > 0 {
mat[i].Floats = append(mat[i].Floats, FPoint{
T: ts,
@ -2514,14 +2513,15 @@ func (ev *evaluator) aggregation(op parser.ItemType, grouping []string, without
if !ok {
var m labels.Labels
enh.resetBuilder(metric)
if without {
switch {
case without:
enh.lb.Del(grouping...)
enh.lb.Del(labels.MetricName)
m = enh.lb.Labels()
} else if len(grouping) > 0 {
case len(grouping) > 0:
enh.lb.Keep(grouping...)
m = enh.lb.Labels()
} else {
default:
m = labels.EmptyLabels()
}
newAgg := &groupedAggregation{
@ -2689,7 +2689,7 @@ func (ev *evaluator) aggregation(op parser.ItemType, grouping []string, without
aggr.floatValue = float64(aggr.groupCount)
case parser.STDVAR:
aggr.floatValue = aggr.floatValue / float64(aggr.groupCount)
aggr.floatValue /= float64(aggr.groupCount)
case parser.STDDEV:
aggr.floatValue = math.Sqrt(aggr.floatValue / float64(aggr.groupCount))

2
promql/engine_test.go

@ -3267,7 +3267,7 @@ func TestNativeHistogram_HistogramCountAndSum(t *testing.T) {
require.Len(t, vector, 1)
require.Nil(t, vector[0].H)
if floatHisto {
require.Equal(t, float64(h.ToFloat().Count), vector[0].F)
require.Equal(t, h.ToFloat().Count, vector[0].F)
} else {
require.Equal(t, float64(h.Count), vector[0].F)
}

8
promql/functions.go

@ -877,10 +877,10 @@ func linearRegression(samples []FPoint, interceptTime int64) (slope, intercept f
}
return 0, initY
}
sumX = sumX + cX
sumY = sumY + cY
sumXY = sumXY + cXY
sumX2 = sumX2 + cX2
sumX += cX
sumY += cY
sumXY += cXY
sumX2 += cX2
covXY := sumXY - sumX*sumY/n
varX := sumX2 - sumX*sumX/n

2
promql/functions_test.go

@ -51,7 +51,7 @@ func TestDeriv(t *testing.T) {
// https://github.com/prometheus/prometheus/issues/7180
for i = 0; i < 15; i++ {
jitter := 12 * i % 2
a.Append(0, metric, int64(start+interval*i+jitter), 1)
a.Append(0, metric, start+interval*i+jitter, 1)
}
require.NoError(t, a.Commit())

11
promql/parser/ast.go

@ -349,7 +349,7 @@ func (f inspector) Visit(node Node, path []Node) (Visitor, error) {
// for all the non-nil children of node, recursively.
func Inspect(node Node, f inspector) {
//nolint: errcheck
Walk(inspector(f), node, nil)
Walk(f, node, nil)
}
// Children returns a list of all child nodes of a syntax tree node.
@ -368,13 +368,14 @@ func Children(node Node) []Node {
case *AggregateExpr:
// While this does not look nice, it should avoid unnecessary allocations
// caused by slice resizing
if n.Expr == nil && n.Param == nil {
switch {
case n.Expr == nil && n.Param == nil:
return nil
} else if n.Expr == nil {
case n.Expr == nil:
return []Node{n.Param}
} else if n.Param == nil {
case n.Param == nil:
return []Node{n.Expr}
} else {
default:
return []Node{n.Expr, n.Param}
}
case *BinaryExpr:

14
promql/parser/parse.go

@ -523,15 +523,13 @@ func (p *parser) checkAST(node Node) (typ ValueType) {
p.addParseErrf(n.PositionRange(), "vector matching only allowed between instant vectors")
}
n.VectorMatching = nil
} else {
// Both operands are Vectors.
if n.Op.IsSetOperator() {
if n.VectorMatching.Card == CardOneToMany || n.VectorMatching.Card == CardManyToOne {
p.addParseErrf(n.PositionRange(), "no grouping allowed for %q operation", n.Op)
}
if n.VectorMatching.Card != CardManyToMany {
p.addParseErrf(n.PositionRange(), "set operations must always be many-to-many")
}
} else if n.Op.IsSetOperator() {
if n.VectorMatching.Card == CardOneToMany || n.VectorMatching.Card == CardManyToOne {
p.addParseErrf(n.PositionRange(), "no grouping allowed for %q operation", n.Op)
}
if n.VectorMatching.Card != CardManyToMany {
p.addParseErrf(n.PositionRange(), "set operations must always be many-to-many")
}
}

2
promql/parser/parse_test.go

@ -3592,7 +3592,7 @@ func TestNaNExpression(t *testing.T) {
nl, ok := expr.(*NumberLiteral)
require.True(t, ok, "expected number literal but got %T", expr)
require.True(t, math.IsNaN(float64(nl.Val)), "expected 'NaN' in number literal but got %v", nl.Val)
require.True(t, math.IsNaN(nl.Val), "expected 'NaN' in number literal but got %v", nl.Val)
}
var testSeries = []struct {

21
promql/parser/printer.go

@ -130,11 +130,12 @@ func (node *MatrixSelector) String() string {
offset = fmt.Sprintf(" offset -%s", model.Duration(-vecSelector.OriginalOffset))
}
at := ""
if vecSelector.Timestamp != nil {
switch {
case vecSelector.Timestamp != nil:
at = fmt.Sprintf(" @ %.3f", float64(*vecSelector.Timestamp)/1000.0)
} else if vecSelector.StartOrEnd == START {
case vecSelector.StartOrEnd == START:
at = " @ start()"
} else if vecSelector.StartOrEnd == END {
case vecSelector.StartOrEnd == END:
at = " @ end()"
}
@ -168,11 +169,12 @@ func (node *SubqueryExpr) getSubqueryTimeSuffix() string {
offset = fmt.Sprintf(" offset -%s", model.Duration(-node.OriginalOffset))
}
at := ""
if node.Timestamp != nil {
switch {
case node.Timestamp != nil:
at = fmt.Sprintf(" @ %.3f", float64(*node.Timestamp)/1000.0)
} else if node.StartOrEnd == START {
case node.StartOrEnd == START:
at = " @ start()"
} else if node.StartOrEnd == END {
case node.StartOrEnd == END:
at = " @ end()"
}
return fmt.Sprintf("[%s:%s]%s%s", model.Duration(node.Range), step, at, offset)
@ -213,11 +215,12 @@ func (node *VectorSelector) String() string {
offset = fmt.Sprintf(" offset -%s", model.Duration(-node.OriginalOffset))
}
at := ""
if node.Timestamp != nil {
switch {
case node.Timestamp != nil:
at = fmt.Sprintf(" @ %.3f", float64(*node.Timestamp)/1000.0)
} else if node.StartOrEnd == START {
case node.StartOrEnd == START:
at = " @ start()"
} else if node.StartOrEnd == END {
case node.StartOrEnd == END:
at = " @ end()"
}

7
rules/manager.go

@ -866,12 +866,13 @@ func (g *Group) RestoreForState(ts time.Time) {
timeSpentPending := downAt.Sub(restoredActiveAt)
timeRemainingPending := alertHoldDuration - timeSpentPending
if timeRemainingPending <= 0 {
switch {
case timeRemainingPending <= 0:
// It means that alert was firing when prometheus went down.
// In the next Eval, the state of this alert will be set back to
// firing again if it's still firing in that Eval.
// Nothing to be done in this case.
} else if timeRemainingPending < g.opts.ForGracePeriod {
case timeRemainingPending < g.opts.ForGracePeriod:
// (new) restoredActiveAt = (ts + m.opts.ForGracePeriod) - alertHoldDuration
// /* new firing time */ /* moving back by hold duration */
//
@ -884,7 +885,7 @@ func (g *Group) RestoreForState(ts time.Time) {
// = (ts + m.opts.ForGracePeriod) - ts
// = m.opts.ForGracePeriod
restoredActiveAt = ts.Add(g.opts.ForGracePeriod).Add(-alertHoldDuration)
} else {
default:
// By shifting ActiveAt to the future (ActiveAt + some_duration),
// the total pending time from the original ActiveAt
// would be `alertHoldDuration + some_duration`.

7
rules/manager_test.go

@ -481,17 +481,18 @@ func TestForStateRestore(t *testing.T) {
})
// Checking if we have restored it correctly.
if tst.noRestore {
switch {
case tst.noRestore:
require.Equal(t, tst.num, len(got))
for _, e := range got {
require.Equal(t, e.ActiveAt, restoreTime)
}
} else if tst.gracePeriod {
case tst.gracePeriod:
require.Equal(t, tst.num, len(got))
for _, e := range got {
require.Equal(t, opts.ForGracePeriod, e.ActiveAt.Add(alertForDuration).Sub(restoreTime))
}
} else {
default:
exp := tst.alerts
require.Equal(t, len(exp), len(got))
sortAlerts(exp)

6
scrape/scrape.go

@ -640,7 +640,7 @@ func verifyLabelLimits(lset labels.Labels, limits *labelLimits) error {
met := lset.Get(labels.MetricName)
if limits.labelLimit > 0 {
nbLabels := lset.Len()
if nbLabels > int(limits.labelLimit) {
if nbLabels > limits.labelLimit {
return fmt.Errorf("label_limit exceeded (metric: %.50s, number of labels: %d, limit: %d)", met, nbLabels, limits.labelLimit)
}
}
@ -652,14 +652,14 @@ func verifyLabelLimits(lset labels.Labels, limits *labelLimits) error {
return lset.Validate(func(l labels.Label) error {
if limits.labelNameLengthLimit > 0 {
nameLength := len(l.Name)
if nameLength > int(limits.labelNameLengthLimit) {
if nameLength > limits.labelNameLengthLimit {
return fmt.Errorf("label_name_length_limit exceeded (metric: %.50s, label name: %.50s, length: %d, limit: %d)", met, l.Name, nameLength, limits.labelNameLengthLimit)
}
}
if limits.labelValueLengthLimit > 0 {
valueLength := len(l.Value)
if valueLength > int(limits.labelValueLengthLimit) {
if valueLength > limits.labelValueLengthLimit {
return fmt.Errorf("label_value_length_limit exceeded (metric: %.50s, label name: %.50s, value: %.50q, length: %d, limit: %d)", met, l.Name, l.Value, valueLength, limits.labelValueLengthLimit)
}
}

27
scrape/scrape_test.go

@ -322,7 +322,7 @@ func TestScrapePoolReloadPreserveRelabeledIntervalTimeout(t *testing.T) {
ScrapeTimeout: model.Duration(2 * time.Second),
}
newLoop := func(opts scrapeLoopOptions) loop {
l := &testLoop{interval: time.Duration(opts.interval), timeout: time.Duration(opts.timeout)}
l := &testLoop{interval: opts.interval, timeout: opts.timeout}
l.startFunc = func(interval, timeout time.Duration, errc chan<- error) {
require.Equal(t, 5*time.Second, interval, "Unexpected scrape interval")
require.Equal(t, 3*time.Second, timeout, "Unexpected scrape timeout")
@ -546,7 +546,7 @@ func TestScrapePoolRaces(t *testing.T) {
require.Equal(t, expectedDropped, len(dropped), "Invalid number of dropped targets")
for i := 0; i < 20; i++ {
time.Sleep(time.Duration(10 * time.Millisecond))
time.Sleep(10 * time.Millisecond)
sp.reload(newConfig())
}
sp.stop()
@ -1199,14 +1199,14 @@ func TestScrapeLoopRunCreatesStaleMarkersOnParseFailure(t *testing.T) {
// Succeed once, several failures, then stop.
scraper.scrapeFunc = func(ctx context.Context, w io.Writer) error {
numScrapes++
if numScrapes == 1 {
switch {
case numScrapes == 1:
w.Write([]byte("metric_a 42\n"))
return nil
} else if numScrapes == 2 {
case numScrapes == 2:
w.Write([]byte("7&-\n"))
return nil
} else if numScrapes == 3 {
case numScrapes == 3:
cancel()
}
return errors.New("scrape failed")
@ -1282,14 +1282,14 @@ func TestScrapeLoopCache(t *testing.T) {
}
numScrapes++
if numScrapes == 1 {
switch {
case numScrapes == 1:
w.Write([]byte("metric_a 42\nmetric_b 43\n"))
return nil
} else if numScrapes == 3 {
case numScrapes == 3:
w.Write([]byte("metric_a 44\n"))
return nil
} else if numScrapes == 4 {
case numScrapes == 4:
cancel()
}
return fmt.Errorf("scrape failed")
@ -2280,11 +2280,12 @@ func TestTargetScrapeScrapeCancel(t *testing.T) {
go func() {
_, err := ts.scrape(ctx, io.Discard)
if err == nil {
switch {
case err == nil:
errc <- errors.New("Expected error but got nil")
} else if ctx.Err() != context.Canceled {
case ctx.Err() != context.Canceled:
errc <- errors.Errorf("Expected context cancellation error but got: %s", ctx.Err())
} else {
default:
close(errc)
}
}()

4
scrape/target.go

@ -413,9 +413,9 @@ func PopulateLabels(lb *labels.Builder, cfg *config.ScrapeConfig, noDefaultPort
// Addresses reaching this point are already wrapped in [] if necessary.
switch scheme {
case "http", "":
addr = addr + ":80"
addr += ":80"
case "https":
addr = addr + ":443"
addr += ":443"
default:
return labels.EmptyLabels(), labels.EmptyLabels(), errors.Errorf("invalid scheme: %q", cfg.Scheme)
}

7
storage/merge.go

@ -197,13 +197,14 @@ func mergeStrings(a, b []string) []string {
res := make([]string, 0, maxl*10/9)
for len(a) > 0 && len(b) > 0 {
if a[0] == b[0] {
switch {
case a[0] == b[0]:
res = append(res, a[0])
a, b = a[1:], b[1:]
} else if a[0] < b[0] {
case a[0] < b[0]:
res = append(res, a[0])
a = a[1:]
} else {
default:
res = append(res, b[0])
b = b[1:]
}

27
storage/remote/codec.go

@ -291,13 +291,14 @@ func MergeLabels(primary, secondary []prompb.Label) []prompb.Label {
result := make([]prompb.Label, 0, len(primary)+len(secondary))
i, j := 0, 0
for i < len(primary) && j < len(secondary) {
if primary[i].Name < secondary[j].Name {
switch {
case primary[i].Name < secondary[j].Name:
result = append(result, primary[i])
i++
} else if primary[i].Name > secondary[j].Name {
case primary[i].Name > secondary[j].Name:
result = append(result, secondary[j])
j++
} else {
default:
result = append(result, primary[i])
i++
j++
@ -428,8 +429,8 @@ func (c *concreteSeriesIterator) Seek(t int64) chunkenc.ValueType {
c.histogramsCur += sort.Search(len(c.series.histograms)-c.histogramsCur, func(n int) bool {
return c.series.histograms[n+c.histogramsCur].Timestamp >= t
})
if c.floatsCur < len(c.series.floats) && c.histogramsCur < len(c.series.histograms) {
switch {
case c.floatsCur < len(c.series.floats) && c.histogramsCur < len(c.series.histograms):
// If float samples and histogram samples have overlapping timestamps prefer the float samples.
if c.series.floats[c.floatsCur].Timestamp <= c.series.histograms[c.histogramsCur].Timestamp {
c.curValType = chunkenc.ValFloat
@ -445,12 +446,11 @@ func (c *concreteSeriesIterator) Seek(t int64) chunkenc.ValueType {
c.floatsCur--
}
}
} else if c.floatsCur < len(c.series.floats) {
case c.floatsCur < len(c.series.floats):
c.curValType = chunkenc.ValFloat
} else if c.histogramsCur < len(c.series.histograms) {
case c.histogramsCur < len(c.series.histograms):
c.curValType = getHistogramValType(&c.series.histograms[c.histogramsCur])
}
return c.curValType
}
@ -514,26 +514,25 @@ func (c *concreteSeriesIterator) Next() chunkenc.ValueType {
peekHistTS = c.series.histograms[c.histogramsCur+1].Timestamp
}
c.curValType = chunkenc.ValNone
if peekFloatTS < peekHistTS {
switch {
case peekFloatTS < peekHistTS:
c.floatsCur++
c.curValType = chunkenc.ValFloat
} else if peekHistTS < peekFloatTS {
case peekHistTS < peekFloatTS:
c.histogramsCur++
c.curValType = chunkenc.ValHistogram
} else if peekFloatTS == noTS && peekHistTS == noTS {
case peekFloatTS == noTS && peekHistTS == noTS:
// This only happens when the iterator is exhausted; we set the cursors off the end to prevent
// Seek() from returning anything afterwards.
c.floatsCur = len(c.series.floats)
c.histogramsCur = len(c.series.histograms)
} else {
default:
// Prefer float samples to histogram samples if there's a conflict. We advance the cursor for histograms
// anyway otherwise the histogram sample will get selected on the next call to Next().
c.floatsCur++
c.histogramsCur++
c.curValType = chunkenc.ValFloat
}
return c.curValType
}

8
storage/remote/queue_manager.go

@ -609,7 +609,7 @@ outer:
t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff = backoff * 2
backoff *= 2
// It is reasonable to use t.cfg.MaxBackoff here, as if we have hit
// the full backoff we are likely waiting for external resources.
if backoff > t.cfg.MaxBackoff {
@ -660,7 +660,7 @@ outer:
t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff = backoff * 2
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}
@ -707,7 +707,7 @@ outer:
t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff = backoff * 2
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}
@ -754,7 +754,7 @@ outer:
t.metrics.enqueueRetriesTotal.Inc()
time.Sleep(time.Duration(backoff))
backoff = backoff * 2
backoff *= 2
if backoff > t.cfg.MaxBackoff {
backoff = t.cfg.MaxBackoff
}

2
template/template.go

@ -421,7 +421,7 @@ func (te Expander) ExpandHTML(templateFiles []string) (result string, resultErr
}
}
}()
//nolint:unconvert // Before Go 1.19 conversion from text_template to html_template is mandatory
tmpl := html_template.New(te.name).Funcs(html_template.FuncMap(te.funcMap))
tmpl.Option(te.options...)
tmpl.Funcs(html_template.FuncMap{

3
tsdb/agent/db_test.go

@ -739,8 +739,7 @@ func TestStorage_DuplicateExemplarsIgnored(t *testing.T) {
var dec record.Decoder
for r.Next() {
rec := r.Record()
switch dec.Type(rec) {
case record.Exemplars:
if dec.Type(rec) == record.Exemplars {
var exemplars []record.RefExemplar
exemplars, err = dec.Exemplars(rec, exemplars)
require.NoError(t, err)

4
tsdb/block_test.go

@ -630,7 +630,7 @@ func genHistogramSeries(totalSeries, labelCount int, mint, maxt, step int64, flo
{Offset: 0, Length: 2},
{Offset: 1, Length: 2},
},
PositiveBuckets: []int64{int64(ts + 1), 1, -1, 0},
PositiveBuckets: []int64{ts + 1, 1, -1, 0},
}
if ts != mint {
// By setting the counter reset hint to "no counter
@ -669,7 +669,7 @@ func genHistogramAndFloatSeries(totalSeries, labelCount int, mint, maxt, step in
{Offset: 0, Length: 2},
{Offset: 1, Length: 2},
},
PositiveBuckets: []int64{int64(ts + 1), 1, -1, 0},
PositiveBuckets: []int64{ts + 1, 1, -1, 0},
}
if count > 1 && count%5 != 1 {
// Same rationale for this as above in

6
tsdb/chunkenc/bstream.go

@ -182,7 +182,7 @@ func (b *bstreamReader) readBits(nbits uint8) (uint64, error) {
}
bitmask = (uint64(1) << nbits) - 1
v = v | ((b.buffer >> (b.valid - nbits)) & bitmask)
v |= ((b.buffer >> (b.valid - nbits)) & bitmask)
b.valid -= nbits
return v, nil
@ -242,13 +242,13 @@ func (b *bstreamReader) loadNextBuffer(nbits uint8) bool {
if b.streamOffset+nbytes == len(b.stream) {
// There can be concurrent writes happening on the very last byte
// of the stream, so use the copy we took at initialization time.
buffer = buffer | uint64(b.last)
buffer |= uint64(b.last)
// Read up to the byte before
skip = 1
}
for i := 0; i < nbytes-skip; i++ {
buffer = buffer | (uint64(b.stream[b.streamOffset+i]) << uint(8*(nbytes-i-1)))
buffer |= (uint64(b.stream[b.streamOffset+i]) << uint(8*(nbytes-i-1)))
}
b.buffer = buffer

2
tsdb/chunkenc/float_histogram.go

@ -785,7 +785,7 @@ func (it *floatHistogramIterator) Next() ValueType {
it.err = err
return ValNone
}
it.tDelta = it.tDelta + tDod
it.tDelta += tDod
it.t += it.tDelta
if ok := it.readXor(&it.cnt.value, &it.cnt.leading, &it.cnt.trailing); !ok {

6
tsdb/chunkenc/histogram.go

@ -875,7 +875,7 @@ func (it *histogramIterator) Next() ValueType {
it.err = err
return ValNone
}
it.tDelta = it.tDelta + tDod
it.tDelta += tDod
it.t += it.tDelta
cntDod, err := readVarbitInt(&it.br)
@ -883,7 +883,7 @@ func (it *histogramIterator) Next() ValueType {
it.err = err
return ValNone
}
it.cntDelta = it.cntDelta + cntDod
it.cntDelta += cntDod
it.cnt = uint64(int64(it.cnt) + it.cntDelta)
zcntDod, err := readVarbitInt(&it.br)
@ -891,7 +891,7 @@ func (it *histogramIterator) Next() ValueType {
it.err = err
return ValNone
}
it.zCntDelta = it.zCntDelta + zcntDod
it.zCntDelta += zcntDod
it.zCnt = uint64(int64(it.zCnt) + it.zCntDelta)
ok := it.readSum()

2
tsdb/chunkenc/varbit.go

@ -122,7 +122,7 @@ func readVarbitInt(b *bstreamReader) (int64, error) {
}
if bits > (1 << (sz - 1)) {
// Or something.
bits = bits - (1 << sz)
bits -= (1 << sz)
}
val = int64(bits)
}

12
tsdb/chunkenc/xor.go

@ -163,15 +163,15 @@ func (a *xorAppender) AppendFloatHistogram(t int64, h *histogram.FloatHistogram)
func (a *xorAppender) Append(t int64, v float64) {
var tDelta uint64
num := binary.BigEndian.Uint16(a.b.bytes())
if num == 0 {
switch {
case num == 0:
buf := make([]byte, binary.MaxVarintLen64)
for _, b := range buf[:binary.PutVarint(buf, t)] {
a.b.writeByte(b)
}
a.b.writeBits(math.Float64bits(v), 64)
} else if num == 1 {
case num == 1:
tDelta = uint64(t - a.t)
buf := make([]byte, binary.MaxVarintLen64)
@ -181,7 +181,7 @@ func (a *xorAppender) Append(t int64, v float64) {
a.writeVDelta(v)
} else {
default:
tDelta = uint64(t - a.t)
dod := int64(tDelta - a.tDelta)
@ -321,7 +321,7 @@ func (it *xorIterator) Next() ValueType {
return ValNone
}
it.tDelta = tDelta
it.t = it.t + int64(it.tDelta)
it.t += int64(it.tDelta)
return it.readValue()
}
@ -384,7 +384,7 @@ func (it *xorIterator) Next() ValueType {
}
it.tDelta = uint64(int64(it.tDelta) + dod)
it.t = it.t + int64(it.tDelta)
it.t += int64(it.tDelta)
return it.readValue()
}

4
tsdb/chunks/head_chunks_test.go

@ -503,10 +503,10 @@ func createChunkDiskMapper(t *testing.T, dir string) *ChunkDiskMapper {
func randomChunk(t *testing.T) chunkenc.Chunk {
chunk := chunkenc.NewXORChunk()
len := rand.Int() % 120
length := rand.Int() % 120
app, err := chunk.Appender()
require.NoError(t, err)
for i := 0; i < len; i++ {
for i := 0; i < length; i++ {
app.Append(rand.Int63(), rand.Float64())
}
return chunk

2
tsdb/compact.go

@ -44,7 +44,7 @@ func ExponentialBlockRanges(minSize int64, steps, stepSize int) []int64 {
curRange := minSize
for i := 0; i < steps; i++ {
ranges = append(ranges, curRange)
curRange = curRange * int64(stepSize)
curRange *= int64(stepSize)
}
return ranges

6
tsdb/compact_test.go

@ -1452,12 +1452,6 @@ func TestSparseHistogramSpaceSavings(t *testing.T) {
{100, 15, 3, 5},
{100, 50, 3, 3},
{100, 100, 3, 2},
//{1000, 15, 1, 0},
//{1000, 50, 1, 0},
//{1000, 100, 1, 0},
//{1000, 15, 3, 5},
//{1000, 50, 3, 3},
//{1000, 100, 3, 2},
}
type testSummary struct {

6
tsdb/db.go

@ -260,7 +260,7 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics {
Help: "Size of symbol table in memory for loaded blocks",
}, func() float64 {
db.mtx.RLock()
blocks := db.blocks[:]
blocks := db.blocks
db.mtx.RUnlock()
symTblSize := uint64(0)
for _, b := range blocks {
@ -1186,7 +1186,7 @@ func (db *DB) compactOOO(dest string, oooHead *OOOCompactionHead) (_ []ulid.ULID
}
}()
for t := blockSize * (oooHeadMint / blockSize); t <= oooHeadMaxt; t = t + blockSize {
for t := blockSize * (oooHeadMint / blockSize); t <= oooHeadMaxt; t += blockSize {
mint, maxt := t, t+blockSize
// Block intervals are half-open: [b.MinTime, b.MaxTime). Block intervals are always +1 than the total samples it includes.
uid, err := db.compactor.Write(dest, oooHead.CloneForTimeRange(mint, maxt-1), mint, maxt, nil)
@ -1508,7 +1508,7 @@ func BeyondSizeRetention(db *DB, blocks []*Block) (deletable map[ulid.ULID]struc
blocksSize := db.Head().Size()
for i, block := range blocks {
blocksSize += block.Size()
if blocksSize > int64(db.opts.MaxBytes) {
if blocksSize > db.opts.MaxBytes {
// Add this and all following blocks for deletion.
for _, b := range blocks[i:] {
deletable[b.meta.ULID] = struct{}{}

4
tsdb/db_test.go

@ -1076,7 +1076,7 @@ func TestWALSegmentSizeOptions(t *testing.T) {
dbDir := db.Dir()
require.NoError(t, db.Close())
testFunc(dbDir, int(opts.WALSegmentSize))
testFunc(dbDir, opts.WALSegmentSize)
})
}
}
@ -2996,7 +2996,7 @@ func TestCompactHead(t *testing.T) {
series = seriesSet.At().Iterator(series)
for series.Next() == chunkenc.ValFloat {
time, val := series.At()
actSamples = append(actSamples, sample{int64(time), val, nil, nil})
actSamples = append(actSamples, sample{time, val, nil, nil})
}
require.NoError(t, series.Err())
}

18
tsdb/exemplar.go

@ -115,17 +115,17 @@ func NewExemplarMetrics(reg prometheus.Registerer) *ExemplarMetrics {
// 1GB of extra memory, accounting for the fact that this is heap allocated space.
// If len <= 0, then the exemplar storage is essentially a noop storage but can later be
// resized to store exemplars.
func NewCircularExemplarStorage(len int64, m *ExemplarMetrics) (ExemplarStorage, error) {
if len < 0 {
len = 0
func NewCircularExemplarStorage(length int64, m *ExemplarMetrics) (ExemplarStorage, error) {
if length < 0 {
length = 0
}
c := &CircularExemplarStorage{
exemplars: make([]*circularBufferEntry, len),
index: make(map[string]*indexEntry, len/estimatedExemplarsPerSeries),
exemplars: make([]*circularBufferEntry, length),
index: make(map[string]*indexEntry, length/estimatedExemplarsPerSeries),
metrics: m,
}
c.metrics.maxExemplars.Set(float64(len))
c.metrics.maxExemplars.Set(float64(length))
return c, nil
}
@ -151,7 +151,7 @@ func (ce *CircularExemplarStorage) Querier(_ context.Context) (storage.ExemplarQ
func (ce *CircularExemplarStorage) Select(start, end int64, matchers ...[]*labels.Matcher) ([]exemplar.QueryResult, error) {
ret := make([]exemplar.QueryResult, 0)
if len(ce.exemplars) <= 0 {
if len(ce.exemplars) == 0 {
return ret, nil
}
@ -219,7 +219,7 @@ func (ce *CircularExemplarStorage) ValidateExemplar(l labels.Labels, e exemplar.
// Not thread safe. The append parameters tells us whether this is an external validation, or internal
// as a result of an AddExemplar call, in which case we should update any relevant metrics.
func (ce *CircularExemplarStorage) validateExemplar(key []byte, e exemplar.Exemplar, append bool) error {
if len(ce.exemplars) <= 0 {
if len(ce.exemplars) == 0 {
return storage.ErrExemplarsDisabled
}
@ -334,7 +334,7 @@ func (ce *CircularExemplarStorage) migrate(entry *circularBufferEntry) {
}
func (ce *CircularExemplarStorage) AddExemplar(l labels.Labels, e exemplar.Exemplar) error {
if len(ce.exemplars) <= 0 {
if len(ce.exemplars) == 0 {
return storage.ErrExemplarsDisabled
}

2
tsdb/head.go

@ -1453,7 +1453,7 @@ func (h *Head) Delete(mint, maxt int64, ms ...*labels.Matcher) error {
}
}
for _, s := range stones {
h.tombstones.AddInterval(storage.SeriesRef(s.Ref), s.Intervals[0])
h.tombstones.AddInterval(s.Ref, s.Intervals[0])
}
return nil

31
tsdb/head_test.go

@ -3005,7 +3005,7 @@ func TestHistogramInWALAndMmapChunk(t *testing.T) {
hists = tsdbutil.GenerateTestHistograms(numHistograms)
}
for _, h := range hists {
h.Count = h.Count * 2
h.Count *= 2
h.NegativeSpans = h.PositiveSpans
h.NegativeBuckets = h.PositiveBuckets
_, err := app.AppendHistogram(0, s1, ts, h, nil)
@ -3028,7 +3028,7 @@ func TestHistogramInWALAndMmapChunk(t *testing.T) {
hists = tsdbutil.GenerateTestFloatHistograms(numHistograms)
}
for _, h := range hists {
h.Count = h.Count * 2
h.Count *= 2
h.NegativeSpans = h.PositiveSpans
h.NegativeBuckets = h.PositiveBuckets
_, err := app.AppendHistogram(0, s1, ts, nil, h)
@ -3069,26 +3069,26 @@ func TestHistogramInWALAndMmapChunk(t *testing.T) {
}
for _, h := range hists {
ts++
h.Count = h.Count * 2
h.Count *= 2
h.NegativeSpans = h.PositiveSpans
h.NegativeBuckets = h.PositiveBuckets
_, err := app.AppendHistogram(0, s2, int64(ts), h, nil)
_, err := app.AppendHistogram(0, s2, ts, h, nil)
require.NoError(t, err)
eh := h.Copy()
if !gauge && ts > 30 && (ts-10)%20 == 1 {
// Need "unknown" hint after float sample.
eh.CounterResetHint = histogram.UnknownCounterReset
}
exp[k2] = append(exp[k2], sample{t: int64(ts), h: eh})
exp[k2] = append(exp[k2], sample{t: ts, h: eh})
if ts%20 == 0 {
require.NoError(t, app.Commit())
app = head.Appender(context.Background())
// Add some float.
for i := 0; i < 10; i++ {
ts++
_, err := app.Append(0, s2, int64(ts), float64(ts))
_, err := app.Append(0, s2, ts, float64(ts))
require.NoError(t, err)
exp[k2] = append(exp[k2], sample{t: int64(ts), f: float64(ts)})
exp[k2] = append(exp[k2], sample{t: ts, f: float64(ts)})
}
require.NoError(t, app.Commit())
app = head.Appender(context.Background())
@ -3106,26 +3106,26 @@ func TestHistogramInWALAndMmapChunk(t *testing.T) {
}
for _, h := range hists {
ts++
h.Count = h.Count * 2
h.Count *= 2
h.NegativeSpans = h.PositiveSpans
h.NegativeBuckets = h.PositiveBuckets
_, err := app.AppendHistogram(0, s2, int64(ts), nil, h)
_, err := app.AppendHistogram(0, s2, ts, nil, h)
require.NoError(t, err)
eh := h.Copy()
if !gauge && ts > 30 && (ts-10)%20 == 1 {
// Need "unknown" hint after float sample.
eh.CounterResetHint = histogram.UnknownCounterReset
}
exp[k2] = append(exp[k2], sample{t: int64(ts), fh: eh})
exp[k2] = append(exp[k2], sample{t: ts, fh: eh})
if ts%20 == 0 {
require.NoError(t, app.Commit())
app = head.Appender(context.Background())
// Add some float.
for i := 0; i < 10; i++ {
ts++
_, err := app.Append(0, s2, int64(ts), float64(ts))
_, err := app.Append(0, s2, ts, float64(ts))
require.NoError(t, err)
exp[k2] = append(exp[k2], sample{t: int64(ts), f: float64(ts)})
exp[k2] = append(exp[k2], sample{t: ts, f: float64(ts)})
}
require.NoError(t, app.Commit())
app = head.Appender(context.Background())
@ -4495,11 +4495,12 @@ func TestHistogramValidation(t *testing.T) {
}
err = ValidateFloatHistogram(tc.h.ToFloat())
if tc.errMsgFloat != "" {
switch {
case tc.errMsgFloat != "":
require.ErrorContains(t, err, tc.errMsgFloat)
} else if tc.errMsg != "" {
case tc.errMsg != "":
require.ErrorContains(t, err, tc.errMsg)
} else {
default:
require.NoError(t, err)
}
})

4
tsdb/head_wal.go

@ -299,7 +299,7 @@ Outer:
unknownRefs.Inc()
continue
}
h.tombstones.AddInterval(storage.SeriesRef(s.Ref), itv)
h.tombstones.AddInterval(s.Ref, itv)
}
}
tstonesPool.Put(v)
@ -382,7 +382,7 @@ Outer:
floatHistogramsPool.Put(v)
case []record.RefMetadata:
for _, m := range v {
s := h.series.getByID(chunks.HeadSeriesRef(m.Ref))
s := h.series.getByID(m.Ref)
if s == nil {
unknownMetadataRefs.Inc()
continue

2
tsdb/index/index.go

@ -536,7 +536,7 @@ func (w *Writer) finishSymbols() error {
// Write out the length and symbol count.
w.buf1.Reset()
w.buf1.PutBE32int(int(symbolTableSize))
w.buf1.PutBE32int(int(w.numSymbols))
w.buf1.PutBE32int(w.numSymbols)
if err := w.writeAt(w.buf1.Get(), w.toc.Symbols); err != nil {
return err
}

13
tsdb/index/postings.go

@ -561,10 +561,8 @@ func newMergedPostings(p []Postings) (m *mergedPostings, nonEmpty bool) {
// NOTE: mergedPostings struct requires the user to issue an initial Next.
if it.Next() {
ph = append(ph, it)
} else {
if it.Err() != nil {
return &mergedPostings{err: it.Err()}, true
}
} else if it.Err() != nil {
return &mergedPostings{err: it.Err()}, true
}
}
@ -699,15 +697,16 @@ func (rp *removedPostings) Next() bool {
}
fcur, rcur := rp.full.At(), rp.remove.At()
if fcur < rcur {
switch {
case fcur < rcur:
rp.cur = fcur
rp.fok = rp.full.Next()
return true
} else if rcur < fcur {
case rcur < fcur:
// Forward the remove postings to the right position.
rp.rok = rp.remove.Seek(fcur)
} else {
default:
// Skip the current posting.
rp.fok = rp.full.Next()
}

6
tsdb/index/postingsstats.go

@ -31,10 +31,10 @@ type maxHeap struct {
Items []Stat
}
func (m *maxHeap) init(len int) {
m.maxLength = len
func (m *maxHeap) init(length int) {
m.maxLength = length
m.minValue = math.MaxUint64
m.Items = make([]Stat, 0, len)
m.Items = make([]Stat, 0, length)
}
func (m *maxHeap) push(item Stat) {

2
tsdb/isolation.go

@ -254,7 +254,7 @@ func (txr *txRing) add(appendID uint64) {
if txr.txIDCount == len(txr.txIDs) {
// Ring buffer is full, expand by doubling.
newRing := make([]uint64, txr.txIDCount*2)
idx := copy(newRing[:], txr.txIDs[txr.txIDFirst:])
idx := copy(newRing, txr.txIDs[txr.txIDFirst:])
copy(newRing[idx:], txr.txIDs[:txr.txIDFirst])
txr.txIDs = newRing
txr.txIDFirst = 0

26
tsdb/querier.go

@ -239,18 +239,20 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings,
}
for _, m := range ms {
if m.Name == "" && m.Value == "" { // Special-case for AllPostings, used in tests at least.
switch {
case m.Name == "" && m.Value == "": // Special-case for AllPostings, used in tests at least.
k, v := index.AllPostingsKey()
allPostings, err := ix.Postings(k, v)
if err != nil {
return nil, err
}
its = append(its, allPostings)
} else if labelMustBeSet[m.Name] {
case labelMustBeSet[m.Name]:
// If this matcher must be non-empty, we can be smarter.
matchesEmpty := m.Matches("")
isNot := m.Type == labels.MatchNotEqual || m.Type == labels.MatchNotRegexp
if isNot && matchesEmpty { // l!="foo"
switch {
case isNot && matchesEmpty: // l!="foo"
// If the label can't be empty and is a Not and the inner matcher
// doesn't match empty, then subtract it out at the end.
inverse, err := m.Inverse()
@ -263,7 +265,7 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings,
return nil, err
}
notIts = append(notIts, it)
} else if isNot && !matchesEmpty { // l!=""
case isNot && !matchesEmpty: // l!=""
// If the label can't be empty and is a Not, but the inner matcher can
// be empty we need to use inversePostingsForMatcher.
inverse, err := m.Inverse()
@ -279,7 +281,7 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings,
return index.EmptyPostings(), nil
}
its = append(its, it)
} else { // l="a"
default: // l="a"
// Non-Not matcher, use normal postingsForMatcher.
it, err := postingsForMatcher(ix, m)
if err != nil {
@ -290,7 +292,7 @@ func PostingsForMatchers(ix IndexReader, ms ...*labels.Matcher) (index.Postings,
}
its = append(its, it)
}
} else { // l=""
default: // l=""
// If the matchers for a labelname selects an empty value, it selects all
// the series which don't have the label name set too. See:
// https://github.com/prometheus/prometheus/issues/3575 and
@ -965,24 +967,24 @@ func (m *mergedStringIter) Next() bool {
if (!m.aok && !m.bok) || (m.Err() != nil) {
return false
}
if !m.aok {
switch {
case !m.aok:
m.cur = m.b.At()
m.bok = m.b.Next()
m.err = m.b.Err()
} else if !m.bok {
case !m.bok:
m.cur = m.a.At()
m.aok = m.a.Next()
m.err = m.a.Err()
} else if m.b.At() > m.a.At() {
case m.b.At() > m.a.At():
m.cur = m.a.At()
m.aok = m.a.Next()
m.err = m.a.Err()
} else if m.a.At() > m.b.At() {
case m.a.At() > m.b.At():
m.cur = m.b.At()
m.bok = m.b.Next()
m.err = m.b.Err()
} else { // Equal.
default: // Equal.
m.cur = m.b.At()
m.aok = m.a.Next()
m.err = m.a.Err()

4
tsdb/querier_test.go

@ -113,7 +113,7 @@ func createIdxChkReaders(t *testing.T, tc []seriesSamples) (IndexReader, ChunkRe
var chunkRef chunks.ChunkRef
for i, s := range tc {
i = i + 1 // 0 is not a valid posting.
i++ // 0 is not a valid posting.
metas := make([]chunks.Meta, 0, len(s.chunks))
for _, chk := range s.chunks {
if chk[0].t < blockMint {
@ -2012,7 +2012,7 @@ func BenchmarkQueries(b *testing.B) {
for x := 0; x <= 10; x++ {
block, err := OpenBlock(nil, createBlock(b, dir, series), nil)
require.NoError(b, err)
q, err := NewBlockQuerier(block, 1, int64(nSamples))
q, err := NewBlockQuerier(block, 1, nSamples)
require.NoError(b, err)
qs = append(qs, q)
}

4
tsdb/wal.go

@ -90,7 +90,7 @@ func newWalMetrics(r prometheus.Registerer) *walMetrics {
// WAL is a write ahead log that can log new series labels and samples.
// It must be completely read before new entries are logged.
//
// DEPRECATED: use wlog pkg combined with the record codex instead.
// Deprecated: use wlog pkg combined with the record codex instead.
type WAL interface {
Reader() WALReader
LogSeries([]record.RefSeries) error
@ -147,7 +147,7 @@ func newCRC32() hash.Hash32 {
// SegmentWAL is a write ahead log for series data.
//
// DEPRECATED: use wlog pkg combined with the record coders instead.
// Deprecated: use wlog pkg combined with the record coders instead.
type SegmentWAL struct {
mtx sync.Mutex
metrics *walMetrics

4
tsdb/wlog/wlog_test.go

@ -428,10 +428,10 @@ func TestLogPartialWrite(t *testing.T) {
faultyRecord: pageSize / (recordHeaderSize + len(record)),
},
// TODO the current implementation suffers this:
//"partial write when logging a record overlapping two pages": {
// "partial write when logging a record overlapping two pages": {
// numRecords: (pageSize / (recordHeaderSize + len(record))) + 10,
// faultyRecord: pageSize/(recordHeaderSize+len(record)) + 1,
//},
// },
}
for testName, testData := range tests {

2
util/runtime/limits_default.go

@ -39,7 +39,7 @@ func getLimits(resource int, unit string) string {
if err != nil {
panic("syscall.Getrlimit failed: " + err.Error())
}
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(uint64(rlimit.Cur), unit), limitToString(uint64(rlimit.Max), unit))
return fmt.Sprintf("(soft=%s, hard=%s)", limitToString(rlimit.Cur, unit), limitToString(rlimit.Max, unit))
}
// FdLimits returns the soft and hard limits for file descriptors.

8
util/runtime/statfs_default.go

@ -72,11 +72,13 @@ func Statfs(path string) string {
var fs syscall.Statfs_t
err := syscall.Statfs(path, &fs)
//nolint:unconvert // This ensure Type format on all Platforms
localType := int64(fs.Type)
if err != nil {
return strconv.FormatInt(int64(fs.Type), 16)
return strconv.FormatInt(localType, 16)
}
if fsType, ok := fsTypes[int64(fs.Type)]; ok {
if fsType, ok := fsTypes[localType]; ok {
return fsType
}
return strconv.FormatInt(int64(fs.Type), 16)
return strconv.FormatInt(localType, 16)
}

4
web/api/v1/api.go

@ -243,7 +243,7 @@ func NewAPI(
remoteReadConcurrencyLimit int,
remoteReadMaxBytesInFrame int,
isAgent bool,
CORSOrigin *regexp.Regexp,
corsOrigin *regexp.Regexp,
runtimeInfo func() (RuntimeInfo, error),
buildInfo *PrometheusVersion,
gatherer prometheus.Gatherer,
@ -269,7 +269,7 @@ func NewAPI(
enableAdmin: enableAdmin,
rulesRetriever: rr,
logger: logger,
CORSOrigin: CORSOrigin,
CORSOrigin: corsOrigin,
runtimeInfo: runtimeInfo,
buildInfo: buildInfo,
gatherer: gatherer,

4
web/api/v1/api_test.go

@ -2791,7 +2791,7 @@ func TestRespondSuccess(t *testing.T) {
}
var res response
if err = json.Unmarshal([]byte(body), &res); err != nil {
if err = json.Unmarshal(body, &res); err != nil {
t.Fatalf("Error unmarshaling JSON body: %s", err)
}
@ -2827,7 +2827,7 @@ func TestRespondError(t *testing.T) {
}
var res response
if err = json.Unmarshal([]byte(body), &res); err != nil {
if err = json.Unmarshal(body, &res); err != nil {
t.Fatalf("Error unmarshaling JSON body: %s", err)
}

4
web/web.go

@ -719,9 +719,9 @@ func (h *Handler) runtimeInfo() (api_v1.RuntimeInfo, error) {
}
if h.options.TSDBMaxBytes != 0 {
if status.StorageRetention != "" {
status.StorageRetention = status.StorageRetention + " or "
status.StorageRetention += " or "
}
status.StorageRetention = status.StorageRetention + h.options.TSDBMaxBytes.String()
status.StorageRetention += h.options.TSDBMaxBytes.String()
}
metrics, err := h.gatherer.Gather()

Loading…
Cancel
Save