Pass stacktrace via captureMessage as stacktrace interface

Author: benvinegar

Gruntfile.js

@@ -131,7 +131,7 @@ module.exports = function(grunt) {
                 dest: 'build/raven.test.js',
                 options: {
                 browserifyOptions: {
-                    debug: true // source maps
+                    debug: false// source maps
                 },
                 plugin: [proxyquire.plugin]
             }

src/raven.js

@@ -341,7 +341,18 @@ Raven.prototype = {
      * @return {Raven}
      */
     captureMessage: function(msg, options) {
-        if (options.stacktrace) {
+        // config() automagically converts ignoreErrors from a list to a RegExp so we need to test for an
+        // early call; we'll error on the side of logging anything called before configuration since it's
+        // probably something you should see:
+        if (!!this._globalOptions.ignoreErrors.test && this._globalOptions.ignoreErrors.test(msg)) {
+            return;
+        }
+
+        var data = objectMerge({
+            message: msg + ''  // Make sure it's actually a string
+        }, options);
+
+        if (options && options.stacktrace) {
             var ex;
             // create a stack trace from this point; just trim
             // off extra frames so they don't include this function call (or
@@ -363,26 +374,16 @@ Raven.prototype = {
                 trimTailFrames: (options.trimHeadFrames || 0) + 1
             }, options);
 
-            // infinite loop if ex *somehow* returns false for isError
-            // is that possible when it is result of try/catch?
-            this.captureException(ex, options);
-
-            return this;
-        }
-
-        // config() automagically converts ignoreErrors from a list to a RegExp so we need to test for an
-        // early call; we'll error on the side of logging anything called before configuration since it's
-        // probably something you should see:
-        if (!!this._globalOptions.ignoreErrors.test && this._globalOptions.ignoreErrors.test(msg)) {
-            return;
+            var stack = TraceKit.computeStackTrace(ex);
+            var frames = this._buildNormalizedFrames(stack, options);
+            data.stacktrace = {
+                // Sentry expects frames oldest to newest
+                frames: frames.reverse()
+            }
         }
 
         // Fire away!
-        this._send(
-            objectMerge({
-                message: msg + ''  // Make sure it's actually a string
-            }, options)
-        );
+        this._send(data);
 
         return this;
     },
@@ -1047,9 +1048,26 @@ Raven.prototype = {
     },
 
     _handleStackInfo: function(stackInfo, options) {
+        var frames = this._prepareFrames(stackInfo, options);
+
+        this._triggerEvent('handle', {
+            stackInfo: stackInfo,
+            options: options
+        });
+
+        this._processException(
+            stackInfo.name,
+            stackInfo.message,
+            stackInfo.url,
+            stackInfo.lineno,
+            frames,
+            options
+        );
+    },
+
+    _prepareFrames: function(stackInfo, options) {
         var self = this;
         var frames = [];
-
         if (stackInfo.stack && stackInfo.stack.length) {
             each(stackInfo.stack, function(i, stack) {
                 var frame = self._normalizeFrame(stack);
@@ -1059,30 +1077,25 @@ Raven.prototype = {
             });
 
             // e.g. frames captured via captureMessage throw
-            if (options.trimHeadFrames) {
-                frames = frames.slice(options.trimHeadFrames);
+            var j;
+            if (options && options.trimHeadFrames) {
+                for (j = 0; j < options.trimHeadFrames && j < frames.length; j++) {
+                    frames[j].in_app = true;
+                }
             }
+
             // e.g. try/catch (wrapper) frames
-            if (options.trimTailFrames) {
-                frames = frames.slice(0, options.trimTailFrames);
+            if (options && options.trimTailFrames) {
+                for (j = options.trimTailFrames; j < frames.length; j++) {
+                    frames[j].in_app = true;
+                }
             }
         }
-
-        this._triggerEvent('handle', {
-            stackInfo: stackInfo,
-            options: options
-        });
-
-        this._processException(
-            stackInfo.name,
-            stackInfo.message,
-            stackInfo.url,
-            stackInfo.lineno,
-            frames.slice(0, this._globalOptions.stackTraceLimit),
-            options
-        );
+        frames = frames.slice(0, this._globalOptions.stackTraceLimit);
+        return frames;
     },
 
+
     _normalizeFrame: function(frame) {
         if (!frame.url) return;
 
@@ -1108,7 +1121,6 @@ Raven.prototype = {
 
     _processException: function(type, message, fileurl, lineno, frames, options) {
         var stacktrace;
-
         if (!!this._globalOptions.ignoreErrors.test && this._globalOptions.ignoreErrors.test(message)) return;
 
         message += '';

test/raven.test.js

@@ -1653,7 +1653,10 @@ describe('Raven (public API)', function() {
                 Raven.context({foo: 'bar'}, broken);
             }, error);
             assert.isTrue(Raven.captureException.called);
-            assert.deepEqual(Raven.captureException.lastCall.args, [error, {'foo': 'bar'}]);
+            assert.deepEqual(Raven.captureException.lastCall.args, [error, {
+                'foo': 'bar',
+                trimTailFrames: 1 // because wrap
+            }]);
         });
 
         it('should capture the exception without options', function() {
@@ -1664,7 +1667,9 @@ describe('Raven (public API)', function() {
                 Raven.context(broken);
             }, error);
             assert.isTrue(Raven.captureException.called);
-            assert.deepEqual(Raven.captureException.lastCall.args, [error, undefined]);
+            assert.deepEqual(Raven.captureException.lastCall.args, [error, {
+                trimTailFrames: 1 // because wrap
+            }]);
         });
 
         it('should execute the callback without arguments', function() {