Skip to content

Commit 2330420

Browse files
therealpandeytherealpandey
authored
fix(querier): remove ff (#7531)
1 parent 65ac277 commit 2330420

File tree

11 files changed

+34
-59
lines changed

11 files changed

+34
-59
lines changed

‎ee/query-service/anomaly/daily.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ func NewDailyProvider(opts ...GenericProviderOption[*DailyProvider]) *DailyProvi
2828
}
2929

3030
dp.querierV2 = querierV2.NewQuerier(querierV2.QuerierOptions{
31-
Reader: dp.reader,
32-
Cache: dp.cache,
33-
KeyGenerator: queryBuilder.NewKeyGenerator(),
34-
FluxInterval: dp.fluxInterval,
35-
FeatureLookup: dp.ff,
31+
Reader: dp.reader,
32+
Cache: dp.cache,
33+
KeyGenerator: queryBuilder.NewKeyGenerator(),
34+
FluxInterval: dp.fluxInterval,
3635
})
3736

3837
return dp

‎ee/query-service/anomaly/hourly.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ func NewHourlyProvider(opts ...GenericProviderOption[*HourlyProvider]) *HourlyPr
2828
}
2929

3030
hp.querierV2 = querierV2.NewQuerier(querierV2.QuerierOptions{
31-
Reader: hp.reader,
32-
Cache: hp.cache,
33-
KeyGenerator: queryBuilder.NewKeyGenerator(),
34-
FluxInterval: hp.fluxInterval,
35-
FeatureLookup: hp.ff,
31+
Reader: hp.reader,
32+
Cache: hp.cache,
33+
KeyGenerator: queryBuilder.NewKeyGenerator(),
34+
FluxInterval: hp.fluxInterval,
3635
})
3736

3837
return hp

‎ee/query-service/anomaly/seasonal.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ type BaseSeasonalProvider struct {
5050
fluxInterval time.Duration
5151
cache cache.Cache
5252
keyGenerator cache.KeyGenerator
53-
ff interfaces.FeatureLookup
5453
}
5554

5655
func (p *BaseSeasonalProvider) getQueryParams(req *GetAnomaliesRequest) *anomalyQueryParams {

‎ee/query-service/anomaly/weekly.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ func NewWeeklyProvider(opts ...GenericProviderOption[*WeeklyProvider]) *WeeklyPr
2727
}
2828

2929
wp.querierV2 = querierV2.NewQuerier(querierV2.QuerierOptions{
30-
Reader: wp.reader,
31-
Cache: wp.cache,
32-
KeyGenerator: queryBuilder.NewKeyGenerator(),
33-
FluxInterval: wp.fluxInterval,
34-
FeatureLookup: wp.ff,
30+
Reader: wp.reader,
31+
Cache: wp.cache,
32+
KeyGenerator: queryBuilder.NewKeyGenerator(),
33+
FluxInterval: wp.fluxInterval,
3534
})
3635

3736
return wp

‎pkg/query-service/app/http_handler.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) {
200200
Cache: opts.Cache,
201201
KeyGenerator: queryBuilder.NewKeyGenerator(),
202202
FluxInterval: opts.FluxInterval,
203-
FeatureLookup: opts.FeatureFlags,
204203
UseLogsNewSchema: opts.UseLogsNewSchema,
205204
UseTraceNewSchema: opts.UseTraceNewSchema,
206205
}
@@ -210,7 +209,6 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) {
210209
Cache: opts.Cache,
211210
KeyGenerator: queryBuilder.NewKeyGenerator(),
212211
FluxInterval: opts.FluxInterval,
213-
FeatureLookup: opts.FeatureFlags,
214212
UseLogsNewSchema: opts.UseLogsNewSchema,
215213
UseTraceNewSchema: opts.UseTraceNewSchema,
216214
}
@@ -279,7 +277,7 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) {
279277
BuildTraceQuery: tracesQueryBuilder,
280278
BuildLogQuery: logsQueryBuilder,
281279
}
282-
aH.queryBuilder = queryBuilder.NewQueryBuilder(builderOpts, aH.featureFlags)
280+
aH.queryBuilder = queryBuilder.NewQueryBuilder(builderOpts)
283281

284282
// check if at least one user is created
285283
hasUsers, err := aH.appDao.GetUsersWithOpts(context.Background(), 1)

