@aws-amplify/datastore 3.7.9-api-logging.2 → 3.7.9-api-logging.4

package/dist/aws-amplify-datastore.js

@@ -70083,10 +70083,7 @@ function () {
     try {
       for (var _b = __values(ConsoleLogger.pluggables), _c = _b.next(); !_c.done; _c = _b.next()) {
         var pluggable = _c.value;
-
-        var event_1 = this._generateGenericEvent(type, msg);
-
-        pluggable.pushLog(event_1);
+        pluggable.pushLogs([this._generateLoggerEvent(type, msg)]);
       }
     } catch (e_1_1) {
       e_1 = {
@@ -70101,9 +70098,10 @@ function () {
     }
   };
 
-  ConsoleLogger.prototype._generateGenericEvent = function (type, msg) {
+  ConsoleLogger.prototype._generateLoggerEvent = function (type, msg) {
     var strMessage = '';
     var data;
+    var error;
 
     if (msg.length === 1 && typeof msg[0] === 'string') {
       strMessage = msg[0];
@@ -70117,19 +70115,29 @@ function () {
       }
 
       strMessage = msg[0];
+
+      if (obj instanceof Error) {
+        error = {
+          message: obj.message,
+          name: obj.name
+        };
+      }
+
       data = obj;
     } else {
       data = msg;
     }
 
-    var event = {
-      data: data,
-      level: type,
+    return {
       message: strMessage,
-      source: this.name,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      loggerInfo: {
+        level: type.toLowerCase(),
+        name: this.name,
+        data: data,
+        error: error
+      }
     };
-    return event;
   };
   /**
    * Write log
@@ -71187,10 +71195,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _loggerConnectivity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./loggerConnectivity */ "../core/lib-esm/Providers/APIProvider/loggerConnectivity.js");
 /* harmony import */ var _types_types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../types/types */ "../core/lib-esm/types/types.js");
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../ */ "../core/lib-esm/index.js");
-/* harmony import */ var _CloudWatchEventFormatter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./CloudWatchEventFormatter */ "../core/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js");
-/* harmony import */ var _Fetch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Fetch */ "../core/lib-esm/Providers/APIProvider/Fetch.js");
-/* harmony import */ var _Util_Constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../Util/Constants */ "../core/lib-esm/Util/Constants.js");
-/* harmony import */ var _Util_StringUtils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../Util/StringUtils */ "../core/lib-esm/Util/StringUtils.js");
+/* harmony import */ var _Fetch__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Fetch */ "../core/lib-esm/Providers/APIProvider/Fetch.js");
+/* harmony import */ var _Util_Constants__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../Util/Constants */ "../core/lib-esm/Util/Constants.js");
+/* harmony import */ var _Util_StringUtils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../Util/StringUtils */ "../core/lib-esm/Util/StringUtils.js");
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -71201,6 +71208,22 @@ function _typeof(obj) {
   }, _typeof(obj);
 }
 
+var __assign = undefined && undefined.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = undefined && undefined.__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -71386,7 +71409,6 @@ var __spread = undefined && undefined.__spread || function () {
 
 
 
-
 var logger = new _Logger__WEBPACK_IMPORTED_MODULE_0__["ConsoleLogger"]('APILoggingProvider');
 var HTTPS = 'https';
 var LOCALHOST = 'http://localhost';
@@ -71434,28 +71456,50 @@ function () {
     }
   };
 
-  APILoggingProvider.prototype.pushLog = function (event) {
+  APILoggingProvider.prototype.pushLogs = function (events) {
+    var _this = this;
+
     var _a;
 
     if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.enabled) === false) {
       return;
     }
 
