stagger FilterLogEvents API calls to prevent throttling exceptions (#2597)

Author: Amplifiyer

.changeset/eighty-items-repeat.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/sandbox': patch
+---
+
+stagger FilterLogEvents API calls to prevent throttling exceptions

packages/sandbox/src/cloudwatch_logs_monitor.test.ts

@@ -55,7 +55,7 @@ void describe('LambdaFunctionLogStreamer', () => {
     classUnderTest.addLogGroups('logFriendlyName2', 'logGroupName2');
     classUnderTest.activate();
     // wait just a bit to let the logs streamer run before deactivating it
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1100));
     classUnderTest.pause();
 
     assert.strictEqual(mockedWrite.mock.callCount(), 4);
@@ -137,8 +137,9 @@ void describe('LambdaFunctionLogStreamer', () => {
 
     classUnderTest.addLogGroups('logFriendlyName1', 'logGroupName1');
     classUnderTest.activate();
-    // wait for just over two seconds to let the logs streamer get both the events before deactivating it
-    await new Promise((resolve) => setTimeout(resolve, 2100));
+    // wait for just 1 second to make the API calls and just over two seconds
+    // to let the logs streamer get both the events before deactivating it
+    await new Promise((resolve) => setTimeout(resolve, 3100));
     classUnderTest.pause();
 
     assert.strictEqual(mockedWrite.mock.callCount(), 2);
@@ -204,7 +205,7 @@ void describe('LambdaFunctionLogStreamer', () => {
     classUnderTest.addLogGroups('logFriendlyName1', 'logGroupName1');
     classUnderTest.activate();
     // wait just a bit to let the logs streamer run before deactivating it
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 1100));
     classUnderTest.pause();
 
     // 100 events + 1 informational for the user that 100 messages limit is hit
@@ -258,7 +259,7 @@ void describe('LambdaFunctionLogStreamer', () => {
     classUnderTest.addLogGroups('logFriendlyName1', 'logGroupName1');
     // activate it again and it should fetch the second event now
     classUnderTest.activate();
-    await new Promise((resolve) => setTimeout(resolve, 100));
+    await new Promise((resolve) => setTimeout(resolve, 600));
     classUnderTest.pause();
 
     assert.strictEqual(mockedWrite.mock.callCount(), 2);

packages/sandbox/src/cloudwatch_logs_monitor.ts

@@ -192,11 +192,14 @@ export class CloudWatchLogEventMonitor {
    * Reads all new log events from a set of CloudWatch Log Groups in parallel
    */
   private readNewEvents = async (): Promise<Array<CloudWatchLogEvent>> => {
-    const promises: Array<Promise<Array<CloudWatchLogEvent>>> = [];
+    const results: Array<Array<CloudWatchLogEvent>> = [];
     for (const logGroup of this.allLogGroups) {
-      promises.push(this.readEventsFromLogGroup(logGroup));
+      results.push(await this.readEventsFromLogGroup(logGroup));
+      // There is a hard limit on TPS for `FilterLogEvents` API that is Account wide.
+      // We don't want to get throttled is customers are filtering for a lot of functions.
+      await new Promise((resolve) => setTimeout(resolve, 500));
     }
-    return (await Promise.all(promises)).flat();
+    return results.flat();
   };
 
   /**