revert a few changes

aws-cloudformation · Nov 28, 2020 · ad1e32b · ad1e32b
1 parent 33174ee
commit ad1e32b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/src/log-delivery.ts b/src/log-delivery.ts
@@ -126,7 +126,7 @@ export class CloudWatchLogPublisher extends LogPublisher {
         }
         try {
             // Delay to avoid throttling
-            await delay(0.1);
+            await delay(0.25);
             const record: InputLogEvent = {
                 message,
                 timestamp: Math.round(eventTime.getTime()),
@@ -222,6 +222,7 @@ export class CloudWatchLogPublisher extends LogPublisher {
  *   * logs:CreateLogGroup
  *   * logs:CreateLogStream
  *   * logs:DescribeLogGroups
+ *   * logs:DescribeLogStreams
  */
 export class CloudWatchLogHelper {
     private client: CloudWatchLogs;
@@ -261,7 +262,7 @@ export class CloudWatchLogHelper {
             );
             await this.emitMetricsForLoggingFailure(err);
         }
-        return Promise.resolve(null);
+        return null;
     }
 
     private async doesLogGroupExist(): Promise<boolean> {

diff --git a/src/metrics.ts b/src/metrics.ts
@@ -200,19 +200,25 @@ export class MetricsPublisherProxy {
         timestamp: Date,
         action: Action,
         error: Error
-    ): Promise<void> {
-        for (const publisher of this.publishers) {
-            await publisher.publishExceptionMetric(timestamp, action, error);
-        }
+    ): Promise<any> {
+        const promises: Array<Promise<void>> = this.publishers.map(
+            (publisher: MetricsPublisher) => {
+                return publisher.publishExceptionMetric(timestamp, action, error);
+            }
+        );
+        return await Promise.all(promises);
     }
 
     /**
      * Publishes a metric related to invocations to the list of publishers
      */
-    async publishInvocationMetric(timestamp: Date, action: Action): Promise<void> {
-        for (const publisher of this.publishers) {
-            await publisher.publishInvocationMetric(timestamp, action);
-        }
+    async publishInvocationMetric(timestamp: Date, action: Action): Promise<any> {
+        const promises: Array<Promise<void>> = this.publishers.map(
+            (publisher: MetricsPublisher) => {
+                return publisher.publishInvocationMetric(timestamp, action);
+            }
+        );
+        return await Promise.all(promises);
     }
 
     /**
@@ -222,10 +228,13 @@ export class MetricsPublisherProxy {
         timestamp: Date,
         action: Action,
         milliseconds: number
-    ): Promise<void> {
-        for (const publisher of this.publishers) {
-            await publisher.publishDurationMetric(timestamp, action, milliseconds);
-        }
+    ): Promise<any> {
+        const promises: Array<Promise<void>> = this.publishers.map(
+            (publisher: MetricsPublisher) => {
+                return publisher.publishDurationMetric(timestamp, action, milliseconds);
+            }
+        );
+        return await Promise.all(promises);
     }
 
     /**
@@ -234,9 +243,12 @@ export class MetricsPublisherProxy {
     async publishLogDeliveryExceptionMetric(
         timestamp: Date,
         error: Error
-    ): Promise<void> {
-        for (const publisher of this.publishers) {
-            await publisher.publishLogDeliveryExceptionMetric(timestamp, error);
-        }
+    ): Promise<any> {
+        const promises: Array<Promise<void>> = this.publishers.map(
+            (publisher: MetricsPublisher) => {
+                return publisher.publishLogDeliveryExceptionMetric(timestamp, error);
+            }
+        );
+        return await Promise.all(promises);
     }
 }