@@ -580,7 +580,7 @@ func TestQuerier(t *testing.T) {
580
580
require .NoError (t , err )
581
581
582
582
queryables := []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}
583
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
583
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
584
584
testRangeQuery (t , queryable , queryEngine , through , query , enc )
585
585
})
586
586
}
@@ -602,7 +602,7 @@ func TestQuerierMetric(t *testing.T) {
602
602
queryables := []QueryableWithFilter {}
603
603
r := prometheus .NewRegistry ()
604
604
reg := prometheus .WrapRegistererWith (prometheus.Labels {"engine" : "querier" }, r )
605
- New (cfg , overrides , distributor , queryables , reg , log .NewNopLogger ())
605
+ New (cfg , overrides , distributor , queryables , reg , log .NewNopLogger (), nil )
606
606
assert .NoError (t , promutil .GatherAndCompare (r , strings .NewReader (`
607
607
# HELP cortex_max_concurrent_queries The maximum number of concurrent queries.
608
608
# TYPE cortex_max_concurrent_queries gauge
@@ -684,7 +684,7 @@ func TestNoHistoricalQueryToIngester(t *testing.T) {
684
684
require .NoError (t , err )
685
685
686
686
ctx := user .InjectOrgID (context .Background (), "0" )
687
- queryable , _ , _ := New (cfg , overrides , distributor , []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}, nil , log .NewNopLogger ())
687
+ queryable , _ , _ := New (cfg , overrides , distributor , []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}, nil , log .NewNopLogger (), nil )
688
688
query , err := queryEngine .NewRangeQuery (ctx , queryable , nil , "dummy" , c .mint , c .maxt , 1 * time .Minute )
689
689
require .NoError (t , err )
690
690
@@ -778,7 +778,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryIntoFuture(t *testing.T) {
778
778
779
779
ctx := user .InjectOrgID (context .Background (), "0" )
780
780
queryables := []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}
781
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
781
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
782
782
query , err := queryEngine .NewRangeQuery (ctx , queryable , nil , "dummy" , c .queryStartTime , c .queryEndTime , time .Minute )
783
783
require .NoError (t , err )
784
784
@@ -871,7 +871,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLength(t *testing.T) {
871
871
distributor := & emptyDistributor {}
872
872
873
873
queryables := []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}
874
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
874
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
875
875
876
876
queryEngine := promql .NewEngine (opts )
877
877
ctx := user .InjectOrgID (context .Background (), "test" )
@@ -910,7 +910,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLength_Series(t *testing.T) {
910
910
distributor := & emptyDistributor {}
911
911
912
912
queryables := []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}
913
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
913
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
914
914
915
915
ctx := user .InjectOrgID (context .Background (), "test" )
916
916
now := time .Now ()
@@ -969,7 +969,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLength_Labels(t *testing.T) {
969
969
distributor := & emptyDistributor {}
970
970
971
971
queryables := []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}
972
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
972
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
973
973
974
974
ctx := user .InjectOrgID (context .Background (), "test" )
975
975
@@ -1120,7 +1120,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLookback(t *testing.T) {
1120
1120
distributor := & MockDistributor {}
1121
1121
distributor .On ("QueryStream" , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return (& client.QueryStreamResponse {}, nil )
1122
1122
1123
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
1123
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
1124
1124
require .NoError (t , err )
1125
1125
1126
1126
query , err := queryEngine .NewRangeQuery (ctx , queryable , nil , testData .query , testData .queryStartTime , testData .queryEndTime , time .Minute )
@@ -1149,7 +1149,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLookback(t *testing.T) {
1149
1149
distributor .On ("MetricsForLabelMatchers" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]model.Metric {}, nil )
1150
1150
distributor .On ("MetricsForLabelMatchersStream" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]model.Metric {}, nil )
1151
1151
1152
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
1152
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
1153
1153
q , err := queryable .Querier (util .TimeToMillis (testData .queryStartTime ), util .TimeToMillis (testData .queryEndTime ))
1154
1154
require .NoError (t , err )
1155
1155
@@ -1190,7 +1190,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLookback(t *testing.T) {
1190
1190
distributor .On ("LabelNames" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]string {}, nil )
1191
1191
distributor .On ("LabelNamesStream" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]string {}, nil )
1192
1192
1193
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
1193
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
1194
1194
q , err := queryable .Querier (util .TimeToMillis (testData .queryStartTime ), util .TimeToMillis (testData .queryEndTime ))
1195
1195
require .NoError (t , err )
1196
1196
@@ -1218,7 +1218,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLookback(t *testing.T) {
1218
1218
distributor .On ("MetricsForLabelMatchers" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , matchers ).Return ([]model.Metric {}, nil )
1219
1219
distributor .On ("MetricsForLabelMatchersStream" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , matchers ).Return ([]model.Metric {}, nil )
1220
1220
1221
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
1221
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
1222
1222
q , err := queryable .Querier (util .TimeToMillis (testData .queryStartTime ), util .TimeToMillis (testData .queryEndTime ))
1223
1223
require .NoError (t , err )
1224
1224
@@ -1245,7 +1245,7 @@ func TestQuerier_ValidateQueryTimeRange_MaxQueryLookback(t *testing.T) {
1245
1245
distributor .On ("LabelValuesForLabelName" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]string {}, nil )
1246
1246
distributor .On ("LabelValuesForLabelNameStream" , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything , mock .Anything ).Return ([]string {}, nil )
1247
1247
1248
- queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger ())
1248
+ queryable , _ , _ := New (cfg , overrides , distributor , queryables , nil , log .NewNopLogger (), nil )
1249
1249
q , err := queryable .Querier (util .TimeToMillis (testData .queryStartTime ), util .TimeToMillis (testData .queryEndTime ))
1250
1250
require .NoError (t , err )
1251
1251
@@ -1582,7 +1582,7 @@ func TestShortTermQueryToLTS(t *testing.T) {
1582
1582
overrides , err := validation .NewOverrides (DefaultLimitsConfig (), nil )
1583
1583
require .NoError (t , err )
1584
1584
1585
- queryable , _ , _ := New (cfg , overrides , distributor , []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}, nil , log .NewNopLogger ())
1585
+ queryable , _ , _ := New (cfg , overrides , distributor , []QueryableWithFilter {UseAlwaysQueryable (NewMockStoreQueryable (chunkStore ))}, nil , log .NewNopLogger (), nil )
1586
1586
ctx := user .InjectOrgID (context .Background (), "0" )
1587
1587
query , err := engine .NewRangeQuery (ctx , queryable , nil , "dummy" , c .mint , c .maxt , 1 * time .Minute )
1588
1588
require .NoError (t , err )
0 commit comments