Aggregator processor should evaluate aggregate_when condition before forwarding events to remote peer #4004
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…forwarding events to remote peer Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
kkondaka
requested review from
chenqi0805,
engechas,
graytaylor0,
dinujoh,
asifsmohammed,
dlvenable and
oeyh
as code owners
dlvenable
requested changes
Jan 23, 2024
| @@ -79,7 +80,9 @@ private PeerForwardingProcessorDecorator(final PeerForwarder peerForwarder, fina | |||
|
|
|||
| @Override | |||
| public Collection<Record<Event>> execute(final Collection<Record<Event>> records) { | |||
| final Collection<Record<Event>> recordsToProcessOnLocalPeer = peerForwarder.forwardRecords(records); | |||
| final Collection<Record<Event>> recordsToProcess = ((RequiresPeerForwarding)innerProcessor).applicableEventsForPeerForwarding(records); | |||
There was a problem hiding this comment.
At the end of this method, we return:
return innerProcessor.execute(recordsToProcessLocally);
The collection returned by the processor will be the input into the next processor. With this PR, the returned collection is going to be inaccurate when aggregate_when is present. The pipeline author still wants to process those events in downstream processors.
We need something like the following. I'll use + for set union and - for set difference. This should convey the idea, but these are not valid set operators in Java, so you'll need a little modification. Also, Collection is not necessarily a Set.
return innerProcessor.execute(recordsToProcessLocally) + (records - recordsToProcess);
We'll definitely need a unit test here.
It would be ideal to also have a core integration test.
| final Collection<Record<Event>> recordsOut = new ArrayList<>(); | ||
| for (Record<Event> record: records) { | ||
| Event event = record.getData(); | ||
| if (expressionEvaluator.evaluateConditional(whenCondition, event)) { |
There was a problem hiding this comment.
Let's share the same logic here as we use in the execute method to ensure they remain consistent.
Maybe you could make a method that evaluates the conditional in both.
private boolean isEventApplicable(Record<Event> record)
| } | ||
|
|
||
| @Test | ||
| void testRequiresPeerForwardingTest() { |
There was a problem hiding this comment.
Thank you for adding this test!
added 2 commits
January 24, 2024 02:29
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
|
@kkondaka , I see some test failures: |
added 2 commits
January 24, 2024 22:50
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
graytaylor0
approved these changes
Jan 24, 2024
dlvenable
approved these changes
Jan 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Aggregate processor support
aggregate_whenoption which may evaluate to false to some events. But the current remote forwarder interface evaluates this condition after an event is forwarded to a remote peer which is unnecessary. The condition can be evaluated locally on a forwarding node before actually forwarding the event.Modified the remote forwarding interface to allow local evaluation of events before forwarding events to remote peer.
Resolves #3996
Issues Resolved
Resolves #3996
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.