Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions expr.go
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,11 @@ func (a *aggregator[T]) Add(ctx context.Context, eval T) (float64, error) {
return -1, err
}

// deduplicate evaluables, as engines do not expect duplicates and will cause false positives
if _, err := a.kv.Get(parsed.EvaluableID); err == nil {
return 0, nil
}

if err := a.kv.Set(eval); err != nil {
return -1, err
}
Expand Down
45 changes: 45 additions & 0 deletions expr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,51 @@ func TestAddRemove(t *testing.T) {
})
}

func TestDuplicateAdd(t *testing.T) {
ctx := context.Background()
parser, err := newParser()
require.NoError(t, err)

e := NewAggregateEvaluator(AggregateEvaluatorOpts[testEvaluable]{
Parser: parser,
Eval: testBoolEvaluator,
Concurrency: 0,
})
defer e.Close()

expr := tex(`event.data.id == "abc" && event.data.window == 2.25`, "dedup-test")

_, err = e.Add(ctx, expr)
require.NoError(t, err)
_, err = e.Add(ctx, expr)
require.NoError(t, err)

require.Equal(t, 1, e.FastLen())

_, evalCount, err := e.Evaluate(ctx, map[string]any{
"event": map[string]any{
"data": map[string]any{
"id": "WRONG",
"window": 2.25,
},
},
})
require.NoError(t, err)
require.Equal(t, int32(0), evalCount, "non-matching id must not reach CEL after duplicate Add")

found, evalCount, err := e.Evaluate(ctx, map[string]any{
"event": map[string]any{
"data": map[string]any{
"id": "abc",
"window": 2.25,
},
},
})
require.NoError(t, err)
require.Equal(t, int32(1), evalCount)
require.Len(t, found, 1)
}

func TestEmptyExpressions(t *testing.T) {
ctx := context.Background()
parser, err := newParser()
Expand Down
Loading