Skip to content

Commit 06f1420

Browse files
committed
fix tests
1 parent 6e67e34 commit 06f1420

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

pkg/query/querier.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ func newQuerierWithOpts(
211211
if logger == nil {
212212
logger = log.NewNopLogger()
213213
}
214+
if reg == nil {
215+
reg = prometheus.NewRegistry()
216+
}
214217
rl := make(map[string]struct{})
215218
for _, replicaLabel := range replicaLabels {
216219
rl[replicaLabel] = struct{}{}

pkg/query/querier_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ func TestQuerier_Select_AfterPromQL(t *testing.T) {
399399
g := gate.New(2)
400400
mq := &mockedQueryable{
401401
Creator: func(mint, maxt int64) storage.Querier {
402-
return newQuerier(nil, mint, maxt, tcase.replicaLabels, nil, tcase.storeAPI, sc.dedup, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
402+
return newQuerier(nil, nil, mint, maxt, tcase.replicaLabels, nil, tcase.storeAPI, sc.dedup, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
403403
},
404404
}
405405
t.Cleanup(func() {
@@ -780,6 +780,7 @@ func TestQuerier_Select(t *testing.T) {
780780
} {
781781
g := gate.New(2)
782782
q := newQuerier(
783+
nil,
783784
nil,
784785
tcase.mint,
785786
tcase.maxt,
@@ -1085,7 +1086,7 @@ func TestQuerierWithDedupUnderstoodByPromQL_Rate(t *testing.T) {
10851086

10861087
timeout := 100 * time.Second
10871088
g := gate.New(2)
1088-
q := newQuerier(logger, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), false, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
1089+
q := newQuerier(logger, nil, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), false, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
10891090
t.Cleanup(func() {
10901091
testutil.Ok(t, q.Close())
10911092
})
@@ -1155,7 +1156,7 @@ func TestQuerierWithDedupUnderstoodByPromQL_Rate(t *testing.T) {
11551156

11561157
timeout := 5 * time.Second
11571158
g := gate.New(2)
1158-
q := newQuerier(logger, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), true, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
1159+
q := newQuerier(logger, nil, realSeriesWithStaleMarkerMint, realSeriesWithStaleMarkerMaxt, []string{"replica"}, nil, newProxyStore(s), true, 0, true, false, g, timeout, nil, NoopSeriesStatsReporter)
11591160
t.Cleanup(func() {
11601161
testutil.Ok(t, q.Close())
11611162
})

pkg/query/query_bench_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ func benchQuerySelect(t testutil.TB, totalSamples, totalSeries int, dedup bool)
8787
logger := log.NewNopLogger()
8888
q := newQuerier(
8989
logger,
90+
nil,
9091
math.MinInt64,
9192
math.MaxInt64,
9293
[]string{"a_replica"},

0 commit comments

Comments
 (0)