fix consumer

Signed-off-by: Dev Singh <[email protected]>

Author: devksingh4

cloudformation/main.yml

@@ -22,6 +22,14 @@ Parameters:
     Default: false
     Type: String
     AllowedValues: [true, false]
+  SqsLambdaTimeout:
+    Description: How long the SQS lambda is permitted to run (in seconds)
+    Default: 300
+    Type: Number
+  SqsMessageTimeout:
+    Description: MessageVisibilityTimeout for the SQS Lambda queue (should be at least 6xSqsLambdaTimeout)
+    Default: 1800
+    Type: Number
 
 Conditions:
   IsProd: !Equals [!Ref RunEnvironment, 'prod']
@@ -89,7 +97,7 @@ Resources:
       Location: ./sqs.yml
       Parameters:
         QueueName: !Sub ${ApplicationPrefix}-sqs
-
+        MessageTimeout: !Ref SqsMessageTimeout
 
   IcalDomainProxy:
     Type: AWS::Serverless::Application
@@ -171,7 +179,7 @@ Resources:
       Handler: index.handler
       MemorySize: 512
       Role: !GetAtt AppSecurityRoles.Outputs.MainFunctionRoleArn
-      Timeout: 900
+      Timeout: !Ref SqsLambdaTimeout
       LoggingConfig:
         LogGroup: !Sub /aws/lambda/${ApplicationPrefix}-lambda
       Environment:
@@ -390,6 +398,23 @@ Resources:
         - Name: 'ApiName'
           Value: !Sub ${ApplicationPrefix}-gateway
 
+
+  AppDLQMessagesAlarm:
+    Type: 'AWS::CloudWatch::Alarm'
+    Condition: IsProd
+    Properties:
+      AlarmName: !Sub ${ApplicationPrefix}-sqs-dlq
+      AlarmDescription: 'Items are present in the application DLQ, meaning some messages failed to process.'
+      Namespace: 'AWS/SQS'
+      MetricName: 'ApproximateNumberOfMessagesVisible'
+      Statistic: 'SUM'
+      Period: '60'
+      EvaluationPeriods: '1'
+      ComparisonOperator: 'GreaterThanThreshold'
+      Threshold: '0'
+      AlarmActions:
+        - !Ref AlertSNSArn
+
   APILambdaPermission:
     Type: AWS::Lambda::Permission
     Properties:

cloudformation/sqs.yml

@@ -5,15 +5,19 @@ Parameters:
   QueueName:
     Type: String
     AllowedPattern: ^[a-zA-Z0-9]+[a-zA-Z0-9-]+[a-zA-Z0-9]+$
+  MessageTimeout:
+    Type: Number
 Resources:
   AppDLQ:
     Type: AWS::SQS::Queue
     Properties:
       QueueName: !Sub ${QueueName}-dlq
+      VisibilityTimeout: !Ref MessageTimeout
   AppQueue:
     Type: AWS::SQS::Queue
     Properties:
       QueueName: !Ref QueueName
+      VisibilityTimeout: !Ref MessageTimeout
       RedrivePolicy:
         deadLetterTargetArn:
           Fn::GetAtt:

src/api/sqs/index.ts

@@ -54,6 +54,7 @@ export const handler = middy()
         return func(parsedBody.payload, parsedBody.metadata, childLogger);
       } catch (e: any) {
         logger.error({ sqsMessageId: record.messageId }, e.toString());
+        throw e;
       }
     });
     return Promise.allSettled(recordsPromises);