@aws-amplify/datastore 3.7.7-cloud-logging.9 → 3.7.7-cloud-logging.10

package/dist/aws-amplify-datastore.js

@@ -71142,7 +71142,7 @@ if (typeof window === 'undefined' || (typeof window === "undefined" ? "undefined
 }
 
 var logger = new _Logger__WEBPACK_IMPORTED_MODULE_2__["ConsoleLogger"]('AWSCloudWatch');
-var INTERVAL = 30000;
+var INTERVAL = 10000;
 
 var AWSCloudWatchProvider =
 /** @class */
@@ -71166,8 +71166,7 @@ function () {
 
       this._initialized = true;
     }
-  } // public static instance: AWSCloudWatchProvider;
-
+  }
 
   AWSCloudWatchProvider.prototype.getProviderName = function () {
     return AWSCloudWatchProvider.PROVIDER_NAME;
@@ -71440,7 +71439,7 @@ function () {
   };
 
   AWSCloudWatchProvider.prototype.pushLogs = function (logs) {
-    logger.debug('pushing log events to Cloudwatch buffer');
+    logger.debug('pushing log events to buffer');
     this._dataTracker.logEvents = this._dataTracker.logEvents.concat(logs);
   };
 
@@ -71854,6 +71853,41 @@ function () {
     });
   };
 
+  AWSCloudWatchProvider.prototype.truncateOversizedEvent = function (event) {
+    var timestamp = event.timestamp,
+        message = event.message;
+    var messageJson;
+
+    try {
+      messageJson = JSON.parse(message);
+      var truncated = JSON.stringify({
+        level: messageJson.level,
+        "class": messageJson["class"],
+        message: messageJson.message.substring(0, 500)
+      });
+
+      if (messageJson.data != null) {
+        truncated['data'] = "OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Truncated: " + JSON.stringify(messageJson.data).substring(0, 500);
+      }
+
+      return {
+        timestamp: timestamp,
+        message: truncated
+      };
+    } catch (error) {
+      logger.warn('Could not minify oversized event', error);
+      var truncated = JSON.stringify({
+        level: 'UNKNOWN',
+        "class": 'Unknown',
+        message: 'OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Could not parse event to truncate'
+      });
+      return {
+        timestamp: timestamp,
+        message: truncated
+      };
+    }
+  };
+
   AWSCloudWatchProvider.prototype._getBufferedBatchOfLogs = function () {
     /**
      * CloudWatch has restrictions on the size of the log events that get sent up.
@@ -71873,7 +71907,9 @@ function () {
       if (eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_MAX_EVENT_SIZE"]) {
         var errString = "Log entry exceeds maximum size for CloudWatch logs. Log size: " + eventSize + ". Truncating log message.";
         logger.warn(errString);
-        currentEvent.message = currentEvent.message.substring(0, eventSize);
+        currentEvent = this.truncateOversizedEvent(currentEvent);
+        this._dataTracker.logEvents[currentEventIdx] = currentEvent;
+        eventSize = new TextEncoder().encode(currentEvent.message).length + _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_BASE_BUFFER_SIZE"];
       }
 
       if (totalByteSize + eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE"]) break;