Modify EventHandle to be created for every event and support internal and external origination times #3546
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.model.event; | ||
|
|
||
| import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; | ||
| import java.lang.ref.WeakReference; | ||
|
|
||
| import java.time.Instant; | ||
| import java.io.Serializable; | ||
|
|
||
| public class DefaultEventHandle implements EventHandle, Serializable { | ||
| private Instant externalOriginationTime; | ||
| private final Instant internalOriginationTime; | ||
| private WeakReference<AcknowledgementSet> acknowledgementSetRef; | ||
|
|
||
| public DefaultEventHandle(final Instant internalOriginationTime) { | ||
| this.acknowledgementSetRef = null; | ||
| this.externalOriginationTime = null; | ||
| this.internalOriginationTime = internalOriginationTime; | ||
| } | ||
|
|
||
| @Override | ||
| public void setAcknowledgementSet(final AcknowledgementSet acknowledgementSet) { | ||
| this.acknowledgementSetRef = new WeakReference<>(acknowledgementSet); | ||
| } | ||
|
|
||
| @Override | ||
| public void setExternalOriginationTime(final Instant externalOriginationTime) { | ||
| this.externalOriginationTime = externalOriginationTime; | ||
| } | ||
|
|
||
| public AcknowledgementSet getAcknowledgementSet() { | ||
| if (acknowledgementSetRef == null) { | ||
| return null; | ||
| } | ||
| return acknowledgementSetRef.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public Instant getInternalOriginationTime() { | ||
| return this.internalOriginationTime; | ||
| } | ||
|
|
||
| @Override | ||
|
There was a problem hiding this comment. For the next PR let's scope down and first only implement internal end to end latency metric. For ddb use case we could potentially use this value for external (https://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_StreamRecord.html#DDB-Type-streams_StreamRecord-ApproximateCreationDateTime), so we may not need to make any hasty decisions on users configuring this time. @dlvenable What do you think? There was a problem hiding this comment. If I understand your proposal, the There was a problem hiding this comment. OK. Will only implement internal latency for now in the OpenSearchSink and S3 Sink |
||
| public Instant getExternalOriginationTime() { | ||
| return this.externalOriginationTime; | ||
| } | ||
|
|
||
| @Override | ||
| public void release(boolean result) { | ||
| System.out.println("======release called==="+result); | ||
|
There was a problem hiding this comment. Should remove this print statement |
||
| AcknowledgementSet acknowledgementSet = getAcknowledgementSet(); | ||
| if (acknowledgementSet != null) { | ||
| acknowledgementSet.release(this, result); | ||
| } | ||
| } | ||
| } | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.model.event; | ||
|
|
||
| import org.opensearch.dataprepper.model.acknowledgements.AcknowledgementSet; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import org.junit.jupiter.api.Test; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import org.mockito.Mock; | ||
|
|
||
| import java.time.Instant; | ||
|
|
||
| class DefaultEventHandleTests { | ||
| @Mock | ||
| private AcknowledgementSet acknowledgementSet; | ||
|
|
||
| @Test | ||
| void testBasic() { | ||
| Instant now = Instant.now(); | ||
| DefaultEventHandle eventHandle = new DefaultEventHandle(now); | ||
| assertThat(eventHandle.getAcknowledgementSet(), equalTo(null)); | ||
| assertThat(eventHandle.getInternalOriginationTime(), equalTo(now)); | ||
| assertThat(eventHandle.getExternalOriginationTime(), equalTo(null)); | ||
| eventHandle.release(true); | ||
| } | ||
|
|
||
| @Test | ||
| void testWithAcknowledgementSet() { | ||
| acknowledgementSet = mock(AcknowledgementSet.class); | ||
| when(acknowledgementSet.release(any(EventHandle.class), any(Boolean.class))).thenReturn(true); | ||
| Instant now = Instant.now(); | ||
| DefaultEventHandle eventHandle = new DefaultEventHandle(now); | ||
| assertThat(eventHandle.getAcknowledgementSet(), equalTo(null)); | ||
| assertThat(eventHandle.getInternalOriginationTime(), equalTo(now)); | ||
| assertThat(eventHandle.getExternalOriginationTime(), equalTo(null)); | ||
| eventHandle.setAcknowledgementSet(acknowledgementSet); | ||
| eventHandle.release(true); | ||
| verify(acknowledgementSet).release(eventHandle, true); | ||
| } | ||
|
|
||
| @Test | ||
| void testWithExternalOriginationTime() { | ||
| Instant now = Instant.now(); | ||
| DefaultEventHandle eventHandle = new DefaultEventHandle(now); | ||
| assertThat(eventHandle.getAcknowledgementSet(), equalTo(null)); | ||
| assertThat(eventHandle.getInternalOriginationTime(), equalTo(now)); | ||
| assertThat(eventHandle.getExternalOriginationTime(), equalTo(null)); | ||
| eventHandle.setExternalOriginationTime(now.minusSeconds(60)); | ||
| assertThat(eventHandle.getExternalOriginationTime(), equalTo(now.minusSeconds(60))); | ||
| eventHandle.release(true); | ||
| } | ||
| } |
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we make this package protected? I'd really like to avoid this getting used as it will be hard to clean-up in the future.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By "package protected" you mean make this as
protected class DefaultEventHandle implements EventHandle, Serializable?