diff --git a/config/config.go b/config/config.go index e282ee1d35..c1ed2d0658 100644 --- a/config/config.go +++ b/config/config.go @@ -16,7 +16,6 @@ package config import ( "errors" "fmt" - "github.com/prometheus/prometheus/promql/parser" "log/slog" "mime" "net/url" @@ -37,6 +36,7 @@ import ( "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" + "github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/storage/remote/azuread" "github.com/prometheus/prometheus/storage/remote/googleiam" ) @@ -882,7 +882,7 @@ func (a *ScrapeRuleConfig) Validate() error { return fmt.Errorf("invalid scrape rule expression: %w", err) } - parser.Inspect(expr, func(node parser.Node, nodes []parser.Node) error { + parser.Inspect(expr, func(node parser.Node, _ []parser.Node) error { if _, ok := node.(*parser.MatrixSelector); ok { err = errors.New("matrix selectors are not allowed in scrape rule expressions") return err diff --git a/config/config_test.go b/config/config_test.go index f5b9a323c5..b79c91c8a5 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2603,4 +2603,4 @@ func TestScrapeRuleConfigs(t *testing.T) { } }) } -} \ No newline at end of file +} diff --git a/scrape/rules.go b/scrape/rules.go index 5e288c6126..f5b51ee77d 100644 --- a/scrape/rules.go +++ b/scrape/rules.go @@ -189,12 +189,12 @@ func (s *seriesSet) At() storage.Series { Metric: sample.metric, Histograms: []promql.HPoint{{T: sample.t, H: sample.fh}}, }) - } else { - return promql.NewStorageSeries(promql.Series{ - Metric: sample.metric, - Floats: []promql.FPoint{{T: sample.t, F: sample.f}}, - }) } + + return promql.NewStorageSeries(promql.Series{ + Metric: sample.metric, + Floats: []promql.FPoint{{T: sample.t, F: sample.f}}, + }) } func (s *seriesSet) Err() error { return nil }