From d6c26df63bc229c27de3fb7ac771d360ef05dfbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?=
 <osergiosiqueira@gmail.com>
Date: Sat, 1 Nov 2025 15:57:43 -0300
Subject: [PATCH] fix timeout bug

---
 .../app/events/reporting/send_report_email.py        | 11 ++++++++---
 enrollments-events/template.yaml                     |  1 +
 orders-events/app/events/billing/close_window.py     | 11 ++++++++---
 orders-events/template.yaml                          |  5 ++---
 streams-events/template.yaml                         | 12 ++++++------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/enrollments-events/app/events/reporting/send_report_email.py b/enrollments-events/app/events/reporting/send_report_email.py
index bda20aa..b5743ba 100644
--- a/enrollments-events/app/events/reporting/send_report_email.py
+++ b/enrollments-events/app/events/reporting/send_report_email.py
@@ -77,9 +77,14 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         },
         cls=Encoder,
     )
-    # Send template URI and data to Paperforge API to generate a PDF
-    r = requests.post(PAPERFORGE_API, data=json_data)
-    r.raise_for_status()
+
+    try:
+        # Send template URI and data to Paperforge API to generate a PDF
+        r = requests.post(PAPERFORGE_API, data=json_data, timeout=6)
+        r.raise_for_status()
+    except requests.exceptions.Timeout:
+        logger.info('The request timed out')
+        raise
 
     emailmsg = Message(
         from_=EMAIL_SENDER,
diff --git a/enrollments-events/template.yaml b/enrollments-events/template.yaml
index 6d6dfd8..4608fb8 100644
--- a/enrollments-events/template.yaml
+++ b/enrollments-events/template.yaml
@@ -366,6 +366,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: events.reporting.send_report_email.lambda_handler
+      Timeout: 12
       LoggingConfig:
         LogGroup: !Ref EventLog
       Policies:
diff --git a/orders-events/app/events/billing/close_window.py b/orders-events/app/events/billing/close_window.py
index dbd34a2..5e3c052 100644
--- a/orders-events/app/events/billing/close_window.py
+++ b/orders-events/app/events/billing/close_window.py
@@ -47,9 +47,14 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
         },
         cls=Encoder,
     )
-    # Send template URI and data to Paperforge API to generate a PDF
-    r = requests.post(PAPERFORGE_API, data=json_data)
-    r.raise_for_status()
+
+    try:
+        # Send template URI and data to Paperforge API to generate a PDF
+        r = requests.post(PAPERFORGE_API, data=json_data, timeout=6)
+        r.raise_for_status()
+    except requests.exceptions.Timeout:
+        logger.info('The request timed out')
+        raise
 
     object_key = f'billing/{org_id}/{start_date}_{end_date}.pdf'
     s3_uri = f's3://{BUCKET_NAME}/{object_key}'
diff --git a/orders-events/template.yaml b/orders-events/template.yaml
index 90296ad..9686803 100644
--- a/orders-events/template.yaml
+++ b/orders-events/template.yaml
@@ -26,7 +26,7 @@ Globals:
     Architectures:
       - x86_64
     Layers:
-      - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:99
+      - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:100
     Environment:
       Variables:
         TZ: America/Sao_Paulo
@@ -102,7 +102,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: events.billing.close_window.lambda_handler
-      Timeout: 26
+      Timeout: 12
       LoggingConfig:
         LogGroup: !Ref EventLog
       Policies:
@@ -128,7 +128,6 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       Handler: events.billing.send_email_on_closing.lambda_handler
-      Timeout: 26
       LoggingConfig:
         LogGroup: !Ref EventLog
       Policies:
diff --git a/streams-events/template.yaml b/streams-events/template.yaml
index 890eb14..8d19bee 100644
--- a/streams-events/template.yaml
+++ b/streams-events/template.yaml
@@ -8,7 +8,7 @@ Globals:
     Architectures:
       - x86_64
     Layers:
-      - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:99
+      - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:100
     Environment:
       Variables:
         LOG_LEVEL: DEBUG
@@ -27,17 +27,17 @@ Resources:
   MeilisearchLog:
     Type: AWS::Logs::LogGroup
     Properties:
-      RetentionInDays: 90
+      RetentionInDays: 30
 
   EventBusLog:
     Type: AWS::Logs::LogGroup
     Properties:
-      RetentionInDays: 90
+      RetentionInDays: 30
 
-  EventPostgresLog:
+  PostgresLog:
     Type: AWS::Logs::LogGroup
     Properties:
-      RetentionInDays: 90
+      RetentionInDays: 30
 
   EventIndexDocsIntoMeiliFunction:
     Type: AWS::Serverless::Function
@@ -131,7 +131,7 @@ Resources:
     Properties:
       Handler: events.replicate_into_postgres.lambda_handler
       LoggingConfig:
-        LogGroup: !Ref EventPostgresLog
+        LogGroup: !Ref PostgresLog
       Events:
         Users:
           Type: DynamoDB