Merge pull request #71 from daniloarcidiacono/70-cloudwatch-duplicate…

…-logs Fix CloudWatch internal appenders.
sndyuk · Mar 14, 2023 · b9b7f43 · b9b7f43
2 parents 2b2b38d + 9b05edd
commit b9b7f43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/ch/qos/logback/more/appenders/CloudWatchLogbackAppender.java b/src/main/java/ch/qos/logback/more/appenders/CloudWatchLogbackAppender.java
@@ -200,10 +200,11 @@ public boolean append(List<InputLogEvent> events) {
                             request = new PutLogEventsRequest(logGroupName, streamName, events.subList(putIndex, i + 1));
                         } else {
                             request = new PutLogEventsRequest(logGroupName, streamName, events.subList(putIndex, i));
+                            // Update putIndex before decreasing the event index
+                            putIndex = i;
                             i -= 1;
                         }
                         size = 0;
-                        putIndex = i;
                         if (sequenceToken != null) {
                             request.withSequenceToken(sequenceToken);
                         }

diff --git a/src/main/java/ch/qos/logback/more/appenders/CloudWatchLogbackAppenderV2.java b/src/main/java/ch/qos/logback/more/appenders/CloudWatchLogbackAppenderV2.java
@@ -204,10 +204,11 @@ public boolean append(List<InputLogEvent> events) {
                         } else {
                             request = PutLogEventsRequest.builder().logGroupName(logGroupName)
                                 .logStreamName(streamName).logEvents(events.subList(putIndex, i));
+                            // Update putIndex before decreasing the event index
+                            putIndex = i;
                             i -= 1;
                         }
                         size = 0;
-                        putIndex = i;
                         if (sequenceToken != null) {
                             request.sequenceToken(sequenceToken);
                         }