if we have a message and a stack trace, add the message to the extra …

…data attached to the stack trace
rollbar · Jul 12, 2017 · 1e1ae05 · 1e1ae05
1 parent 9681f1c
commit 1e1ae05
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/sdks/rollbar.js/src/browser/rollbar.js b/sdks/rollbar.js/src/browser/rollbar.js
@@ -311,6 +311,7 @@ function addTransformsToNotifier(notifier) {
     .addTransform(transforms.addClientInfo(window))
     .addTransform(transforms.addPluginInfo(window))
     .addTransform(transforms.addBody)
+    .addTransform(sharedTransforms.addMessageWithError)
     .addTransform(transforms.scrubPayload)
     .addTransform(transforms.userTransform)
     .addTransform(sharedTransforms.itemToPayload);

diff --git a/sdks/rollbar.js/src/browser/transforms.js b/sdks/rollbar.js/src/browser/transforms.js
@@ -146,7 +146,7 @@ function addBodyTrace(item, options, callback) {
   };
 
   if (description) {
-    trace.exception.description = description || 'uncaught exception';
+    trace.exception.description = description;
   }
 
   // Transform a TraceKit stackInfo object into a Rollbar trace

diff --git a/sdks/rollbar.js/src/server/rollbar.js b/sdks/rollbar.js/src/server/rollbar.js
@@ -363,6 +363,7 @@ function addTransformsToNotifier(notifier) {
     .addTransform(transforms.baseData)
     .addTransform(transforms.handleItemWithError)
     .addTransform(transforms.addBody)
+    .addTransform(sharedTransforms.addMessageWithError)
     .addTransform(transforms.addRequestData)
     .addTransform(transforms.scrubPayload)
     .addTransform(sharedTransforms.itemToPayload);

diff --git a/sdks/rollbar.js/src/transforms.js b/sdks/rollbar.js/src/transforms.js
@@ -13,6 +13,31 @@ function itemToPayload(item, options, callback) {
   callback(null, data);
 }
 
+function addMessageWithError(item, options, callback) {
+  if (!item.message) {
+    callback(null, item);
+    return;
+  }
+  var tracePath = 'data.body.trace_chain.0';
+  var trace = _.get(item, tracePath);
+  if (!trace) {
+    tracePath = 'data.body.trace';
+    trace = _.get(item, tracePath);
+  }
+  if (trace) {
+    if (!(trace.exception && trace.exception.description)) {
+      _.set(item, tracePath+'.exception.description', item.message);
+      callback(null, item);
+      return;
+    }
+    var extra = _.get(item, tracePath+'.extra') || {};
+    var newExtra =  _.extend(true, {}, extra, {message: item.message});
+    _.set(item, tracePath+'.extra', newExtra);
+  }
+  callback(null, item);
+}
+
 module.exports = {
-  itemToPayload: itemToPayload
+  itemToPayload: itemToPayload,
+  addMessageWithError: addMessageWithError
 };