-    if (!this.verifyEvent(event)) {
-      return;
-    }
+    events.forEach(function (event) {
+      if (!Object(_types_types__WEBPACK_IMPORTED_MODULE_2__["isLoggerEvent"])(event)) {
+        return;
+      }
 
-    switch (this.config.eventFormat) {
-      case _types_types__WEBPACK_IMPORTED_MODULE_2__["EVENT_FORMAT"].CLOUDWATCH:
-        var cloudWatchEvent = Object(_CloudWatchEventFormatter__WEBPACK_IMPORTED_MODULE_4__["cloudWatchEventFromGeneric"])(event);
-        this.eventBuffer.push(cloudWatchEvent);
-        break;
+      var message = event.message,
+          timestamp = event.timestamp,
+          _a = event.loggerInfo,
+          level = _a.level,
+          data = _a.data,
+          name = _a.name,
+          _b = _a.error,
+          _c = _b === void 0 ? {} : _b,
+          errorMessage = _c.message,
+          errorName = _c.name;
+
+      var error = errorName && errorMessage && {
+        errorMessage: errorMessage,
+        errorName: errorName
+      };
+      var combinedEvent = {
+        level: level,
+        error: error,
+        message: message,
+        context: {
+          category: name,
+          data: __assign(__assign({}, data), _this.config.metadata),
+          logTime: timestamp
+        }
+      };
 
-      case _types_types__WEBPACK_IMPORTED_MODULE_2__["EVENT_FORMAT"].GENERIC:
-      default:
-        this.eventBuffer.push(event);
-        break;
-    }
+      if (_this.verifyEvent(combinedEvent)) {
+        _this.eventBuffer.push(combinedEvent);
+      }
+    });
   };
 
   APILoggingProvider.prototype.validateConfig = function (config) {
@@ -71472,7 +71516,7 @@ function () {
   };
 
   APILoggingProvider.prototype.normalizeConfig = function (config) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
 
     var normalizedConfig = {
       endpoint: config.endpoint,
@@ -71480,8 +71524,7 @@ function () {
       metadata: config.metadata,
       enabled: (_a = config.enabled) !== null && _a !== void 0 ? _a : true,
       level: (_b = config.level) !== null && _b !== void 0 ? _b : _Logger__WEBPACK_IMPORTED_MODULE_0__["LOG_TYPE"].WARN,
-      eventFormat: (_c = config.eventFormat) !== null && _c !== void 0 ? _c : _types_types__WEBPACK_IMPORTED_MODULE_2__["EVENT_FORMAT"].CLOUDWATCH,
-      bufferInterval: (_d = config.bufferInterval) !== null && _d !== void 0 ? _d : DEFAULT_INTERVAL,
+      bufferInterval: (_c = config.bufferInterval) !== null && _c !== void 0 ? _c : DEFAULT_INTERVAL,
       excludeClassList: config.excludeClassList instanceof Array ? __spread(DEFAULT_CLASS_EXCLUDE_LIST, config.excludeClassList) : DEFAULT_CLASS_EXCLUDE_LIST
     };
     return normalizedConfig;
@@ -71580,7 +71623,7 @@ function () {
 
   APILoggingProvider.prototype.verifyEvent = function (event) {
     var level = event.level,
-        source = event.source;
+        context = event.context;
     var configLevelValue = _Logger__WEBPACK_IMPORTED_MODULE_0__["LOG_LEVELS"][this.config.level];
     var eventLevelValue = _Logger__WEBPACK_IMPORTED_MODULE_0__["LOG_LEVELS"][level];
 
@@ -71588,7 +71631,7 @@ function () {
       return false;
     }
 
-    if (this.config.excludeClassList.includes(source)) {
+    if (this.config.excludeClassList.includes(context.category)) {
       return false;
     }
 
@@ -71604,7 +71647,7 @@ function () {
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            eventBatch = this.generateEventBatch(this.eventBuffer);
+            eventBatch = this.genericLogEventBatch(this.eventBuffer);
 
             if (eventBatch.length < 1) {
               return [2
@@ -71613,15 +71656,14 @@ function () {
             }
 
             body = {
-              logEvents: eventBatch,
-              metadata: this.config.metadata
+              logs: eventBatch
             };
-            options = Object(_Fetch__WEBPACK_IMPORTED_MODULE_5__["postOptions"])(body);
+            options = Object(_Fetch__WEBPACK_IMPORTED_MODULE_4__["postOptions"])(body);
             return [4
             /*yield*/
             , Object(___WEBPACK_IMPORTED_MODULE_3__["jitteredExponentialRetry"])(function (endpoint, options) {
               return __awaiter(_this, void 0, void 0, function () {
-                var res, error_2;
+                var error_2;
                 return __generator(this, function (_a) {
                   switch (_a.label) {
                     case 0:
@@ -71632,8 +71674,9 @@ function () {
                       , fetch(endpoint, options)];
 
                     case 1:
-                      res = _a.sent();
-                      if (!res.ok) throw new Error("Request Failed. Status: " + res.status + " - " + res.statusText);
+                      _a.sent(); // fetch doesnt return info for no-cors request
+
+
                       return [3
                       /*break*/
                       , 3];
@@ -71671,24 +71714,13 @@ function () {
     });
   };
 
-  APILoggingProvider.prototype.generateEventBatch = function (buffer) {
-    switch (this.config.eventFormat) {
-      case _types_types__WEBPACK_IMPORTED_MODULE_2__["EVENT_FORMAT"].CLOUDWATCH:
-        return Object(_CloudWatchEventFormatter__WEBPACK_IMPORTED_MODULE_4__["cloudWatchLogEventBatch"])(buffer);
-
-      case _types_types__WEBPACK_IMPORTED_MODULE_2__["EVENT_FORMAT"].GENERIC:
-      default:
-        return this.genericLogEventBatch(buffer);
-    }
-  };
-
   APILoggingProvider.prototype.genericLogEventBatch = function (buffer) {
     var totalByteSize = 0;
     var currentEventIdx = 0;
 
     while (currentEventIdx < buffer.length) {
       var currentEvent = buffer[currentEventIdx];
-      var eventSize = Object(_Util_StringUtils__WEBPACK_IMPORTED_MODULE_7__["getStringByteSize"])(JSON.stringify(currentEvent));
+      var eventSize = Object(_Util_StringUtils__WEBPACK_IMPORTED_MODULE_6__["getStringByteSize"])(JSON.stringify(currentEvent));
 
       if (totalByteSize + eventSize > LAMBDA_PAYLOAD_LIMIT) {
         break;
@@ -71701,115 +71733,13 @@ function () {
     return buffer.slice(0, currentEventIdx);
   };
 
-  APILoggingProvider.PROVIDER_NAME = _Util_Constants__WEBPACK_IMPORTED_MODULE_6__["API_LOGGING_PROVIDER_NAME"];
-  APILoggingProvider.CATEGORY = _Util_Constants__WEBPACK_IMPORTED_MODULE_6__["API_LOGGING_PROVIDER_CATEGORY"];
+  APILoggingProvider.PROVIDER_NAME = _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["API_LOGGING_PROVIDER_NAME"];
+  APILoggingProvider.CATEGORY = _Util_Constants__WEBPACK_IMPORTED_MODULE_5__["API_LOGGING_PROVIDER_CATEGORY"];
   return APILoggingProvider;
 }();
 
 
 
-/***/ }),
-
-/***/ "../core/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js":
-/*!*************************************************************************!*\
-  !*** ../core/lib-esm/Providers/APIProvider/CloudWatchEventFormatter.js ***!
-  \*************************************************************************/
-/*! exports provided: cloudWatchEventFromGeneric, truncateOversizedEvent, cloudWatchLogEventBatch */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cloudWatchEventFromGeneric", function() { return cloudWatchEventFromGeneric; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "truncateOversizedEvent", function() { return truncateOversizedEvent; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cloudWatchLogEventBatch", function() { return cloudWatchLogEventBatch; });
-/* harmony import */ var _Util_Constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../Util/Constants */ "../core/lib-esm/Util/Constants.js");
-/* harmony import */ var ___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../ */ "../core/lib-esm/index.js");
-var __rest = undefined && undefined.__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-
-
-
-var logger = new ___WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('APILoggingProvider');
-var TRUNCATE_MAX_LENGTH = 5000;
-var cloudWatchEventFromGeneric = function cloudWatchEventFromGeneric(event) {
-  var timestamp = event.timestamp,
-      message = __rest(event, ["timestamp"]);
-
-  return {
-    timestamp: timestamp,
-    message: JSON.stringify(message)
-  };
-};
-var truncateOversizedEvent = function truncateOversizedEvent(event) {
-  var timestamp = event.timestamp,
-      message = event.message;
-
-  try {
-    var messageJson = JSON.parse(message);
-    var truncatedObj = {
-      level: messageJson.level,
-      "class": messageJson["class"],
-      message: messageJson.message.substring(0, TRUNCATE_MAX_LENGTH)
-    };
-
-    if (messageJson.data != null) {
-      truncatedObj['data'] = "OBJECT SIZE EXCEEDS CLOUDWATCH EVENT LIMIT. Truncated: " + JSON.stringify(messageJson.data).substring(0, TRUNCATE_MAX_LENGTH);
-    }
-
-    return {
-      timestamp: timestamp,
-      message: JSON.stringify(truncatedObj)
-    };
-  } catch (error) {
-    logger.warn('Could not truncate 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
-    };
-  }
-};
-var cloudWatchLogEventBatch = function cloudWatchLogEventBatch(buffer) {
-  var totalByteSize = 0;
-  var currentEventIdx = 0;
-
-  while (currentEventIdx < buffer.length) {
-    var currentEvent = buffer[currentEventIdx];
-    var eventSize = Object(___WEBPACK_IMPORTED_MODULE_1__["getStringByteSize"])(currentEvent.message) + _Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_BASE_BUFFER_SIZE"];
-
-    if (eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_MAX_EVENT_SIZE"]) {
-      var errString = "Log event exceeds maximum size for CloudWatch logs. Log size: " + eventSize + ". Truncating log message.";
-      logger.debug(errString);
-      currentEvent = truncateOversizedEvent(currentEvent);
-      buffer[currentEventIdx] = currentEvent;
-      eventSize = new TextEncoder().encode(currentEvent.message).length + _Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_BASE_BUFFER_SIZE"];
-    }
-
-    if (totalByteSize + eventSize > _Util_Constants__WEBPACK_IMPORTED_MODULE_0__["AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE"]) {
-      break;
-    }
-
-    totalByteSize += eventSize;
-    currentEventIdx += 1;
-  }
-
-  return buffer.slice(0, currentEventIdx);
-};
-
 /***/ }),
 
 /***/ "../core/lib-esm/Providers/APIProvider/Fetch.js":
@@ -71825,7 +71755,7 @@ __webpack_require__.r(__webpack_exports__);
 var postOptions = function postOptions(body) {
   return {
     method: 'POST',
-    mode: 'cors',
+    mode: 'no-cors',
     cache: 'no-cache',
     credentials: 'same-origin',
     headers: {
@@ -72442,7 +72372,15 @@ function () {
 
   AWSCloudWatchProvider.prototype.pushLogs = function (logs) {
     logger.debug('pushing log events to Cloudwatch...');
-    this._dataTracker.logEvents = __spread(this._dataTracker.logEvents, logs);
+    var formattedLogs = logs.map(function (_a) {
+      var message = _a.message,
+          timestamp = _a.timestamp;
+      return {
+        message: message,
+        timestamp: timestamp
+      };
+    });
+    this._dataTracker.logEvents = __spread(this._dataTracker.logEvents, formattedLogs);
   };
 
   AWSCloudWatchProvider.prototype._validateLogGroupExistsAndCreate = function (logGroupName) {
@@ -75017,18 +74955,17 @@ var Constants = {
 /*!**************************************!*\
   !*** ../core/lib-esm/types/types.js ***!
   \**************************************/
-/*! exports provided: EVENT_FORMAT */
+/*! exports provided: isLoggerEvent */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EVENT_FORMAT", function() { return EVENT_FORMAT; });
-var EVENT_FORMAT;
-
-(function (EVENT_FORMAT) {
-  EVENT_FORMAT["GENERIC"] = "GENERIC";
-  EVENT_FORMAT["CLOUDWATCH"] = "CLOUDWATCH";
-})(EVENT_FORMAT || (EVENT_FORMAT = {}));
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isLoggerEvent", function() { return isLoggerEvent; });
+function isLoggerEvent(inputLogEvent) {
+  return inputLogEvent && !!Object.keys(inputLogEvent).find(function (k) {
+    return k === 'loggerInfo';
+  });
+}
 
 /***/ }),