feat: Preserve some non-enumerable properties from request

Author: kamilogorek

lib/client.js

@@ -230,14 +230,29 @@ extend(Raven.prototype, {
       so we only parse a `req` property if the `request` property is absent/empty (and hence we won't clobber)
       parseUser returns a partial kwargs object with a `request` property and possibly a `user` property
     */
+    var initialRequest = utils.prepareInitialRequest(
+      this._globalContext.request,
+      domainContext.request,
+      kwargs.request
+    );
     kwargs.request = extend(
-      {},
+      initialRequest,
       this._globalContext.request,
       domainContext.request,
       kwargs.request
     );
     if (Object.keys(kwargs.request).length === 0) {
-      var req = extend({}, this._globalContext.req, domainContext.req, kwargs.req);
+      var initialReq = utils.prepareInitialRequest(
+        this._globalContext.req,
+        domainContext.req,
+        kwargs.req
+      );
+      var req = extend(
+        initialReq,
+        this._globalContext.req,
+        domainContext.req,
+        kwargs.req
+      );
       if (Object.keys(req).length > 0) {
         var parseUser = Object.keys(kwargs.user).length === 0 ? this.parseUser : false;
         extend(kwargs, parsers.parseRequest(req, parseUser));

lib/utils.js

@@ -56,6 +56,22 @@ module.exports.getAuthHeader = function getAuthHeader(timestamp, apiKey, apiSecr
   return header.join(', ');
 };
 
+module.exports.prepareInitialRequest = function prepareInitialRequest() {
+  var request = {};
+  var nonEnumberables = ['ip'];
+  var sources = Array.from(arguments).filter(function(source) {
+    return Object.prototype.toString.call(source) === '[object Object]';
+  });
+
+  nonEnumberables.forEach(function(key) {
+    sources.forEach(function(source) {
+      if (source[key]) request[key] = source[key];
+    });
+  });
+
+  return request;
+};
+
 module.exports.parseDSN = function parseDSN(dsn) {
   if (!dsn) {
     // Let a falsey value return false explicitly

test/raven.utils.js

@@ -98,6 +98,66 @@ describe('raven.utils', function() {
     });
   });
 
+  describe('#prepareInitialRequest', function() {
+    it('should extract specific non-enumerables and return an object containing them', function() {
+      var req = raven.utils.prepareInitialRequest({
+        ip: '127.0.0.1'
+      });
+      var expected = {
+        ip: '127.0.0.1'
+      };
+      req.should.eql(expected);
+    });
+
+    it('should skip non-listed properties', function() {
+      var req = raven.utils.prepareInitialRequest({
+        ip: '127.0.0.1',
+        pickle: 'Rick',
+        evil: 'Morty'
+      });
+      var expected = {
+        ip: '127.0.0.1'
+      };
+      req.should.eql(expected);
+    });
+
+    it('should preserve extend-like order', function() {
+      var req = raven.utils.prepareInitialRequest(
+        {
+          ip: '127.0.0.1'
+        },
+        {
+          ip: '123.123.123.123'
+        },
+        {
+          ip: '42.42.42.42'
+        }
+      );
+      var expected = {
+        ip: '42.42.42.42'
+      };
+      req.should.eql(expected);
+    });
+
+    it('should filter incorrect sources', function() {
+      var req = raven.utils.prepareInitialRequest(
+        {
+          ip: '127.0.0.1'
+        },
+        [42],
+        null,
+        'hello',
+        {
+          ip: '123.123.123.123'
+        }
+      );
+      var expected = {
+        ip: '123.123.123.123'
+      };
+      req.should.eql(expected);
+    });
+  });
+
   describe('#parseAuthHeader()', function() {
     it('should parse all parameters', function() {
       var timestamp = 12345,