Skip to content

Commit aa504f7

Browse files
authored
feat!: cleanup evaluator interface (#1793)
depends: #1792 for fixing build issues --------- Signed-off-by: Simon Schrottner <[email protected]>
1 parent 101013a commit aa504f7

File tree

7 files changed

+214
-251
lines changed

7 files changed

+214
-251
lines changed

core/pkg/evaluator/ievaluator.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ func NewAnyValue(
3434
IEvaluator is an extension of IResolver, allowing storage updates and retrievals
3535
*/
3636
type IEvaluator interface {
37-
GetState() (string, error)
38-
SetState(payload sync.DataSync) (map[string]interface{}, bool, error)
37+
SetState(payload sync.DataSync) error
3938
IResolver
4039
}
4140

core/pkg/evaluator/json.go

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,7 @@ func NewJSON(logger *logger.Logger, s store.IStore, opts ...JSONEvaluatorOption)
117117
return &ev
118118
}
119119

120-
func (je *JSON) GetState() (string, error) {
121-
s, err := je.store.String()
122-
if err != nil {
123-
return "", fmt.Errorf("unable to fetch evaluator state: %w", err)
124-
}
125-
return s, nil
126-
}
127-
128-
func (je *JSON) SetState(payload sync.DataSync) (map[string]interface{}, bool, error) {
120+
func (je *JSON) SetState(payload sync.DataSync) error {
129121
_, span := je.jsonEvalTracer.Start(
130122
context.Background(),
131123
"flagSync",
@@ -138,18 +130,12 @@ func (je *JSON) SetState(payload sync.DataSync) (map[string]interface{}, bool, e
138130
if err != nil {
139131
span.SetStatus(codes.Error, "flagSync error")
140132
span.RecordError(err)
141-
return nil, false, err
133+
return err
142134
}
143135

144-
var events map[string]interface{}
145-
var reSync bool
146-
147-
events, reSync = je.store.Update(payload.Source, definition.Flags, definition.Metadata)
136+
je.store.Update(payload.Source, definition.Flags, definition.Metadata)
148137

149-
// Number of events correlates to the number of flags changed through this sync, record it
150-
span.SetAttributes(attribute.Int("feature_flag.change_count", len(events)))
151-
152-
return events, reSync, nil
138+
return nil
153139
}
154140

155141
// Resolver implementation for flagd flags. This resolver should be kept reusable, hence must interact with interfaces.

0 commit comments

Comments
 (0)