Skip to content

Add external origination time for events created from S3 Object#5104

Merged
kkondaka merged 1 commit intoopensearch-project:mainfrom
kkondaka:s3-sqs-object-timestamp
Oct 31, 2024
Merged

Add external origination time for events created from S3 Object#5104
kkondaka merged 1 commit intoopensearch-project:mainfrom
kkondaka:s3-sqs-object-timestamp

Conversation

@kkondaka
Copy link
Copy Markdown
Collaborator

Description

Adds external origination time for events created from S3 Object. This applies to events created by both S3 SQS and S3Scan sources

Issues Resolved

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • [X ] Commits are signed with a real name per the DCO

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.

Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
@kkondaka kkondaka force-pushed the s3-sqs-object-timestamp branch from 431132a to 76f3f3c Compare October 24, 2024 19:05
* @return last modified time
*/
public Instant getLastModified() {
return getMetadata().lastModified();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this will return the same last modified time from S3?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

eventConsumer.accept(record.getData(), s3ObjectReference);
Event event = record.getData();
eventConsumer.accept(event, s3ObjectReference);
event.getMetadata().setExternalOriginationTime(originationTime);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than modify the metadata here, let's add another EventConsumer. This can be a chain of EventConsumer classes to modify the event. Otherwise, we will have too many changes here.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if it makes sense because each consumer needs to be called at different place with different arguments.

@kkondaka kkondaka merged commit eb86d97 into opensearch-project:main Oct 31, 2024
san81 added a commit to san81/data-prepper that referenced this pull request Nov 2, 2024
# This is the 1st commit message:

additional test coverage

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

# This is the commit message #2:

cleaned up JiraOauthConfig file

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

# This is the commit message #3:

addressing review comments and simplifying the exception handling

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

# This is the commit message #4:

Add external origination time for events created from S3 Object (opensearch-project#5104)

Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Co-authored-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
# This is the commit message #5:

moved the wait block out of the catch block

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

# This is the commit message #6:

Renewal logic adjusted

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

# This is the commit message #7:

partial

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

fix merge issues

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

update

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

Add getColumnDataTypes method to SchemaManager to get datatype for table columns (opensearch-project#5135)

Add getColumnDataTypes method to SchemaManager

Signed-off-by: Dinu John <86094133+dinujoh@users.noreply.github.com>

Add model for table column metadata for Global state (opensearch-project#5136)

Signed-off-by: Dinu John <86094133+dinujoh@users.noreply.github.com>

Rename the KDS source plugin name to "kinesis-data-streams" (opensearch-project#5138)

Signed-off-by: Souvik Bose <souvbose@amazon.com>
Co-authored-by: Souvik Bose <souvbose@amazon.com>

Addressed review comments (opensearch-project#5108)

Signed-off-by: Krishna Kondaka <krishkdk@amazon.com>

fixes related to source config properties change

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

removed future handling for loop based operations

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

additional test cases

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

addressing review comments

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

Jira Service Test coverage

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

jirasourceconfigTest comments

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

introduced RestClient and moved rest template interactions to there. Similar chage on the test cases too

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

backingoff for any kind of exception.

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

restructured constants file

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>

JiraSourceTests

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

JiraItemInfo coverage

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

jira service branch coverage

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

branch coverage jira service

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

move add Items to queue logic into JiraItemInfo

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

fixing regex and adding date time formatter

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

Revert "Jira source"

re add changes and fix issues

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

unneeded comment

Signed-off-by: Maxwell Brown <mxwelwbr@amazon.com>

using issue bean methods to simplify the logic

Signed-off-by: Santhosh Gandhe <1909520+san81@users.noreply.github.com>
san81 pushed a commit to san81/data-prepper that referenced this pull request Nov 3, 2024
…search-project#5104)

Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Co-authored-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants