Pass the pipeline identifier as part of the data prepper config. #5131
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
Signed-off-by: Souvik Bose <[email protected]>
sb2k16
requested review from
chenqi0805,
engechas,
graytaylor0,
dinujoh,
kkondaka,
KarstenSchnitter,
dlvenable and
oeyh
as code owners
dlvenable
requested changes
Oct 30, 2024
| @@ -96,8 +95,11 @@ public KinesisService(final KinesisSourceConfig kinesisSourceConfig, | |||
| this.dynamoDbClient = kinesisClientFactory.buildDynamoDBClient(kinesisLeaseConfig.getLeaseCoordinationTable().getAwsRegion()); | |||
| this.kinesisClient = kinesisClientFactory.buildKinesisAsyncClient(kinesisSourceConfig.getAwsAuthenticationConfig().getAwsRegion()); | |||
| this.cloudWatchClient = kinesisClientFactory.buildCloudWatchAsyncClient(kinesisLeaseConfig.getLeaseCoordinationTable().getAwsRegion()); | |||
| this.pipelineName = pipelineDescription.getPipelineName(); | |||
| this.applicationName = pipelineName; | |||
| if (kinesisLeaseConfig.getPipelineIdentifier().isEmpty()) { | |||
There was a problem hiding this comment.
Thanks @dlvenable . I have made the changes.
| @@ -53,6 +53,7 @@ public class KinesisSourceTest { | |||
| private final String PIPELINE_NAME = "kinesis-pipeline-test"; | |||
| private final String streamId = "stream-1"; | |||
| private static final String codec_plugin_name = "json"; | |||
| private static final String PIPELINE_IDENTIFIER = "sample-kinesis-pipeline-0123"; | |||
There was a problem hiding this comment.
Please generate this as a random string in the @BeforeEach setUp method.
There was a problem hiding this comment.
Thanks @dlvenable . I have made the changes.
| @@ -70,6 +70,7 @@ public class KinesisServiceTest { | |||
| private final String PIPELINE_NAME = "kinesis-pipeline-test"; | |||
| private final String streamId = "stream-1"; | |||
| private static final String codec_plugin_name = "json"; | |||
| private static final String PIPELINE_IDENTIFIER = "sample-kinesis-pipeline-0123"; | |||
There was a problem hiding this comment.
Please generate this as a random string in the @BeforeEach setUp method.
There was a problem hiding this comment.
Thanks @dlvenable . I have made the changes.
| @@ -149,6 +150,7 @@ void setup() { | |||
| kinesisLeaseConfigSupplier = mock(KinesisLeaseConfigSupplier.class); | |||
| kinesisLeaseConfig = mock(KinesisLeaseConfig.class); | |||
| workerIdentifierGenerator = mock(WorkerIdentifierGenerator.class); | |||
| when(kinesisLeaseConfig.getPipelineIdentifier()).thenReturn(PIPELINE_IDENTIFIER); | |||
There was a problem hiding this comment.
This is changing all the existing tests. Thus, we are not not sufficiently validating this. We should test the condition fully.
I see two options:
- Make method on
KinesisLeaseConfigthat returns the identifier to use. It can have the conditional that you added inKinesisService. Then you can test that in isolation. Be sure to add@JsonIgnore` if you take this approach. - Create a new test in here that verifies the behavior with
pipeline_identifieras well as with nopipeline_identifer. The former test should also have a pipeline name that is different so you can be sure the correct name is chosen.
There was a problem hiding this comment.
I have created separate tests to test against null, empty pipeline identifiers in the KinesisServiceTest.
Signed-off-by: Souvik Bose <[email protected]>
sb2k16
force-pushed
the
kds-pipeline-identifier
branch
from
7da1135 to
c2e7f03
Compare
dlvenable
approved these changes
Nov 6, 2024
kkondaka
approved these changes
Nov 6, 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
This PR is to add a
pipeline_identifierto the data prepper config to ensure that the multiple pipelines can subscribe to the same KDS stream when using enhanced fan-out strategy. This is optional and by default would use the pipeline name as the identifier for the active subscription.Issues Resolved
Resolves #1082
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.