Skip to content

Update the version of KCL from 2.6.0 to 2.7.2 #6883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sb2k16 merged 1 commit into from
May 27, 2026
Merged

Update the version of KCL from 2.6.0 to 2.7.2 #6883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion .github/workflows/kinesis-source-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@ on:
paths:
- 'data-prepper-plugins/kinesis-source/**'
- '*gradle*'
pull_request:
pull_request_target:
types: [ opened, synchronize, reopened ]
paths:
- 'data-prepper-plugins/kinesis-source/**'
- '*gradle*'

workflow_dispatch:

permissions:
id-token: write
contents: read

jobs:
build:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion data-prepper-plugins/kinesis-source/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
implementation libs.armeria.core
implementation 'com.fasterxml.jackson.core:jackson-core'
implementation 'io.micrometer:micrometer-core'
implementation 'software.amazon.kinesis:amazon-kinesis-client:2.6.0'
implementation 'software.amazon.kinesis:amazon-kinesis-client:2.7.2'
compileOnly 'org.projectlombok:lombok:1.18.20'
annotationProcessor 'org.projectlombok:lombok:1.18.20'

Expand Down
2 changes: 1 addition & 1 deletion ...tegrationTest/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisSourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public void testKinesisService() throws Exception {
when(pluginFactory.loadPlugin(eq(InputCodec.class), any()))
.thenReturn(new NdjsonInputCodec(new NdjsonInputConfig(), TestEventFactory.getTestEventFactory()));

final List<Record<?>> actualRecordsWritten = new ArrayList<>();
final List<Record<?>> actualRecordsWritten = Collections.synchronizedList(new ArrayList<>());
doAnswer(a -> actualRecordsWritten.addAll(a.getArgument(0, Collection.class)))
.when(buffer).writeAll(anyCollection(), anyInt());

Expand Down
2 changes: 1 addition & 1 deletion ...ource/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

package org.opensearch.dataprepper.plugins.kinesis.source;

import com.amazonaws.SdkClientException;
import com.linecorp.armeria.client.retry.Backoff;
import lombok.Getter;
import lombok.Setter;
Expand All @@ -34,6 +33,7 @@
import org.opensearch.dataprepper.plugins.kinesis.source.processor.KinesisShardRecordProcessorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
import software.amazon.awssdk.services.dynamodb.model.BillingMode;
Expand Down
5 changes: 3 additions & 2 deletions ...org/opensearch/dataprepper/plugins/kinesis/source/apihandler/KinesisClientApiHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.opensearch.dataprepper.plugins.kinesis.source.exceptions.KinesisConsumerNotFoundException;
import software.amazon.awssdk.arns.Arn;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerRequest;
import software.amazon.awssdk.services.kinesis.model.DescribeStreamConsumerResponse;
Expand Down Expand Up @@ -111,7 +112,7 @@ private DescribeStreamSummaryResponse getStreamDescriptionSummary(

private void handleStreamSummaryException(CompletionException ex, String streamName) {
Throwable cause = ex.getCause();
if (cause instanceof KinesisException || cause instanceof com.amazonaws.SdkClientException) {
if (cause instanceof KinesisException || cause instanceof SdkClientException) {
log.error("AWS error while describing stream summary for stream {}: {}",
streamName, ex.getMessage());
} else {
Expand All @@ -136,7 +137,7 @@ private DescribeStreamConsumerResponse describeStreamConsumer(

private void handleConsumerException(CompletionException ex, String streamArn, int attempt) {
Throwable cause = ex.getCause();
if (cause instanceof KinesisException || cause instanceof com.amazonaws.SdkClientException) {
if (cause instanceof KinesisException || cause instanceof SdkClientException) {
log.error("AWS error while describing stream consumer for stream {}: {}. Attempt {}.",
streamArn, ex.getMessage(), attempt + 1);
} else {
Expand Down
Loading