From 2575db341812c50ce00a187734b3033999a0e126 Mon Sep 17 00:00:00 2001 From: Souvik Bose Date: Thu, 17 Oct 2024 16:01:03 -0700 Subject: [PATCH] Fix AWS Sdk dependency conflict (#5082) Signed-off-by: Souvik Bose Co-authored-by: Souvik Bose --- build.gradle | 2 +- .../dataprepper/plugins/kinesis/source/KinesisService.java | 4 +++- data-prepper-plugins/s3-sink/build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index be3b3dcc49..7f78c2424f 100644 --- a/build.gradle +++ b/build.gradle @@ -269,7 +269,7 @@ subprojects { configure(subprojects.findAll {it.name != 'data-prepper-api'}) { dependencies { - implementation platform('software.amazon.awssdk:bom:2.21.23') + implementation platform('software.amazon.awssdk:bom:2.25.11') implementation 'jakarta.validation:jakarta.validation-api:3.0.2' } } diff --git a/data-prepper-plugins/kinesis-source/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java b/data-prepper-plugins/kinesis-source/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java index 8919999c2a..7f712d9e73 100644 --- a/data-prepper-plugins/kinesis-source/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java +++ b/data-prepper-plugins/kinesis-source/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java @@ -45,6 +45,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY; + public class KinesisService { private static final Logger LOG = LoggerFactory.getLogger(KinesisService.class); private static final int GRACEFUL_SHUTDOWN_WAIT_INTERVAL_SECONDS = 20; @@ -138,7 +140,7 @@ public Scheduler getScheduler(final Buffer> buffer) { try { scheduler = createScheduler(buffer); } catch (Exception ex) { - LOG.error("Caught exception when initializing KCL Scheduler. Will retry"); + LOG.error(NOISY, "Caught exception when initializing KCL Scheduler. Will retry", ex); } if (scheduler == null) { diff --git a/data-prepper-plugins/s3-sink/build.gradle b/data-prepper-plugins/s3-sink/build.gradle index 722f784300..8dd6b5783d 100644 --- a/data-prepper-plugins/s3-sink/build.gradle +++ b/data-prepper-plugins/s3-sink/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'software.amazon.awssdk:netty-nio-client' implementation 'software.amazon.awssdk:s3' implementation 'software.amazon.awssdk:sts' - implementation 'software.amazon.awssdk:securitylake:2.28.20' + implementation 'software.amazon.awssdk:securitylake' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.22' implementation project(':data-prepper-plugins:avro-codecs') implementation libs.avro.core