aligned else blocks to fall into one catch

Signed-off-by: Santhosh Gandhe <[email protected]>
kkondaka · Nov 20, 2024 · 726559b · 726559b
1 parent 0e2aed5
commit 726559b
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/...s/aws-lambda/src/main/java/org/opensearch/dataprepper/plugins/lambda/sink/LambdaSink.java b/...s/aws-lambda/src/main/java/org/opensearch/dataprepper/plugins/lambda/sink/LambdaSink.java
@@ -41,6 +41,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import static org.opensearch.dataprepper.logging.DataPrepperMarkers.NOISY;
 import static org.opensearch.dataprepper.plugins.lambda.common.LambdaCommonHandler.isSuccess;
 
 @DataPrepperPlugin(name = "aws_lambda", pluginType = Sink.class, pluginConfigurationType = LambdaSinkConfig.class)
@@ -172,19 +173,21 @@ public void doOutput(final Collection<Record<Event>> records) {
                 Duration latency = inputBuffer.stopLatencyWatch();
                 lambdaLatencyMetric.record(latency.toMillis(), TimeUnit.MILLISECONDS);
                 requestPayloadMetric.record(inputBuffer.getPayloadRequestSize());
-                if (isSuccess(response)) {
-                    releaseEventHandlesPerBatch(true, inputBuffer.getRecords());
-                    numberOfRecordsSuccessCounter.increment(inputBuffer.getEventCount());
-                    numberOfRequestsSuccessCounter.increment();
-                    if (response.payload() != null) {
-                        responsePayloadMetric.record(response.payload().asByteArray().length);
-                    }
-                } else {
-                    LOG.error("Lambda invoke failed with error {} ", response.statusCode());
-                    handleFailure(new RuntimeException("failed"), inputBuffer);
+                if (!isSuccess(response)) {
+                    String errorMessage = String.format("Lambda invoke failed with status code %s error %s ",
+                            response.statusCode(), response.payload().asUtf8String());
+                    throw new RuntimeException(errorMessage);
                 }
+
+                releaseEventHandlesPerBatch(true, inputBuffer.getRecords());
+                numberOfRecordsSuccessCounter.increment(inputBuffer.getEventCount());
+                numberOfRequestsSuccessCounter.increment();
+                if (response.payload() != null) {
+                    responsePayloadMetric.record(response.payload().asByteArray().length);
+                }
+
             } catch (Exception e) {
-                LOG.error("Exception from Lambda invocation ", e);
+                LOG.error(NOISY, e.getMessage(), e);
                 numberOfRecordsFailedCounter.increment(inputBuffer.getEventCount());
                 numberOfRequestsFailedCounter.increment();
                 handleFailure(new RuntimeException("failed"), inputBuffer);