Skip to content

Commit b7982ca

Browse files
therealpandeytherealpandey
authored
fix(ff): remove feature interface from ruler (#7529)
### Summary remove feature interface from ruler
1 parent 2748b49 commit b7982ca

File tree

10 files changed

+15
-65
lines changed

10 files changed

+15
-65
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ func WithKeyGenerator[T BaseProvider](keyGenerator cache.KeyGenerator) GenericPr
3838
}
3939
}
4040

41-
func WithFeatureLookup[T BaseProvider](ff interfaces.FeatureLookup) GenericProviderOption[T] {
42-
return func(p T) {
43-
p.GetBaseSeasonalProvider().ff = ff
44-
}
45-
}
46-
4741
func WithReader[T BaseProvider](reader interfaces.Reader) GenericProviderOption[T] {
4842
return func(p T) {
4943
p.GetBaseSeasonalProvider().reader = reader

‎ee/query-service/app/api/queryrange.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,28 +88,24 @@ func (aH *APIHandler) queryRangeV4(w http.ResponseWriter, r *http.Request) {
8888
anomaly.WithCache[*anomaly.WeeklyProvider](aH.opts.Cache),
8989
anomaly.WithKeyGenerator[*anomaly.WeeklyProvider](queryBuilder.NewKeyGenerator()),
9090
anomaly.WithReader[*anomaly.WeeklyProvider](aH.opts.DataConnector),
91-
anomaly.WithFeatureLookup[*anomaly.WeeklyProvider](aH.opts.FeatureFlags),
9291
)
9392
case anomaly.SeasonalityDaily:
9493
provider = anomaly.NewDailyProvider(
9594
anomaly.WithCache[*anomaly.DailyProvider](aH.opts.Cache),
9695
anomaly.WithKeyGenerator[*anomaly.DailyProvider](queryBuilder.NewKeyGenerator()),
9796
anomaly.WithReader[*anomaly.DailyProvider](aH.opts.DataConnector),
98-
anomaly.WithFeatureLookup[*anomaly.DailyProvider](aH.opts.FeatureFlags),
9997
)
10098
case anomaly.SeasonalityHourly:
10199
provider = anomaly.NewHourlyProvider(
102100
anomaly.WithCache[*anomaly.HourlyProvider](aH.opts.Cache),
103101
anomaly.WithKeyGenerator[*anomaly.HourlyProvider](queryBuilder.NewKeyGenerator()),
104102
anomaly.WithReader[*anomaly.HourlyProvider](aH.opts.DataConnector),
105-
anomaly.WithFeatureLookup[*anomaly.HourlyProvider](aH.opts.FeatureFlags),
106103
)
107104
default:
108105
provider = anomaly.NewDailyProvider(
109106
anomaly.WithCache[*anomaly.DailyProvider](aH.opts.Cache),
110107
anomaly.WithKeyGenerator[*anomaly.DailyProvider](queryBuilder.NewKeyGenerator()),
111108
anomaly.WithReader[*anomaly.DailyProvider](aH.opts.DataConnector),
112-
anomaly.WithFeatureLookup[*anomaly.DailyProvider](aH.opts.FeatureFlags),
113109
)
114110
}
115111
anomalies, err := provider.GetAnomalies(r.Context(), &anomaly.GetAnomaliesRequest{Params: queryRangeParams})

‎ee/query-service/app/server.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
172172
reader,
173173
c,
174174
serverOptions.DisableRules,
175-
lm,
176175
serverOptions.UseLogsNewSchema,
177176
serverOptions.UseTraceNewSchema,
178177
serverOptions.SigNoz.Alertmanager,
@@ -532,7 +531,6 @@ func makeRulesManager(
532531
ch baseint.Reader,
533532
cache cache.Cache,
534533
disableRules bool,
535-
fm baseint.FeatureLookup,
536534
useLogsNewSchema bool,
537535
useTraceNewSchema bool,
538536
alertmanager alertmanager.Alertmanager,
@@ -549,7 +547,6 @@ func makeRulesManager(
549547
Context: context.Background(),
550548
Logger: zap.L(),
551549
DisableRules: disableRules,
552-
FeatureFlags: fm,
553550
Reader: ch,
554551
Cache: cache,
555552
EvalDelay: baseconst.GetEvalDelay(),

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ type AnomalyRule struct {
5353
func NewAnomalyRule(
5454
id string,
5555
p *baserules.PostableRule,
56-
featureFlags interfaces.FeatureLookup,
5756
reader interfaces.Reader,
5857
cache cache.Cache,
5958
opts ...baserules.RuleOption,
@@ -89,10 +88,9 @@ func NewAnomalyRule(
8988
zap.L().Info("using seasonality", zap.String("seasonality", t.seasonality.String()))
9089

9190
querierOptsV2 := querierV2.QuerierOptions{
92-
Reader: reader,
93-
Cache: cache,
94-
KeyGenerator: queryBuilder.NewKeyGenerator(),
95-
FeatureLookup: featureFlags,
91+
Reader: reader,
92+
Cache: cache,
93+
KeyGenerator: queryBuilder.NewKeyGenerator(),
9694
}
9795

9896
t.querierV2 = querierV2.NewQuerier(querierOptsV2)
@@ -102,21 +100,18 @@ func NewAnomalyRule(
102100
anomaly.WithCache[*anomaly.HourlyProvider](cache),
103101
anomaly.WithKeyGenerator[*anomaly.HourlyProvider](queryBuilder.NewKeyGenerator()),
104102
anomaly.WithReader[*anomaly.HourlyProvider](reader),
105-
anomaly.WithFeatureLookup[*anomaly.HourlyProvider](featureFlags),
106103
)
107104
} else if t.seasonality == anomaly.SeasonalityDaily {
108105
t.provider = anomaly.NewDailyProvider(
109106
anomaly.WithCache[*anomaly.DailyProvider](cache),
110107
anomaly.WithKeyGenerator[*anomaly.DailyProvider](queryBuilder.NewKeyGenerator()),
111108
anomaly.WithReader[*anomaly.DailyProvider](reader),
112-
anomaly.WithFeatureLookup[*anomaly.DailyProvider](featureFlags),
113109
)
114110
} else if t.seasonality == anomaly.SeasonalityWeekly {
115111
t.provider = anomaly.NewWeeklyProvider(
116112
anomaly.WithCache[*anomaly.WeeklyProvider](cache),
117113
anomaly.WithKeyGenerator[*anomaly.WeeklyProvider](queryBuilder.NewKeyGenerator()),
118114
anomaly.WithReader[*anomaly.WeeklyProvider](reader),
119-
anomaly.WithFeatureLookup[*anomaly.WeeklyProvider](featureFlags),
120115
)
121116
}
122117
return &t, nil

‎ee/query-service/rules/manager.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
2323
tr, err := baserules.NewThresholdRule(
2424
ruleId,
2525
opts.Rule,
26-
opts.FF,
2726
opts.Reader,
2827
opts.UseLogsNewSchema,
2928
opts.UseTraceNewSchema,
@@ -66,7 +65,6 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
6665
ar, err := NewAnomalyRule(
6766
ruleId,
6867
opts.Rule,
69-
opts.FF,
7068
opts.Reader,
7169
opts.Cache,
7270
baserules.WithEvalDelay(opts.ManagerOpts.EvalDelay),
@@ -123,7 +121,6 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
123121
rule, err = baserules.NewThresholdRule(
124122
alertname,
125123
parsedRule,
126-
opts.FF,
127124
opts.Reader,
128125
opts.UseLogsNewSchema,
129126
opts.UseTraceNewSchema,
@@ -160,7 +157,6 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
160157
rule, err = NewAnomalyRule(
161158
alertname,
162159
parsedRule,
163-
opts.FF,
164160
opts.Reader,
165161
opts.Cache,
166162
baserules.WithSendAlways(),

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ func NewServer(serverOptions *ServerOptions) (*Server, error) {
151151
reader,
152152
c,
153153
serverOptions.DisableRules,
154-
fm,
155154
serverOptions.UseLogsNewSchema,
156155
serverOptions.UseTraceNewSchema,
157156
serverOptions.SigNoz.SQLStore,
@@ -483,7 +482,6 @@ func makeRulesManager(
483482
ch interfaces.Reader,
484483
cache cache.Cache,
485484
disableRules bool,
486-
fm interfaces.FeatureLookup,
487485
useLogsNewSchema bool,
488486
useTraceNewSchema bool,
489487
sqlstore sqlstore.SQLStore,
@@ -499,7 +497,6 @@ func makeRulesManager(
499497
Context: context.Background(),
500498
Logger: zap.L(),
501499
DisableRules: disableRules,
502-
FeatureFlags: fm,
503500
Reader: ch,
504501
Cache: cache,
505502
EvalDelay: constants.GetEvalDelay(),

‎pkg/query-service/rules/manager.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ type PrepareTaskOptions struct {
3636
Logger *zap.Logger
3737
Reader interfaces.Reader
3838
Cache cache.Cache
39-
FF interfaces.FeatureLookup
4039
ManagerOpts *ManagerOptions
4140
NotifyFunc NotifyFunc
4241
SQLStore sqlstore.SQLStore
@@ -50,7 +49,6 @@ type PrepareTestRuleOptions struct {
5049
Logger *zap.Logger
5150
Reader interfaces.Reader
5251
Cache cache.Cache
53-
FF interfaces.FeatureLookup
5452
ManagerOpts *ManagerOptions
5553
NotifyFunc NotifyFunc
5654
SQLStore sqlstore.SQLStore
@@ -89,7 +87,6 @@ type ManagerOptions struct {
8987
Logger *zap.Logger
9088
ResendDelay time.Duration
9189
DisableRules bool
92-
FeatureFlags interfaces.FeatureLookup
9390
Reader interfaces.Reader
9491
Cache cache.Cache
9592

@@ -114,9 +111,7 @@ type Manager struct {
114111
// datastore to store alert definitions
115112
ruleDB RuleDB
116113

117-
logger *zap.Logger
118-
119-
featureFlags interfaces.FeatureLookup
114+
logger *zap.Logger
120115
reader interfaces.Reader
121116
cache cache.Cache
122117
prepareTaskFunc func(opts PrepareTaskOptions) (Task, error)
@@ -156,7 +151,6 @@ func defaultPrepareTaskFunc(opts PrepareTaskOptions) (Task, error) {
156151
tr, err := NewThresholdRule(
157152
ruleId,
158153
opts.Rule,
159-
opts.FF,
160154
opts.Reader,
161155
opts.UseLogsNewSchema,
162156
opts.UseTraceNewSchema,
@@ -214,7 +208,6 @@ func NewManager(o *ManagerOptions) (*Manager, error) {
214208
opts: o,
215209
block: make(chan struct{}),
216210
logger: o.Logger,
217-
featureFlags: o.FeatureFlags,
218211
reader: o.Reader,
219212
cache: o.Cache,
220213
prepareTaskFunc: o.PrepareTaskFunc,
@@ -391,7 +384,6 @@ func (m *Manager) editTask(rule *PostableRule, taskName string) error {
391384
Logger: m.logger,
392385
Reader: m.reader,
393386
Cache: m.cache,
394-
FF: m.featureFlags,
395387
ManagerOpts: m.opts,
396388
NotifyFunc: m.prepareNotifyFunc(),
397389
SQLStore: m.sqlstore,
@@ -575,7 +567,6 @@ func (m *Manager) addTask(rule *PostableRule, taskName string) error {
575567
Logger: m.logger,
576568
Reader: m.reader,
577569
Cache: m.cache,
578-
FF: m.featureFlags,
579570
ManagerOpts: m.opts,
580571
NotifyFunc: m.prepareNotifyFunc(),
581572
SQLStore: m.sqlstore,
@@ -954,7 +945,6 @@ func (m *Manager) TestNotification(ctx context.Context, ruleStr string) (int, *m
954945
Logger: m.logger,
955946
Reader: m.reader,
956947
Cache: m.cache,
957-
FF: m.featureFlags,
958948
ManagerOpts: m.opts,
959949
NotifyFunc: m.prepareTestNotifyFunc(),
960950
SQLStore: m.sqlstore,

‎pkg/query-service/rules/test_notification.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func defaultTestNotification(opts PrepareTestRuleOptions) (int, *model.ApiError)
4646
rule, err = NewThresholdRule(
4747
alertname,
4848
parsedRule,
49-
opts.FF,
5049
opts.Reader,
5150
opts.UseLogsNewSchema,
5251
opts.UseTraceNewSchema,

‎pkg/query-service/rules/threshold_rule.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ type ThresholdRule struct {
5858
func NewThresholdRule(
5959
id string,
6060
p *PostableRule,
61-
featureFlags interfaces.FeatureLookup,
6261
reader interfaces.Reader,
6362
useLogsNewSchema bool,
6463
useTraceNewSchema bool,
@@ -82,7 +81,6 @@ func NewThresholdRule(
8281
Reader: reader,
8382
Cache: nil,
8483
KeyGenerator: queryBuilder.NewKeyGenerator(),
85-
FeatureLookup: featureFlags,
8684
UseLogsNewSchema: useLogsNewSchema,
8785
UseTraceNewSchema: useTraceNewSchema,
8886
}
@@ -91,7 +89,6 @@ func NewThresholdRule(
9189
Reader: reader,
9290
Cache: nil,
9391
KeyGenerator: queryBuilder.NewKeyGenerator(),
94-
FeatureLookup: featureFlags,
9592
UseLogsNewSchema: useLogsNewSchema,
9693
UseTraceNewSchema: useTraceNewSchema,
9794
}

0 commit comments

Comments
 (0)