Standard error messages

This switches to the standard upstream label format of "Type: Value".

It also removes the seemingly unuseful " at [lineno]" clause.

Author: dcramer

src/raven.js

@@ -614,20 +614,15 @@ function extractContextFromFrame(frame) {
 }
 
 function processException(type, message, fileurl, lineno, frames, options) {
-    var stacktrace, label, i;
+    var stacktrace, i, fullMessage;
 
-    // In some instances message is not actually a string, no idea why,
-    // so we want to always coerce it to one.
-    message += '';
+    if (globalOptions.ignoreErrors.test(message)) return;
 
-    // Sometimes an exception is getting logged in Sentry as
-    // <no message value>
-    // This can only mean that the message was falsey since this value
-    // is hardcoded into Sentry itself.
-    // At this point, if the message is falsey, we bail since it's useless
-    if (type === 'Error' && !message) return;
+    message += '';
+    message = truncate(message, globalOptions.maxMessageLength);
 
-    if (globalOptions.ignoreErrors.test(message)) return;
+    fullMessage = type + ': ' + message;
+    fullMessage = truncate(fullMessage, globalOptions.maxMessageLength);
 
     if (frames && frames.length) {
         fileurl = frames[0].filename || fileurl;
@@ -645,14 +640,9 @@ function processException(type, message, fileurl, lineno, frames, options) {
         };
     }
 
-    // Truncate the message to a max of characters
-    message = truncate(message, globalOptions.maxMessageLength);
-
     if (globalOptions.ignoreUrls && globalOptions.ignoreUrls.test(fileurl)) return;
     if (globalOptions.whitelistUrls && !globalOptions.whitelistUrls.test(fileurl)) return;
 
-    label = lineno ? message + ' at ' + lineno : message;
-
     // Fire away!
     send(
         objectMerge({
@@ -664,7 +654,7 @@ function processException(type, message, fileurl, lineno, frames, options) {
             // sentry.interfaces.Stacktrace
             stacktrace: stacktrace,
             culprit: fileurl,
-            message: label
+            message: fullMessage
         }, options)
     );
 }
@@ -713,12 +703,11 @@ function send(data) {
     var baseData = {
         project: globalProject,
         logger: globalOptions.logger,
-        platform: 'javascript',
-        // sentry.interfaces.Http
+        platform: 'javascript'
     };
     var http = getHttpData();
     if (http) {
-        baseData.http = http;
+        baseData.request = http;
     }
 
     data = objectMerge(baseData, data);

test/raven.test.js

@@ -689,7 +689,7 @@ describe('globals', function() {
                     frames: framesFlipped
                 },
                 culprit: 'http://example.com/file1.js',
-                message: 'lol at 10'
+                message: 'Error: lol'
             }]);
 
             processException('Error', 'lol', '', 10, frames.slice(0), {});
@@ -702,7 +702,7 @@ describe('globals', function() {
                     frames: framesFlipped
                 },
                 culprit: 'http://example.com/file1.js',
-                message: 'lol at 10'
+                message: 'Error: lol'
             }]);
 
             processException('Error', 'lol', '', 10, frames.slice(0), {extra: 'awesome'});
@@ -715,7 +715,7 @@ describe('globals', function() {
                     frames: framesFlipped
                 },
                 culprit: 'http://example.com/file1.js',
-                message: 'lol at 10',
+                message: 'Error: lol',
                 extra: 'awesome'
             }]);
         });
@@ -737,7 +737,7 @@ describe('globals', function() {
                     }]
                 },
                 culprit: 'http://example.com/override.js',
-                message: 'lol at 10'
+                message: 'Error: lol'
             }]);
 
             processException('Error', 'lol', 'http://example.com/override.js', 10, [], {});
@@ -754,7 +754,7 @@ describe('globals', function() {
                     }]
                 },
                 culprit: 'http://example.com/override.js',
-                message: 'lol at 10'
+                message: 'Error: lol',
             }]);
 
             processException('Error', 'lol', 'http://example.com/override.js', 10, [], {extra: 'awesome'});
@@ -771,21 +771,11 @@ describe('globals', function() {
                     }]
                 },
                 culprit: 'http://example.com/override.js',
-                message: 'lol at 10',
+                message: 'Error: lol',
                 extra: 'awesome'
             }]);
         });
 
-        it('should ignored falsey messages', function() {
-            this.sinon.stub(window, 'send');
-
-            processException('Error', '', 'http://example.com', []);
-            assert.isFalse(window.send.called);
-
-            processException('TypeError', '', 'http://example.com', []);
-            assert.isTrue(window.send.called);
-        });
-
         it('should not blow up with `undefined` message', function() {
             this.sinon.stub(window, 'send');
 
@@ -796,36 +786,19 @@ describe('globals', function() {
         it('should truncate messages to the specified length', function() {
             this.sinon.stub(window, 'send');
 
-            processException('TypeError', new Array(500).join('a'), 'http://example.com', []);
-            assert.deepEqual(window.send.lastCall.args, [{
-                message: new Array(101).join('a')+'\u2026 at ',
-                exception: {
-                    type: 'TypeError',
-                    value: new Array(101).join('a')+'\u2026'
-                },
-                stacktrace: {
-                    frames: [{
-                        filename: 'http://example.com',
-                        lineno: [],
-                        in_app: true
-                    }]
-                },
-                culprit: 'http://example.com',
-            }]);
-
             globalOptions.maxMessageLength = 150;
 
-            processException('TypeError', new Array(500).join('a'), 'http://example.com', []);
+            processException('TypeError', new Array(500).join('a'), 'http://example.com', 34);
             assert.deepEqual(window.send.lastCall.args, [{
-                message: new Array(151).join('a')+'\u2026 at ',
+                message: 'TypeError: ' + new Array(140).join('a')+'\u2026',
                 exception: {
                     type: 'TypeError',
                     value: new Array(151).join('a')+'\u2026'
                 },
                 stacktrace: {
                     frames: [{
                         filename: 'http://example.com',
-                        lineno: [],
+                        lineno: 34,
                         in_app: true
                     }]
                 },
@@ -1204,7 +1177,7 @@ describe('globals', function() {
                     }]
                 },
                 culprit: 'http://example.com',
-                message: 'crap at 10',
+                message: 'Error: crap',
                 foo: 'bar'
             }]);
             */