notification-processor 4.19.3 → 4.19.5

package/lib/exceptions/ignored.error.js

@@ -0,0 +1,27 @@
+"use strict";
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+// Generated by CoffeeScript 2.7.0
+(function () {
+  var IgnoredError;
+
+  module.exports = IgnoredError = function () {
+    var IgnoredError = function IgnoredError(message, cause) {
+      _classCallCheck(this, IgnoredError);
+
+      this.cause = cause;
+      this.name = this.constructor.name;
+      this.message = message;
+      this.stack = new Error().stack;
+    };
+
+    ;
+
+    IgnoredError.prototype = new Error();
+
+    IgnoredError.prototype.constructor = IgnoredError;
+
+    return IgnoredError;
+  }.call(this);
+}).call(undefined);

package/lib/observers/monitoringCenter.observer.js

@@ -6,7 +6,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var AWS, MonitoringCenterObserver, Promise, _, debug, moment, retry;
+  var AWS, MESSAGE_PROPERTIES, MonitoringCenterObserver, Promise, TYPE_PROPERTIES, _, debug, moment, retry;
 
   _ = require("lodash");
 
@@ -20,6 +20,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
   moment = require("moment");
 
+  TYPE_PROPERTIES = ["cause.type", "type"];
+
+  MESSAGE_PROPERTIES = ["cause.message", "message"];
+
   module.exports = MonitoringCenterObserver = function () {
     function MonitoringCenterObserver(_ref) {
       var sender = _ref.sender,
@@ -36,7 +40,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
       _classCallCheck(this, MonitoringCenterObserver);
 
-      this.uploadTrackingFile = this.uploadTrackingFile.bind(this);
+      this.registerRecord = this.registerRecord.bind(this);
       this.sender = sender;
       this.clientId = clientId;
       this.app = app1;
@@ -53,28 +57,26 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         var _this = this;
 
         observable.on("unsuccessful_non_retryable", function (payload) {
-          return _this.uploadTrackingFile(payload, "unsuccessful_non_retryable");
+          return _this.registerRecord(payload, "unsuccessful");
         });
         observable.on("unsuccessful", function (payload) {
-          return _this.uploadTrackingFile(payload, "unsuccessful");
+          return _this.registerRecord(payload, "unsuccessful");
         });
         observable.on("started", function (payload) {
-          return _this.uploadTrackingFile(payload, "pending");
+          return _this.registerRecord(payload, "pending");
         });
         return observable.on("successful", function (payload) {
-          return _this.uploadTrackingFile(payload, "successful");
+          return _this.registerRecord(payload, "successful");
         });
       }
     }, {
-      key: "uploadTrackingFile",
-      value: function uploadTrackingFile(_ref2, executionStatus) {
+      key: "registerRecord",
+      value: function registerRecord(payload, executionStatus) {
         var _this2 = this;
 
-        var id = _ref2.id,
-            notification = _ref2.notification,
-            error = _ref2.error;
-
-        return this._mapper(id, notification, error, executionStatus).then(function (record) {
+        return this._mapper(_.merge({ executionStatus: executionStatus }, payload)).tap(function (record) {
+          return debug("Record to save in firehose %s %j", _this2.deliveryStream, record);
+        }).then(function (record) {
           var __uploadToFirehose, uploadParams;
           if (_.isEmpty(record)) {
             return;
@@ -85,25 +87,31 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               Data: JSON.stringify(record)
             }
           };
-          debug("Uploading file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
+          debug("Uploading record " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
           __uploadToFirehose = function __uploadToFirehose() {
             return _this2.uploadToFirehose(uploadParams);
           };
           return retry(__uploadToFirehose, {
             throw_original: true
           }).tap(function () {
-            return debug("Uploaded file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
+            return debug("Uploaded record " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName);
           }).catch(function (e) {
             // We'll do nothing with this error
-            return debug("Error uploading file " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName + " %o", e);
+            return debug("Error uploading record " + record.event + "/" + record.id + " to firehose delivery stream " + uploadParams.DeliveryStreamName + " %o", e);
           });
         });
       }
     }, {
       key: "_mapper",
-      value: function _mapper(id, notification, err, executionStatus) {
+      value: function _mapper(_ref2) {
         var _this3 = this;
 
+        var id = _ref2.id,
+            notification = _ref2.notification,
+            error = _ref2.error,
+            warnings = _ref2.warnings,
+            executionStatus = _ref2.executionStatus;
+
         return Promise.method(this.sender.monitoringCenterFields.bind(this.sender))(notification).then(function (_ref3) {
           var eventType = _ref3.eventType,
               resource = _ref3.resource,
@@ -122,9 +130,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           if (!eventId) {
             return Promise.resolve({});
           }
-          theRequest = _.get(err, "detail.request") || _.get(err, "cause.detail.request");
-          errorType = _this3._retrieveMessageFromError(err, ["cause.type", "type"], "unknown");
-          errorMessage = _this3._retrieveMessageFromError(err, ["cause.message", "message"], "");
+          theRequest = _.get(error, "detail.request") || _.get(error, "cause.detail.request");
+          errorType = _this3._retrieveMessageFromError(error, TYPE_PROPERTIES, "unknown");
+          errorMessage = _this3._retrieveMessageFromError(error, MESSAGE_PROPERTIES, "");
           now = new Date();
           return {
             id: id,
@@ -147,9 +155,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               clientId: _this3.clientId,
               job: _this3.job,
               app: _this3.app,
-              error: _.omit(err, ["detail.request", "cause.detail.request"]),
+              error: _.omit(error, ["detail.request", "cause.detail.request"]),
               request: _.omit(theRequest, _.castArray(_this3.propertiesToOmit).concat("auth")),
-              tags: _.get(err, "tags", []),
+              tags: _.get(error, "tags", []),
               message: partialMessage || notification.message
             }),
             status: executionStatus,
@@ -158,17 +166,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             // Generic app fields
             event_timestamp: eventTimestamp || now.getTime(),
             error_type: errorType,
+            output_message: errorMessage,
             user_settings_version: null, //TODO
             env_version: null, //TODO
-            code_version: null //TODO
+            code_version: null, //TODO
+            warnings: warnings != null ? warnings.map(function (warning) {
+              return {
+                type: _this3._retrieveMessageFromError(warning, TYPE_PROPERTIES, "unknown"),
+                message: _this3._retrieveMessageFromError(warning, MESSAGE_PROPERTIES, "")
+              };
+            }) : void 0
           };
         });
       }
     }, {
       key: "_retrieveMessageFromError",
-      value: function _retrieveMessageFromError(err, properties, defaultValue) {
-        return err && _(properties).map(function (property) {
-          return _.get(err, property);
+      value: function _retrieveMessageFromError(error, properties, defaultValue) {
+        return error && _(properties).map(function (property) {
+          return _.get(error, property);
         }).reject(_.isEmpty).get(0, defaultValue);
       }
     }]);

package/lib/processor.js

@@ -12,6 +12,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 (function () {
   var ENABLE_EVENTS,
       EventEmitter,
+      IgnoredError,
       NonRetryable,
       Processor,
       Promise,
@@ -28,6 +29,8 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
   NonRetryable = require("./exceptions/non.retryable");
 
+  IgnoredError = require("./exceptions/ignored.error");
+
   EventEmitter = require("events");
 
   Promise = require("bluebird");
@@ -93,6 +96,13 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
         };
         execute().tap(function () {
           return _this2._emitEvent("successful", { context: context, id: id, notification: notification });
+        }).catch(IgnoredError, function (error) {
+          return _this2._emitEvent("successful", {
+            context: context,
+            id: id,
+            notification: notification,
+            warnings: [error]
+          });
         }).catch(function (error) {
           if (!(error instanceof NonRetryable)) {
             throw error;

package/lib/processors/request.processor.js

@@ -2,12 +2,14 @@
 
 // Generated by CoffeeScript 2.7.0
 (function () {
-  var MESSAGE_PROPERTIES, NonRetryableError, Promise, RequestError, StatusCodeError, _, __isIncludedInStatusesError, _safeParse, _type, errorConditions, httpStatus, request;
+  var IgnoredError, MESSAGE_PROPERTIES, NonRetryableError, Promise, RequestError, StatusCodeError, _, __isIncludedInStatusesError, _safeParse, _type, errorConditions, httpStatus, request;
 
   _ = require("lodash");
 
   NonRetryableError = require("../exceptions/non.retryable");
 
+  IgnoredError = require("../exceptions/ignored.error");
+
   Promise = require("bluebird");
 
   request = require("request-promise");
@@ -102,7 +104,7 @@
             }
           });
         }).catch(__isIncludedInStatusesError(silentErrors), function (err) {
-          return err;
+          throw new IgnoredError("An error has ocurred in that request but should be ignored", _.omit(err, "response"));
         }).catch(__isIncludedInStatusesError(nonRetryable), function (err) {
           throw new NonRetryableError("An error has ocurred in that request", _.omit(err, "response"));
         });