Skip to content
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

Jump to bottom

fix: support batch size greater than 10 processing #667

Merged
merged 1 commit into from
Dec 24, 2021
Merged

fix: support batch size greater than 10 processing #667

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 37 additions & 14 deletions ...rtools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;

import java.util.function.Consumer;
import java.util.stream.IntStream;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import org.slf4j.Logger;
Expand All @@ -20,6 +21,7 @@
import software.amazon.awssdk.services.sqs.model.GetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequestEntry;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
import software.amazon.lambda.powertools.sqs.SQSBatchProcessingException;
Expand Down Expand Up @@ -156,14 +158,20 @@ private boolean moveNonRetryableMessagesToDlqIfConfigured(Map<SQSMessage, Except
})
.collect(toList());

SendMessageBatchResponse sendMessageBatchResponse = client.sendMessageBatch(builder -> builder.queueUrl(dlqUrl.get())
.entries(dlqMessages));
batchRequest(dlqMessages, 10, entriesToSend -> {

SendMessageBatchResponse sendMessageBatchResponse = client.sendMessageBatch(SendMessageBatchRequest.builder()
.entries(entriesToSend)
.queueUrl(dlqUrl.get())
.build());

LOG.debug("Response from send batch message to DLQ request {}", sendMessageBatchResponse);
LOG.debug("Response from send batch message to DLQ request {}", sendMessageBatchResponse);
});

return true;
}


private Optional<String> fetchDlqUrl(Map<SQSMessage, Exception> nonRetryableMessageToException) {
return nonRetryableMessageToException.keySet().stream()
.findFirst()
Expand Down Expand Up @@ -197,19 +205,34 @@ private boolean hasFailures() {

private void deleteMessagesFromQueue(final List<SQSMessage> messages) {
if (!messages.isEmpty()) {
DeleteMessageBatchRequest request = DeleteMessageBatchRequest.builder()
.queueUrl(url(messages.get(0).getEventSourceArn()))
.entries(messages.stream().map(m -> DeleteMessageBatchRequestEntry.builder()
.id(m.getMessageId())
.receiptHandle(m.getReceiptHandle())
.build()).collect(toList()))
.build();

DeleteMessageBatchResponse deleteMessageBatchResponse = client.deleteMessageBatch(request);
LOG.debug("Response from delete request {}", deleteMessageBatchResponse);

List<DeleteMessageBatchRequestEntry> entries = messages.stream().map(m -> DeleteMessageBatchRequestEntry.builder()
.id(m.getMessageId())
.receiptHandle(m.getReceiptHandle())
.build()).collect(toList());

batchRequest(entries, 10, entriesToDelete -> {
DeleteMessageBatchRequest request = DeleteMessageBatchRequest.builder()
.queueUrl(url(messages.get(0).getEventSourceArn()))
.entries(entriesToDelete)
.build();

DeleteMessageBatchResponse deleteMessageBatchResponse = client.deleteMessageBatch(request);

LOG.debug("Response from delete request {}", deleteMessageBatchResponse);
});
}
}

private <T> void batchRequest(final List<T> listOFEntries,
final int size,
final Consumer<List<T>> batchLogic) {
IntStream.range(0, listOFEntries.size())
.filter(index -> index % size == 0)
.mapToObj(index -> listOFEntries.subList(index, Math.min(index + size, listOFEntries.size())))
.forEach(batchLogic);
}

private String url(String queueArn) {
String[] arnArray = queueArn.split(":");
return String.format("https://sqs.%s.amazonaws.com/%s/%s", arnArray[3], arnArray[4], arnArray[5]);
Expand Down
85 changes: 80 additions & 5 deletions ...s-sqs/src/test/java/software/amazon/lambda/powertools/sqs/SqsUtilsBatchProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package software.amazon.lambda.powertools.sqs;

import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.function.Consumer;

import java.util.function.Function;
import com.amazonaws.services.lambda.runtime.events.SQSEvent;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.assertj.core.api.Assertions;
Expand All @@ -18,8 +19,11 @@
import software.amazon.awssdk.services.sqs.model.GetQueueAttributesRequest;
import software.amazon.awssdk.services.sqs.model.GetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequestEntry;

import static com.amazonaws.services.lambda.runtime.events.SQSEvent.SQSMessage;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
Expand Down Expand Up @@ -236,10 +240,10 @@ void shouldBatchProcessAndMoveNonRetryableExceptionToDlq() {
return "Success";
}, IllegalStateException.class, IllegalArgumentException.class);

Assertions.assertThat(batchProcessor)
assertThat(batchProcessor)
.hasSize(1);

verify(sqsClient).sendMessageBatch(any(Consumer.class));
verify(sqsClient).sendMessageBatch(any(SendMessageBatchRequest.class));
}

@Test
Expand All @@ -265,13 +269,84 @@ void shouldBatchProcessAndDeleteNonRetryableException() {
return "Success";
}, true, IllegalStateException.class, IllegalArgumentException.class);

Assertions.assertThat(batchProcessor)
assertThat(batchProcessor)
.hasSize(1);

verify(sqsClient, times(0)).sendMessageBatch(any(Consumer.class));
verify(sqsClient, times(0)).sendMessageBatch(any(SendMessageBatchRequest.class));
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
}

