Skip to content

CCM-16073 - Attempt at fixing runaway lambdas #174

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

Merged
rhyscoxnhs merged 1 commit into from
May 1, 2026
Merged

CCM-16073 - Attempt at fixing runaway lambdas #174

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lambdas/https-client-lambda/src/__tests__/handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,7 @@ describe("processRecords", () => {

expect(failures).toEqual([{ itemIdentifier: "msg-1" }]);
const visibilityDelay = mockChangeVisibility.mock.calls[0]![1] as number;
expect(visibilityDelay).toBeGreaterThanOrEqual(2);
expect(visibilityDelay).toBeLessThanOrEqual(6);
expect(visibilityDelay).toBe(2);
expect(mockSendToDlq).not.toHaveBeenCalled();
expect(mockDeliverPayload).not.toHaveBeenCalled();
});
Expand All @@ -391,8 +390,7 @@ describe("processRecords", () => {

expect(failures).toEqual([{ itemIdentifier: "msg-1" }]);
const visibilityDelay = mockChangeVisibility.mock.calls[0]![1] as number;
expect(visibilityDelay).toBeGreaterThanOrEqual(30);
expect(visibilityDelay).toBeLessThanOrEqual(34);
expect(visibilityDelay).toBe(30);
expect(mockSendToDlq).not.toHaveBeenCalled();
expect(mockDeliverPayload).not.toHaveBeenCalled();
});
Expand Down
12 changes: 7 additions & 5 deletions lambdas/https-client-lambda/src/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,14 @@ async function handleBatchDenied(
reason: string,
retryAfterMs: number,
): Promise<TargetBatchResult> {
const delaySec = Math.ceil(retryAfterMs / 1000);
const baseDelaySec = Math.max(1, Math.ceil(retryAfterMs / 1000));
const correlationIds = batch.messages.map((m) => extractCorrelationId(m));
recordAdmissionDenied(clientId, batch.targetId, reason, correlationIds);
const failures: SQSBatchItemFailure[] = [];
for (const record of batch.records) {
// eslint-disable-next-line sonarjs/pseudo-random -- jitter for backoff, not security-sensitive
const jitterSec = Math.floor(Math.random() * 5);
await changeVisibility(record.receiptHandle, delaySec + jitterSec);
const receiveCount = Number(record.attributes.ApproximateReceiveCount);
const delaySec = receiveCount * baseDelaySec;
await changeVisibility(record.receiptHandle, delaySec);
failures.push({ itemIdentifier: record.messageId });
}
return { failures, deliveredCount: 0, dlqCount: 0 };
Expand Down Expand Up @@ -362,7 +362,9 @@ async function processTargetBatch(
rejectedCorrelationIds,
);
for (const record of rejected) {
await changeVisibility(record.receiptHandle, 1);
const receiveCount = Number(record.attributes.ApproximateReceiveCount);
const delaySec = receiveCount * 1;
await changeVisibility(record.receiptHandle, delaySec);
failures.push({ itemIdentifier: record.messageId });
}
}
Expand Down
Loading