Capture message respects ignoreUrls/whitelistUrls #774

docs/config.rst

@@ -90,9 +90,6 @@ Those configuration options are documented below:
     tags. Not setting this value is equivalent to a catch-all and will not
     filter out any values.
 
-    Does not affect ``captureMessage`` or when non-error object is passed in
-    as argument to captureException.
-
     .. code-block:: javascript
 
         {
@@ -107,9 +104,6 @@ Those configuration options are documented below:
     messages to be filtered out before being sent to Sentry as either
     regular expressions or strings.
 
-    Does not affect captureMessage or when non-error object is passed in
-    as argument to captureException.
-
     .. code-block:: javascript
 
         {
@@ -128,9 +122,6 @@ Those configuration options are documented below:
           ignoreUrls: [/graph\.facebook\.com/, 'http://example.com/script2.js']
         }
 
-    Does not affect captureMessage or when non-error object is passed in
-    as argument to ``captureException``.
-
 .. describe:: includePaths
 
     An array of regex patterns to indicate which urls are a part of your

src/raven.js

@@ -435,21 +435,41 @@ Raven.prototype = {
       options
     );
 
-    if (this._globalOptions.stacktrace || (options && options.stacktrace)) {
-      var ex;
-      // Generate a "synthetic" stack trace from this point.
-      // NOTE: If you are a Sentry user, and you are seeing this stack frame, it is NOT indicative
-      //       of a bug with Raven.js. Sentry generates synthetic traces either by configuration,
-      //       or if it catches a thrown object without a "stack" property.
-      try {
-        throw new Error(msg);
-      } catch (ex1) {
-        ex = ex1;
-      }
+    var ex;
+    // Generate a "synthetic" stack trace from this point.
+    // NOTE: If you are a Sentry user, and you are seeing this stack frame, it is NOT indicative
+    //       of a bug with Raven.js. Sentry generates synthetic traces either by configuration,
+    //       or if it catches a thrown object without a "stack" property.
+    try {
+      throw new Error(msg);
+    } catch (ex1) {
+      ex = ex1;
+    }
+
+    // null exception name so `Error` isn't prefixed to msg
+    ex.name = null;
+    var stack = TraceKit.computeStackTrace(ex);
+
+    // stack[0] is `throw new Error(msg)` call itself, we are interested in the frame that was just before that, stack[1]
+    var initialCall = stack.stack[1];
 
-      // null exception name so `Error` isn't prefixed to msg
-      ex.name = null;
+    var fileurl = initialCall.url || '';
 
+    if (
+      !!this._globalOptions.ignoreUrls.test &&
+      this._globalOptions.ignoreUrls.test(fileurl)
+    ) {
+      return;
+    }
+
+    if (
+      !!this._globalOptions.whitelistUrls.test &&
+      !this._globalOptions.whitelistUrls.test(fileurl)
+    ) {
+      return;
+    }
+
+    if (this._globalOptions.stacktrace || (options && options.stacktrace)) {
       options = objectMerge(
         {
           // fingerprint on msg, not stack trace (legacy behavior, could be
@@ -463,7 +483,6 @@ Raven.prototype = {
         options
       );
 
-      var stack = TraceKit.computeStackTrace(ex);
       var frames = this._prepareFrames(stack, options);
       data.stacktrace = {
         // Sentry expects frames oldest to newest
@@ -1451,13 +1470,16 @@ Raven.prototype = {
     if (
       !!this._globalOptions.ignoreUrls.test &&
       this._globalOptions.ignoreUrls.test(fileurl)
-    )
+    ) {
       return;
+    }
+
     if (
       !!this._globalOptions.whitelistUrls.test &&
       !this._globalOptions.whitelistUrls.test(fileurl)
-    )
+    ) {
       return;
+    }
 
     var data = objectMerge(
       {

test/raven.test.js

@@ -2635,6 +2635,62 @@ describe('Raven (public API)', function() {
       });
     });
 
+    it('should respect `ignoreUrls`', function() {
+      this.sinon.stub(Raven, '_send');
+      var TraceKitStub = this.sinon.stub(TraceKit, 'computeStackTrace');
+
+      Raven._globalOptions.ignoreUrls = joinRegExp([/.+?host1.+/, /.+?host2.+/]);
+      TraceKitStub.returns({stack: [{url: 'http://host1/'}, {url: 'http://host1/'}]});
+      Raven.captureMessage('Do not capture');
+      assert.isFalse(Raven._send.called);
+      TraceKitStub.returns({stack: [{url: 'http://host2/'}, {url: 'http://host2/'}]});
+      Raven.captureMessage('Also do not capture');
+      assert.isFalse(Raven._send.called);
+      TraceKitStub.returns({stack: [{url: 'http://host3/'}, {url: 'http://host3/'}]});
+      Raven.captureMessage('Capture!');
+      assert.isTrue(Raven._send.calledOnce);
+    });
+
+    it('should handle empty `ignoreUrls`', function() {
+      this.sinon.stub(Raven, '_send');
+      var TraceKitStub = this.sinon.stub(TraceKit, 'computeStackTrace');
+
+      Raven._globalOptions.ignoreUrls = [];
+      TraceKitStub.returns({
+        stack: [{url: 'http://example.com'}, {url: 'http://example.com'}]
+      });
+      Raven.captureMessage('Capture!');
+      assert.isTrue(Raven._send.calledOnce);
+    });
+
+    it('should respect `whitelistUrls`', function() {
+      this.sinon.stub(Raven, '_send');
+      var TraceKitStub = this.sinon.stub(TraceKit, 'computeStackTrace');
+
+      Raven._globalOptions.whitelistUrls = joinRegExp([/.+?host1.+/, /.+?host2.+/]);
+      TraceKitStub.returns({stack: [{url: 'http://host1/'}, {url: 'http://host1/'}]});
+      Raven.captureMessage('Capture!');
+      assert.isTrue(Raven._send.calledOnce);
+      TraceKitStub.returns({stack: [{url: 'http://host2/'}, {url: 'http://host2/'}]});
+      Raven.captureMessage('Also capture!');
+      assert.isTrue(Raven._send.calledTwice);
+      TraceKitStub.returns({stack: [{url: 'http://host3/'}, {url: 'http://host3/'}]});
+      Raven.captureMessage('Do not capture!');
+      assert.isTrue(Raven._send.calledTwice);
+    });
+
+    it('should handle empty `whitelistUrls`', function() {
+      this.sinon.stub(Raven, '_send');
+      var TraceKitStub = this.sinon.stub(TraceKit, 'computeStackTrace');
+
+      Raven._globalOptions.whitelistUrls = [];
+      TraceKitStub.returns({
+        stack: [{url: 'http://example.com'}, {url: 'http://example.com'}]
+      });
+      Raven.captureMessage('Capture!');
+      assert.isTrue(Raven._send.calledOnce);
+    });
+
     describe('synthetic traces', function() {
       function assertSynthetic(frames) {
         // Raven.captureMessage