@Test
void shouldDeleteSuccessfulMessageInBatchesOfT10orLess() throws IOException {
SQSEvent batch25Message = MAPPER.readValue(this.getClass().getResource("/sampleSqsBatchEventBatchSize25.json"), SQSEvent.class);

assertThatExceptionOfType(SQSBatchProcessingException.class)
.isThrownBy(() -> batchProcessor(batch25Message, FailureSampleInnerSqsHandler.class))
.satisfies(e -> {

assertThat(e.successMessageReturnValues())
.hasSize(24)
.contains("Success");

assertThat(e.getFailures())
.hasSize(1)
.extracting("messageId")
.contains("2e1424d4-f796-459a-8184-9c92662be6da");

assertThat(e.getExceptions())
.hasSize(1)
.extracting("detailMessage")
.contains("Failed processing");
});

ArgumentCaptor<DeleteMessageBatchRequest> captor = ArgumentCaptor.forClass(DeleteMessageBatchRequest.class);

verify(sqsClient, times(3)).deleteMessageBatch(captor.capture());

assertThat(captor.getAllValues())
.hasSize(3)
.flatMap(DeleteMessageBatchRequest::entries)
.hasSize(24);
}

@Test
void shouldBatchProcessAndMoveNonRetryableExceptionToDlqInBatchesOfT10orLess() throws IOException {
SQSEvent batch25Message = MAPPER.readValue(this.getClass().getResource("/sampleSqsBatchEventBatchSize25.json"), SQSEvent.class);

HashMap<QueueAttributeName, String> attributes = new HashMap<>();

attributes.put(QueueAttributeName.REDRIVE_POLICY, "{\n" +
" \"deadLetterTargetArn\": \"arn:aws:sqs:us-east-2:123456789012:retry-queue\",\n" +
" \"maxReceiveCount\": 2\n" +
"}");

when(sqsClient.getQueueAttributes(any(GetQueueAttributesRequest.class))).thenReturn(GetQueueAttributesResponse.builder()
.attributes(attributes)
.build());

List<String> batchProcessor = batchProcessor(batch25Message, (message) -> {
if ("2e1424d4-f796-459a-8184-9c92662be6da".equals(message.getMessageId())) {
interactionClient.listQueues();
return "Success";
}

throw new IllegalStateException("Failed processing");
}, IllegalStateException.class, IllegalArgumentException.class);

assertThat(batchProcessor)
.hasSize(1);

ArgumentCaptor<SendMessageBatchRequest> captor = ArgumentCaptor.forClass(SendMessageBatchRequest.class);


verify(sqsClient, times(3)).sendMessageBatch(captor.capture());

assertThat(captor.getAllValues())
.hasSize(3)
.flatMap(SendMessageBatchRequest::entries)
.hasSize(24);
}

public class FailureSampleInnerSqsHandler implements SqsMessageHandler<String> {
@Override
public String process(SQSEvent.SQSMessage message) {
Expand Down
11 changes: 6 additions & 5 deletions ...va/software/amazon/lambda/powertools/sqs/internal/SqsMessageBatchProcessorAspectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import software.amazon.awssdk.services.sqs.model.GetQueueAttributesRequest;
import software.amazon.awssdk.services.sqs.model.GetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.lambda.powertools.sqs.SQSBatchProcessingException;
import software.amazon.lambda.powertools.sqs.handlers.LambdaHandlerApiGateway;
import software.amazon.lambda.powertools.sqs.handlers.PartialBatchFailureSuppressedHandler;
Expand Down Expand Up @@ -133,7 +134,7 @@ void shouldBatchProcessAndMoveNonRetryableExceptionToDlq() {

verify(interactionClient).listQueues();
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
verify(sqsClient).sendMessageBatch(any(Consumer.class));
verify(sqsClient).sendMessageBatch(any(SendMessageBatchRequest.class));
}

@Test
Expand All @@ -146,7 +147,7 @@ void shouldBatchProcessAndDeleteNonRetryableExceptionMessage() {
verify(interactionClient).listQueues();
ArgumentCaptor<DeleteMessageBatchRequest> captor = ArgumentCaptor.forClass(DeleteMessageBatchRequest.class);
verify(sqsClient).deleteMessageBatch(captor.capture());
verify(sqsClient, never()).sendMessageBatch(any(Consumer.class));
verify(sqsClient, never()).sendMessageBatch(any(SendMessageBatchRequest.class));
verify(sqsClient, never()).getQueueAttributes(any(GetQueueAttributesRequest.class));

assertThat(captor.getValue())
Expand Down Expand Up @@ -186,7 +187,7 @@ void shouldBatchProcessAndFailWithExceptionForNonRetryableExceptionAndNoDlq() {

verify(interactionClient).listQueues();
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
verify(sqsClient, never()).sendMessageBatch(any(Consumer.class));
verify(sqsClient, never()).sendMessageBatch(any(SendMessageBatchRequest.class));
}

@Test
Expand Down Expand Up @@ -223,7 +224,7 @@ void shouldBatchProcessAndFailWithExceptionForNonRetryableExceptionWhenFailedPar

verify(interactionClient).listQueues();
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
verify(sqsClient, never()).sendMessageBatch(any(Consumer.class));
verify(sqsClient, never()).sendMessageBatch(any(SendMessageBatchRequest.class));
}

@Test
Expand Down Expand Up @@ -264,7 +265,7 @@ void shouldBatchProcessAndMoveNonRetryableExceptionToDlqAndThrowException() thro

verify(interactionClient).listQueues();
verify(sqsClient).deleteMessageBatch(any(DeleteMessageBatchRequest.class));
verify(sqsClient).sendMessageBatch(any(Consumer.class));
verify(sqsClient).sendMessageBatch(any(SendMessageBatchRequest.class));
}

private void setupContext() {
Expand Down