‎pkg/query-service/app/querier/querier.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ type querier struct {
4242

4343
fluxInterval time.Duration
4444

45-
builder *queryBuilder.QueryBuilder
46-
featureLookUp interfaces.FeatureLookup
45+
builder *queryBuilder.QueryBuilder
4746

4847
// used for testing
4948
// TODO(srikanthccv): remove this once we have a proper mock
@@ -59,11 +58,10 @@ type querier struct {
5958
}
6059

6160
type QuerierOptions struct {
62-
Reader interfaces.Reader
63-
Cache cache.Cache
64-
KeyGenerator cache.KeyGenerator
65-
FluxInterval time.Duration
66-
FeatureLookup interfaces.FeatureLookup
61+
Reader interfaces.Reader
62+
Cache cache.Cache
63+
KeyGenerator cache.KeyGenerator
64+
FluxInterval time.Duration
6765

6866
// used for testing
6967
TestingMode bool
@@ -96,8 +94,7 @@ func NewQuerier(opts QuerierOptions) interfaces.Querier {
9694
BuildTraceQuery: tracesQueryBuilder,
9795
BuildLogQuery: logsQueryBuilder,
9896
BuildMetricQuery: metricsV3.PrepareMetricQuery,
99-
}, opts.FeatureLookup),
100-
featureLookUp: opts.FeatureLookup,
97+
}),
10198

10299
testingMode: opts.TestingMode,
103100
returnedSeries: opts.ReturnedSeries,

‎pkg/query-service/app/querier/querier_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder"
1818
tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3"
1919
"github.com/SigNoz/signoz/pkg/query-service/cache/inmemory"
20-
"github.com/SigNoz/signoz/pkg/query-service/featureManager"
2120
v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
2221
"github.com/SigNoz/signoz/pkg/query-service/querycache"
2322
"github.com/SigNoz/signoz/pkg/query-service/utils"
@@ -1383,7 +1382,6 @@ func Test_querier_runWindowBasedListQuery(t *testing.T) {
13831382
queryBuilder.QueryBuilderOptions{
13841383
BuildTraceQuery: tracesV3.PrepareTracesQuery,
13851384
},
1386-
featureManager.StartManager(),
13871385
),
13881386
}
13891387
// Update query parameters

‎pkg/query-service/app/querier/v2/querier.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ type querier struct {
4242

4343
fluxInterval time.Duration
4444

45-
builder *queryBuilder.QueryBuilder
46-
featureLookUp interfaces.FeatureLookup
45+
builder *queryBuilder.QueryBuilder
4746

4847
// used for testing
4948
// TODO(srikanthccv): remove this once we have a proper mock
@@ -58,11 +57,10 @@ type querier struct {
5857
}
5958

6059
type QuerierOptions struct {
61-
Reader interfaces.Reader
62-
Cache cache.Cache
63-
KeyGenerator cache.KeyGenerator
64-
FluxInterval time.Duration
65-
FeatureLookup interfaces.FeatureLookup
60+
Reader interfaces.Reader
61+
Cache cache.Cache
62+
KeyGenerator cache.KeyGenerator
63+
FluxInterval time.Duration
6664

6765
// used for testing
6866
TestingMode bool
@@ -96,8 +94,7 @@ func NewQuerier(opts QuerierOptions) interfaces.Querier {
9694
BuildTraceQuery: tracesQueryBuilder,
9795
BuildLogQuery: logsQueryBuilder,
9896
BuildMetricQuery: metricsV4.PrepareMetricQuery,
99-
}, opts.FeatureLookup),
100-
featureLookUp: opts.FeatureLookup,
97+
}),
10198

10299
testingMode: opts.TestingMode,
103100
returnedSeries: opts.ReturnedSeries,

‎pkg/query-service/app/querier/v2/querier_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/SigNoz/signoz/pkg/query-service/app/queryBuilder"
1818
tracesV3 "github.com/SigNoz/signoz/pkg/query-service/app/traces/v3"
1919
"github.com/SigNoz/signoz/pkg/query-service/cache/inmemory"
20-
"github.com/SigNoz/signoz/pkg/query-service/featureManager"
2120
v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
2221
"github.com/SigNoz/signoz/pkg/query-service/querycache"
2322
"github.com/SigNoz/signoz/pkg/query-service/utils"
@@ -1437,7 +1436,6 @@ func Test_querier_runWindowBasedListQuery(t *testing.T) {
14371436
queryBuilder.QueryBuilderOptions{
14381437
BuildTraceQuery: tracesV3.PrepareTracesQuery,
14391438
},
1440-
featureManager.StartManager(),
14411439
),
14421440
}
14431441
// Update query parameters

‎pkg/query-service/app/queryBuilder/query_builder.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ type QueryBuilderOptions struct {
5656
BuildMetricQuery prepareMetricQueryFunc
5757
}
5858

59-
func NewQueryBuilder(options QueryBuilderOptions, featureFlags interfaces.FeatureLookup) *QueryBuilder {
59+
func NewQueryBuilder(options QueryBuilderOptions) *QueryBuilder {
6060
return &QueryBuilder{
61-
options: options,
62-
featureFlags: featureFlags,
61+
options: options,
6362
}
6463
}
6564

0 commit comments

Comments
 (0)