rollbar 2.17.0 → 2.19.2

package/src/browser/telemetry.js

@@ -1,4 +1,5 @@
 var _ = require('../utility');
+var scrub = require('../scrub');
 var urlparser = require('./url');
 var domUtil = require('./domUtility');
 
@@ -168,15 +169,20 @@ Instrumenter.prototype.instrumentNetwork = function() {
     replace(xhrp, 'open', function(orig) {
       return function(method, url) {
         if (_.isType(url, 'string')) {
-          this.__rollbar_xhr = {
-            method: method,
-            url: url,
-            status_code: null,
-            start_time_ms: _.now(),
-            end_time_ms: null
-          };
-          if (self.autoInstrument.networkRequestHeaders) {
-            this.__rollbar_xhr.request_headers = {};
+          if (this.__rollbar_xhr) {
+            this.__rollbar_xhr.method = method;
+            this.__rollbar_xhr.url = url;
+            this.__rollbar_xhr.status_code = null;
+            this.__rollbar_xhr.start_time_ms = _.now();
+            this.__rollbar_xhr.end_time_ms = null;
+          } else {
+            this.__rollbar_xhr = {
+              method: method,
+              url: url,
+              status_code: null,
+              start_time_ms: _.now(),
+              end_time_ms: null
+            };
           }
         }
         return orig.apply(this, arguments);
@@ -185,12 +191,21 @@ Instrumenter.prototype.instrumentNetwork = function() {
 
     replace(xhrp, 'setRequestHeader', function(orig) {
       return function(header, value) {
-        if (self.autoInstrument.networkRequestHeaders && this.__rollbar_xhr &&
-          _.isType(header, 'string') && _.isType(value, 'string')) {
-          this.__rollbar_xhr.request_headers[header] = value;
+        // If xhr.open is async, __rollbar_xhr may not be initialized yet.
+        if (!this.__rollbar_xhr) {
+          this.__rollbar_xhr = {};
         }
-        if (header.toLowerCase() === 'content-type') {
-          this.__rollbar_xhr.request_content_type = value;
+        if (_.isType(header, 'string') && _.isType(value, 'string')) {
+          if (self.autoInstrument.networkRequestHeaders) {
+            if (!this.__rollbar_xhr.request_headers) {
+              this.__rollbar_xhr.request_headers = {};
+            }
+            this.__rollbar_xhr.request_headers[header] = value;
+          }
+          // We want the content type even if request header telemetry is off.
+          if (header.toLowerCase() === 'content-type') {
+            this.__rollbar_xhr.request_content_type = value;
+          }
         }
         return orig.apply(this, arguments);
       };
@@ -367,8 +382,9 @@ Instrumenter.prototype.instrumentNetwork = function() {
           }
           var body = null;
           if (self.autoInstrument.networkResponseBody) {
-            if (typeof resp.text === 'function') { // Response.text() is not implemented on multiple platforms
-              body = resp.text(); //returns a Promise
+            if (typeof resp.text === 'function') { // Response.text() is not implemented on some platforms
+              // The response must be cloned to prevent reading (and locking) the original stream.
+              body = resp.clone().text(); //returns a Promise
             }
           }
           if (headers || body) {
@@ -409,7 +425,7 @@ Instrumenter.prototype.isJsonContentType = function(contentType) {
 }
 
 Instrumenter.prototype.scrubJson = function(json) {
-  return JSON.stringify(_.scrub(JSON.parse(json), this.options.scrubFields));
+  return JSON.stringify(scrub(JSON.parse(json), this.options.scrubFields));
 }
 
 Instrumenter.prototype.fetchHeaders = function(inHeaders, headersConfig) {

package/src/browser/transforms.js

@@ -19,6 +19,10 @@ function handleItemWithError(item, options, callback) {
   if (item.err) {
     try {
       item.stackInfo = item.err._savedStackTrace || errorParser.parse(item.err, item.skipFrames);
+
+      if (options.addErrorContext) {
+        addErrorContext(item);
+      }
     } catch (e) {
       logger.error('Error while parsing the error object.', e);
       try {
@@ -32,6 +36,20 @@ function handleItemWithError(item, options, callback) {
   callback(null, item);
 }
 
+function addErrorContext(item) {
+  var chain = [];
+  var err = item.err;
+
+  chain.push(err);
+
+  while (err.nested) {
+    err = err.nested;
+    chain.push(err);
+  }
+
+  _.addErrorContext(item, chain);
+}
+
 function ensureItemHasSomethingToSay(item, options, callback) {
   if (!item.message && !item.stackInfo && !item.custom) {
     callback(new Error('No message, stack info, or custom data'), null);
@@ -291,10 +309,15 @@ function errorClass(stackInfo, guess, options) {
   }
 }
 
-function scrubPayload(item, options, callback) {
-  var scrubFields = options.scrubFields;
-  item.data = _.scrub(item.data, scrubFields);
-  callback(null, item);
+function addScrubber(scrubFn) {
+  return function (item, options, callback) {
+    if (scrubFn) {
+      var scrubFields = options.scrubFields || [];
+      var scrubPaths = options.scrubPaths || [];
+      item.data = scrubFn(item.data, scrubFields, scrubPaths);
+    }
+    callback(null, item);
+  }
 }
 
 module.exports = {
@@ -306,5 +329,5 @@ module.exports = {
   addClientInfo: addClientInfo,
   addPluginInfo: addPluginInfo,
   addBody: addBody,
-  scrubPayload: scrubPayload
+  addScrubber: addScrubber
 };

package/src/browser/transport.js

@@ -1,7 +1,6 @@
 /*global XDomainRequest*/
 
 var _ = require('../utility');
-var truncation = require('../truncation');
 var logger = require('./logger');
 
 /*
@@ -21,8 +20,11 @@ var logger = require('./logger');
  *
  * payload is an unserialized object
  */
+function Transport(truncation) {
+  this.truncation = truncation;
+}
 
-function get(accessToken, options, params, callback, requestFactory) {
+Transport.prototype.get = function(accessToken, options, params, callback, requestFactory) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -33,7 +35,7 @@ function get(accessToken, options, params, callback, requestFactory) {
   _makeZoneRequest(accessToken, url, method, null, callback, requestFactory);
 }
 
-function post(accessToken, options, payload, callback, requestFactory) {
+Transport.prototype.post = function(accessToken, options, payload, callback, requestFactory) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -42,7 +44,12 @@ function post(accessToken, options, payload, callback, requestFactory) {
     return callback(new Error('Cannot send empty request'));
   }
 
-  var stringifyResult = truncation.truncate(payload);
+  var stringifyResult;
+  if (this.truncation) {
+    stringifyResult = this.truncation.truncate(payload);
+  } else {
+    stringifyResult = _.stringify(payload)
+  }
   if (stringifyResult.error) {
     return callback(stringifyResult.error);
   }
@@ -53,7 +60,7 @@ function post(accessToken, options, payload, callback, requestFactory) {
   _makeZoneRequest(accessToken, url, method, writeData, callback, requestFactory);
 }
 
-function postJsonPayload(accessToken, options, jsonPayload, callback, requestFactory) {
+Transport.prototype.postJsonPayload = function (accessToken, options, jsonPayload, callback, requestFactory) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -245,8 +252,4 @@ function _newRetriableError(message, code) {
   return err;
 }
 
-module.exports = {
-  get: get,
-  post: post,
-  postJsonPayload: postJsonPayload
-};
+module.exports = Transport;

package/src/browser/wrapGlobals.js

@@ -0,0 +1,41 @@
+function wrapGlobals(window, handler, shim) {
+  if (!window) { return; }
+  // Adapted from https://github.com/bugsnag/bugsnag-js
+  var globals = 'EventTarget,Window,Node,ApplicationCache,AudioTrackList,ChannelMergerNode,CryptoOperation,EventSource,FileReader,HTMLUnknownElement,IDBDatabase,IDBRequest,IDBTransaction,KeyOperation,MediaController,MessagePort,ModalWindow,Notification,SVGElementInstance,Screen,TextTrack,TextTrackCue,TextTrackList,WebSocket,WebSocketWorker,Worker,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload'.split(',');
+  var i, global;
+  for (i = 0; i < globals.length; ++i) {
+    global = globals[i];
+
+    if (window[global] && window[global].prototype) {
+      _extendListenerPrototype(handler, window[global].prototype, shim);
+    }
+  }
+}
+
+function _extendListenerPrototype(handler, prototype, shim) {
+  if (prototype.hasOwnProperty && prototype.hasOwnProperty('addEventListener')) {
+    var oldAddEventListener = prototype.addEventListener;
+    while (oldAddEventListener._rollbarOldAdd && oldAddEventListener.belongsToShim) {
+      oldAddEventListener = oldAddEventListener._rollbarOldAdd;
+    }
+    var addFn = function(event, callback, bubble) {
+      oldAddEventListener.call(this, event, handler.wrap(callback), bubble);
+    };
+    addFn._rollbarOldAdd = oldAddEventListener;
+    addFn.belongsToShim = shim;
+    prototype.addEventListener = addFn;
+
+    var oldRemoveEventListener = prototype.removeEventListener;
+    while (oldRemoveEventListener._rollbarOldRemove && oldRemoveEventListener.belongsToShim) {
+      oldRemoveEventListener = oldRemoveEventListener._rollbarOldRemove;
+    }
+    var removeFn = function(event, callback, bubble) {
+      oldRemoveEventListener.call(this, event, callback && callback._rollbar_wrapped || callback, bubble);
+    };
+    removeFn._rollbarOldRemove = oldRemoveEventListener;
+    removeFn.belongsToShim = shim;
+    prototype.removeEventListener = removeFn;
+  }
+}
+
+module.exports = wrapGlobals;

package/src/defaults.js

@@ -0,0 +1,9 @@
+module.exports = {
+  version: '2.19.2',
+  endpoint: 'api.rollbar.com/api/1/item/',
+  logLevel: 'debug',
+  reportLevel: 'debug',
+  uncaughtErrorLevel: 'error',
+  maxItems: 0,
+  itemsPerMin: 60
+}

package/src/predicates.js

@@ -15,6 +15,7 @@ function checkLevel(item, settings) {
 function userCheckIgnore(logger) {
   return function(item, settings) {
     var isUncaught = !!item._isUncaught;
+    delete item._isUncaught;
     var args = item._originalArgs;
     delete item._originalArgs;
     try {

package/src/react-native/rollbar.js

@@ -4,12 +4,14 @@ var _ = require('../utility');
 var API = require('../api');
 var logger = require('./logger');
 
-var transport = require('./transport');
+var Transport = require('./transport');
 var urllib = require('../browser/url');
 
+var Telemeter = require('../telemetry');
 var transforms = require('./transforms');
 var sharedTransforms = require('../transforms');
 var sharedPredicates = require('../predicates');
+var truncation = require('../truncation');
 
 function Rollbar(options, client) {
   if (_.isType(options, 'string')) {
@@ -22,10 +24,14 @@ function Rollbar(options, client) {
   // This makes no sense in a long running app
   delete this.options.maxItems;
   this.options.environment = this.options.environment || 'unspecified';
-  var api = new API(this.options, transport, urllib);
-  this.client = client || new Client(this.options, api, logger, 'react-native');
+
+  var transport = new Transport(truncation);
+  var api = new API(this.options, transport, urllib, truncation);
+  var telemeter = new Telemeter(this.options)
+  this.client = client || new Client(this.options, api, logger, telemeter, 'react-native');
   addTransformsToNotifier(this.client.notifier);
   addPredicatesToQueue(this.client.queue);
+  _.setupJSON();
 }
 
 var _instance = null;

package/src/react-native/transforms.js

@@ -1,4 +1,5 @@
 var _ = require('../utility');
+var scrub = require('../scrub');
 var errorParser = require('../errorParser');
 
 function baseData(item, options, callback) {
@@ -64,6 +65,10 @@ function handleItemWithError(item, options, callback) {
     return callback(null, item);
   }
 
+  if (options.addErrorContext) {
+    _.addErrorContext(item, [item.err]);
+  }
+
   var err = item.err;
   var parsedError = errorParser.parse(err);
   var guess = errorParser.guessErrorClass(parsedError.message);
@@ -85,8 +90,9 @@ function handleItemWithError(item, options, callback) {
 function scrubPayload(item, options, callback) {
   var scrubHeaders = options.scrubHeaders || [];
   var scrubFields = options.scrubFields || [];
+  var scrubPaths = options.scrubPaths || [];
   scrubFields = scrubHeaders.concat(scrubFields);
-  item.data = _.scrub(item.data, scrubFields);
+  item.data = scrub(item.data, scrubFields, scrubPaths);
   callback(null, item);
 }
 

package/src/react-native/transport.js

@@ -1,10 +1,14 @@
 var _ = require('../utility');
-var truncation = require('../truncation');
 var logger = require('./logger');
 
 var Buffer = require('buffer/').Buffer;
 
-function get(accessToken, options, params, callback) {
+function Transport(truncation) {
+  this.rateLimitExpires = 0;
+  this.truncation = truncation;
+}
+
+Transport.prototype.get = function(accessToken, options, params, callback) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -23,7 +27,7 @@ function get(accessToken, options, params, callback) {
   });
 }
 
-function post(accessToken, options, payload, callback) {
+Transport.prototype.post = function(accessToken, options, payload, callback) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -31,7 +35,13 @@ function post(accessToken, options, payload, callback) {
   if (!payload) {
     return callback(new Error('Cannot send empty request'));
   }
-  var stringifyResult = truncation.truncate(payload);
+
+  var stringifyResult;
+  if (this.truncation) {
+    stringifyResult = this.truncation.truncate(payload);
+  } else {
+    stringifyResult = _.stringify(payload)
+  }
   if (stringifyResult.error) {
     logger.error('Problem stringifying payload. Giving up');
     return callback(stringifyResult.error);
@@ -42,7 +52,7 @@ function post(accessToken, options, payload, callback) {
   _makeRequest(headers, options, writeData, callback);
 }
 
-function postJsonPayload(accessToken, options, jsonPayload, callback) {
+Transport.prototype.postJsonPayload = function(accessToken, options, jsonPayload, callback) {
   if (!callback || !_.isFunction(callback)) {
     callback = function() {};
   }
@@ -114,8 +124,4 @@ function _wrapPostCallback(callback) {
   }
 }
 
-module.exports = {
-  get: get,
-  post: post,
-  postJsonPayload: postJsonPayload
-};
+module.exports = Transport;

package/src/rollbar.js

@@ -1,7 +1,6 @@
 var RateLimiter = require('./rateLimiter');
 var Queue = require('./queue');
 var Notifier = require('./notifier');
-var Telemeter = require('./telemetry');
 var _ = require('./utility');
 
 /*
@@ -11,7 +10,7 @@ var _ = require('./utility');
  * @param api
  * @param logger
  */
-function Rollbar(options, api, logger, platform) {
+function Rollbar(options, api, logger, telemeter, platform) {
   this.options = _.merge(options);
   this.logger = logger;
   Rollbar.rateLimiter.configureGlobal(this.options);
@@ -31,7 +30,7 @@ function Rollbar(options, api, logger, platform) {
   }
 
   this.notifier = new Notifier(this.queue, this.options);
-  this.telemeter = new Telemeter(this.options);
+  this.telemeter = telemeter;
   setStackTraceLimit(options);
   this.lastError = null;
   this.lastErrorHash = 'none';
@@ -115,15 +114,15 @@ Rollbar.prototype.wait = function (callback) {
 };
 
 Rollbar.prototype.captureEvent = function (type, metadata, level) {
-  return this.telemeter.captureEvent(type, metadata, level);
+  return this.telemeter && this.telemeter.captureEvent(type, metadata, level);
 };
 
 Rollbar.prototype.captureDomContentLoaded = function (ts) {
-  return this.telemeter.captureDomContentLoaded(ts);
+  return this.telemeter && this.telemeter.captureDomContentLoaded(ts);
 };
 
 Rollbar.prototype.captureLoad = function (ts) {
-  return this.telemeter.captureLoad(ts);
+  return this.telemeter && this.telemeter.captureLoad(ts);
 };
 
 Rollbar.prototype.buildJsonPayload = function (item) {
@@ -153,8 +152,8 @@ Rollbar.prototype._log = function (defaultLevel, item) {
   try {
     this._addTracingInfo(item);
     item.level = item.level || defaultLevel;
-    this.telemeter._captureRollbarItem(item);
-    item.telemetryEvents = this.telemeter.copyEvents();
+    this.telemeter && this.telemeter._captureRollbarItem(item);
+    item.telemetryEvents = (this.telemeter && this.telemeter.copyEvents()) || [];
     this.notifier.log(item, callback);
   } catch (e) {
     this.logger.error(e);
@@ -235,7 +234,7 @@ function validateTracer(tracer) {
     return false;
   }
 
-  const scope = tracer.scope();
+  var scope = tracer.scope();
 
   if (!scope || !scope.active || typeof scope.active !== 'function') {
     return false;
@@ -253,7 +252,7 @@ function validateSpan(span) {
     return false;
   }
 
-  const spanContext = span.context();
+  var spanContext = span.context();
 
   if (!spanContext
     || !spanContext.toSpanId

package/src/scrub.js

@@ -0,0 +1,93 @@
+var _ = require('./utility');
+var traverse = require('./utility/traverse');
+
+function scrub(data, scrubFields, scrubPaths) {
+  scrubFields = scrubFields || [];
+
+  if (scrubPaths) {
+    for (var i = 0; i < scrubPaths.length; ++i) {
+      scrubPath(data, scrubPaths[i]);
+    }
+  }
+
+  var paramRes = _getScrubFieldRegexs(scrubFields);
+  var queryRes = _getScrubQueryParamRegexs(scrubFields);
+
+  function redactQueryParam(dummy0, paramPart) {
+    return paramPart + _.redact();
+  }
+
+  function paramScrubber(v) {
+    var i;
+    if (_.isType(v, 'string')) {
+      for (i = 0; i < queryRes.length; ++i) {
+        v = v.replace(queryRes[i], redactQueryParam);
+      }
+    }
+    return v;
+  }
+
+  function valScrubber(k, v) {
+    var i;
+    for (i = 0; i < paramRes.length; ++i) {
+      if (paramRes[i].test(k)) {
+        v = _.redact();
+        break;
+      }
+    }
+    return v;
+  }
+
+  function scrubber(k, v, seen) {
+    var tmpV = valScrubber(k, v);
+    if (tmpV === v) {
+      if (_.isType(v, 'object') || _.isType(v, 'array')) {
+        return traverse(v, scrubber, seen);
+      }
+      return paramScrubber(tmpV);
+    } else {
+      return tmpV;
+    }
+  }
+
+  return traverse(data, scrubber, []);
+}
+
+function scrubPath(obj, path) {
+  var keys = path.split('.');
+  var last = keys.length - 1;
+  try {
+    for (var i = 0; i <= last; ++i) {
+      if (i < last) {
+        obj = obj[keys[i]];
+      } else {
+        obj[keys[i]] = _.redact();
+      }
+    }
+  } catch (e) {
+    // Missing key is OK;
+  }
+}
+
+function _getScrubFieldRegexs(scrubFields) {
+  var ret = [];
+  var pat;
+  for (var i = 0; i < scrubFields.length; ++i) {
+    pat = '^\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?$';
+    ret.push(new RegExp(pat, 'i'));
+  }
+  return ret;
+}
+
+
+function _getScrubQueryParamRegexs(scrubFields) {
+  var ret = [];
+  var pat;
+  for (var i = 0; i < scrubFields.length; ++i) {
+    pat = '\\[?(%5[bB])?' + scrubFields[i] + '\\[?(%5[bB])?\\]?(%5[dD])?';
+    ret.push(new RegExp('(' + pat + '=)([^&\\n]+)', 'igm'));
+  }
+  return ret;
+}
+
+module.exports = scrub;

package/src/server/rollbar.js

@@ -11,9 +11,11 @@ var Transport = require('./transport');
 var urllib = require('url');
 var jsonBackup = require('json-stringify-safe');
 
+var Telemeter = require('../telemetry');
 var transforms = require('./transforms');
 var sharedTransforms = require('../transforms');
 var sharedPredicates = require('../predicates');
+var truncation = require('../truncation');
 
 function Rollbar(options, client) {
   if (_.isType(options, 'string')) {
@@ -34,11 +36,13 @@ function Rollbar(options, client) {
   this.lambdaContext = null;
   this.lambdaTimeoutHandle = null;
   var transport = new Transport();
-  var api = new API(this.options, transport, urllib, jsonBackup);
-  this.client = client || new Client(this.options, api, logger, 'server');
+  var api = new API(this.options, transport, urllib, truncation, jsonBackup);
+  var telemeter = new Telemeter(this.options)
+  this.client = client || new Client(this.options, api, logger, telemeter, 'server');
   addTransformsToNotifier(this.client.notifier);
   addPredicatesToQueue(this.client.queue);
   this.setupUnhandledCapture();
+  _.setupJSON();
 }
 
 var _instance = null;

package/src/server/sourceMap/stackTrace.js

@@ -1,7 +1,6 @@
 var SourceMapConsumer = require('source-map').SourceMapConsumer;
 var path = require('path');
 var fs = require('fs');
-var bufferFrom = require('buffer-from');
 
 /**
  * Uses Node source-map to map transpiled JS stack locations to original
@@ -94,7 +93,7 @@ function retrieveSourceMap(source) {
   if (reSourceMap.test(sourceMappingURL)) {
     // Support source map URL as a data url
     var rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(',') + 1);
-    sourceMapData = bufferFrom(rawData, 'base64').toString();
+    sourceMapData = Buffer.from(rawData, 'base64').toString();
     sourceMappingURL = source;
   } else {
     // Support source map URLs relative to the source URL

package/src/server/transforms.js

@@ -3,6 +3,7 @@ var parser = require('./parser');
 var requestIp = require('request-ip');
 var url = require('url');
 var _ = require('../utility');
+var scrub = require('../scrub');
 
 function baseData(item, options, callback) {
   var environment = (options.payload && options.payload.environment) || options.environment;
@@ -88,6 +89,10 @@ function handleItemWithError(item, options, callback) {
   } while (err !== undefined);
   item.stackInfo = chain;
 
+  if (options.addErrorContext) {
+    _.addErrorContext(item, errors);
+  }
+
   var cb = function(e) {
     if (e) {
       item.message = item.err.message || item.err.description || item.message || String(item.err);
@@ -108,6 +113,8 @@ function addRequestData(item, options, callback) {
     return;
   }
 
+  var baseUrl = req.baseUrl || '';
+
   if (options.addRequestData && _.isFunction(options.addRequestData)) {
     options.addRequestData(item.data, req);
     callback(null, item);
@@ -118,11 +125,15 @@ function addRequestData(item, options, callback) {
   _.filterIp(requestData, options.captureIp);
   item.data.request = requestData;
 
+  var routePath;
+
   if (req.route) {
-    item.data.context = req.route.path;
+    routePath = req.route.path;
+    item.data.context = baseUrl && baseUrl.length ? baseUrl + routePath : routePath;
   } else {
     try {
-      item.data.context = req.app._router.matchRequest(req).path;
+      routePath = req.app._router.matchRequest(req).path;
+      item.data.context = baseUrl && baseUrl.length ? baseUrl + routePath : routePath;
     } catch (ignore) {
       // Ignored
     }
@@ -184,10 +195,11 @@ function addLambdaData(item, options, callback) {
 function scrubPayload(item, options, callback) {
   var scrubHeaders = options.scrubHeaders || [];
   var scrubFields = options.scrubFields || [];
+  var scrubPaths = options.scrubPaths || [];
   scrubFields = scrubHeaders.concat(scrubFields);
 
   parseRequestBody(item.data.request, options);
-  item.data = _.scrub(item.data, scrubFields);
+  item.data = scrub(item.data, scrubFields, scrubPaths);
   serializeRequestBody(item.data.request, options);
 
   callback(null, item);
@@ -258,8 +270,10 @@ function _buildRequestData(req) {
   var host = headers.host || '<no host>';
   var proto = req.protocol || ((req.socket && req.socket.encrypted) ? 'https' : 'http' );
   var parsedUrl;
+  var baseUrl = req.baseUrl || '';
   if (_.isType(req.url, 'string')) {
-    parsedUrl = url.parse(req.url, true);
+    var fullUrl = baseUrl && baseUrl.length ? baseUrl + req.url : req.url
+    parsedUrl = url.parse(fullUrl, true);
   } else {
     parsedUrl = req.url || {};
   }

package/src/transforms.js

@@ -103,7 +103,6 @@ function addDiagnosticKeys(item, options, callback) {
 
   if (item._isUncaught) {
     diagnostic.is_uncaught = item._isUncaught;
-    delete item._isUncaught;
   }
 
   if (item.err) {