Fix AWS Sdk dependency conflict (opensearch-project#5082)

Signed-off-by: Souvik Bose <[email protected]> Co-authored-by: Souvik Bose <[email protected]>
dlvenable · Oct 17, 2024 · 2575db3 · 2575db3
1 parent 09ed988
commit 2575db3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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/...ource/src/main/java/org/opensearch/dataprepper/plugins/kinesis/source/KinesisService.java b/...ource/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<Record<Event>> 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
@@ -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