rollbar 3.0.0-beta.5 → 3.0.0

package/src/server/rollbar.js

@@ -1,23 +1,23 @@
-import util from 'util';
 import os from 'os';
-
-import Client from '../rollbar.js';
-import * as _ from '../utility.js';
-import API from '../api.js';
-import logger from '../logger.js';
-import * as serverDefaults from './defaults.js';
-import { version, reportLevel } from '../defaults.js';
-
-import Transport from './transport.js';
 import urllib from 'url';
+import util from 'util';
+
 import jsonBackup from 'json-stringify-safe';
 
+import API from '../api.js';
+import { version, reportLevel } from '../defaults.js';
+import logger from '../logger.js';
+import * as sharedPredicates from '../predicates.js';
+import Client from '../rollbar.js';
 import Telemeter from '../telemetry.js';
-import Instrumenter from './telemetry.js';
-import * as transforms from './transforms.js';
 import * as sharedTransforms from '../transforms.js';
-import * as sharedPredicates from '../predicates.js';
 import truncation from '../truncation.js';
+import * as _ from '../utility.js';
+
+import * as serverDefaults from './defaults.js';
+import Instrumenter from './telemetry.js';
+import * as transforms from './transforms.js';
+import Transport from './transport.js';
 
 function Rollbar(options, client) {
   if (_.isType(options, 'string')) {
@@ -341,86 +341,91 @@ Rollbar.prototype.lambdaHandler = function (handler, timeoutHandler) {
 };
 
 Rollbar.prototype.asyncLambdaHandler = function (handler, timeoutHandler) {
-  var self = this;
-  var _timeoutHandler = function (event, context) {
-    var message = 'Function timed out';
-    var custom = {
+  const _timeoutHandler = (event, context) => {
+    const message = 'Function timed out';
+    const custom = {
       originalEvent: event,
       originalRequestId: context.awsRequestId,
     };
-    self.error(message, custom);
+    this.error(message, custom);
   };
-  var shouldReportTimeouts = self.options.captureLambdaTimeouts;
-  return function rollbarAsyncLambdaHandler(event, context) {
-    return new Promise(function (resolve, reject) {
-      self.lambdaContext = context;
+
+  const shouldReportTimeouts = this.options.captureLambdaTimeouts;
+
+  const rollbarAsyncLambdaHandler = (event, context) => {
+    return new Promise((resolve, reject) => {
+      this.lambdaContext = context;
       if (shouldReportTimeouts) {
-        var timeoutCb = (timeoutHandler || _timeoutHandler).bind(
+        const timeoutCb = (timeoutHandler || _timeoutHandler).bind(
           null,
           event,
           context,
         );
-        self.lambdaTimeoutHandle = setTimeout(
+        this.lambdaTimeoutHandle = setTimeout(
           timeoutCb,
           context.getRemainingTimeInMillis() - 1000,
         );
       }
       handler(event, context)
-        .then(function (resp) {
-          self.wait(function () {
-            clearTimeout(self.lambdaTimeoutHandle);
+        .then((resp) => {
+          this.wait(() => {
+            clearTimeout(this.lambdaTimeoutHandle);
             resolve(resp);
           });
         })
-        .catch(function (err) {
-          self.error(err);
-          self.wait(function () {
-            clearTimeout(self.lambdaTimeoutHandle);
+        .catch((err) => {
+          this.error(err);
+          this.wait(() => {
+            clearTimeout(this.lambdaTimeoutHandle);
             reject(err);
           });
         });
     });
   };
+
+  return rollbarAsyncLambdaHandler;
 };
+
 Rollbar.prototype.syncLambdaHandler = function (handler, timeoutHandler) {
-  var self = this;
-  var _timeoutHandler = function (event, context, _cb) {
-    var message = 'Function timed out';
-    var custom = {
+  const _timeoutHandler = (event, context, _cb) => {
+    const message = 'Function timed out';
+    const custom = {
       originalEvent: event,
       originalRequestId: context.awsRequestId,
     };
-    self.error(message, custom);
+    this.error(message, custom);
   };
-  var shouldReportTimeouts = self.options.captureLambdaTimeouts;
-  return function (event, context, callback) {
-    self.lambdaContext = context;
+
+  const shouldReportTimeouts = this.options.captureLambdaTimeouts;
+
+  return (event, context, callback) => {
+    this.lambdaContext = context;
     if (shouldReportTimeouts) {
-      var timeoutCb = (timeoutHandler || _timeoutHandler).bind(
+      const timeoutCb = (timeoutHandler || _timeoutHandler).bind(
         null,
         event,
         context,
         callback,
       );
-      self.lambdaTimeoutHandle = setTimeout(
+      this.lambdaTimeoutHandle = setTimeout(
         timeoutCb,
         context.getRemainingTimeInMillis() - 1000,
       );
     }
     try {
-      handler(event, context, function (err, resp) {
+      handler(event, context, (err, resp) => {
         if (err) {
-          self.error(err);
+          this.error(err);
         }
-        self.wait(function () {
-          clearTimeout(self.lambdaTimeoutHandle);
+        this.wait(() => {
+          clearTimeout(this.lambdaTimeoutHandle);
           callback(err, resp);
         });
       });
     } catch (err) {
-      self.error(err);
-      self.wait(function () {
-        clearTimeout(self.lambdaTimeoutHandle);
+      this.error(err);
+      this.wait(() => {
+        clearTimeout(this.lambdaTimeoutHandle);
         throw err;
       });
     }
@@ -646,7 +651,7 @@ Rollbar.prototype.setupUnhandledCapture = function () {
 };
 
 Rollbar.prototype.handleUncaughtExceptions = function () {
-  var exitOnUncaught = !!this.options.exitOnUncaughtException;
+  var exitOnUncaught = Boolean(this.options.exitOnUncaughtException);
   delete this.options.exitOnUncaughtException;
 
   addOrReplaceRollbarHandler(

package/src/server/sourceMap/stackTrace.js

@@ -1,6 +1,7 @@
-import { SourceMapConsumer } from 'source-map';
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
+
+import { SourceMapConsumer } from 'source-map';
 
 /**
  * Uses Node source-map to map transpiled JS stack locations to original
@@ -46,7 +47,7 @@ function retrieveFile(path) {
     if (fs.existsSync(path)) {
       contents = fs.readFileSync(path, 'utf8');
     }
-  } catch (er) {
+  } catch (_er) {
     /* ignore any errors */
   }
 
@@ -58,10 +59,10 @@ function retrieveFile(path) {
 function supportRelativeURL(file, url) {
   if (!file) return url;
   var dir = path.dirname(file);
-  var match = /^\w+:\/\/[^\/]*/.exec(dir);
+  var match = /^\w+:\/\/[^/]*/.exec(dir);
   var protocol = match ? match[0] : '';
   var startPath = dir.slice(protocol.length);
-  if (protocol && /^\/\w\:/.test(startPath)) {
+  if (protocol && /^\/\w:/.test(startPath)) {
     // handle file:///C:/ paths
     protocol += '/';
     return (
@@ -78,7 +79,7 @@ function retrieveSourceMapURL(source) {
   // Get the URL of the source map
   fileData = retrieveFile(source);
   var re =
-    /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/)[ \t]*$)/gm;
+    /(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^*]+?)[ \t]*(?:\*\/)[ \t]*$)/gm;
   // Keep executing the search to find the *last* sourceMappingURL to avoid
   // picking up sourceMappingURLs from comments, strings, etc.
   var lastMatch, match;

package/src/server/telemetry/urlHelpers.js

@@ -1,5 +1,6 @@
 import { URL } from 'url';
-import merge from '../../merge.js';
+
+import { merge } from '../../utility.js';
 
 // This function replicates the relevant logic in node/lib/http.js as closely
 // as possible in order to produce the same result. Therefore, the code is

package/src/server/telemetry.js

@@ -1,7 +1,9 @@
 import http from 'http';
 import https from 'https';
-import * as _ from '../utility.js';
+
 import replace from '../utility/replace.js';
+import * as _ from '../utility.js';
+
 import * as urlHelpers from './telemetry/urlHelpers.js';
 
 var defaults = {
@@ -87,9 +89,9 @@ Instrumenter.prototype.instrumentNetwork = function () {
 
 function networkRequestWrapper(orig) {
   var telemeter = this.telemeter;
-  var self = this;
 
-  return function (url, options, cb) {
+  return (...args) => {
+    const [url, options, cb] = args;
     var mergedOptions = urlHelpers.mergeOptions(url, options, cb);
 
     var metadata = {
@@ -100,23 +102,21 @@ function networkRequestWrapper(orig) {
       end_time_ms: null,
     };
 
-    if (self.autoInstrument.networkRequestHeaders) {
+    if (this.autoInstrument.networkRequestHeaders) {
       metadata.request_headers = mergedOptions.options.headers;
     }
     telemeter.captureNetwork(metadata, 'http');
 
-    // Call the original method with the original arguments and wrapped callback.
-    var wrappedArgs = Array.from(arguments);
     var wrappedCallback = responseCallbackWrapper(
-      self.autoInstrument,
+      this.autoInstrument,
       metadata,
       mergedOptions.cb,
     );
     if (mergedOptions.cb) {
-      wrappedArgs.pop();
+      args.pop();
     }
-    wrappedArgs.push(wrappedCallback);
-    var req = orig.apply(https, wrappedArgs);
+    args.push(wrappedCallback);
+    var req = orig.apply(https, args);
 
     req.on('error', (err) => {
       metadata.status_code = 0;

package/src/server/transforms.js

@@ -1,9 +1,12 @@
+import url from 'url';
+
 import async from 'async';
-import * as parser from './parser.js';
 import requestIp from 'request-ip';
-import url from 'url';
-import * as _ from '../utility.js';
+
 import scrub from '../scrub.js';
+import * as _ from '../utility.js';
+
+import * as parser from './parser.js';
 
 function baseData(item, options, callback) {
   var environment =
@@ -17,6 +20,7 @@ function baseData(item, options, callback) {
     uuid: item.uuid,
     notifier: JSON.parse(JSON.stringify(options.notifier)),
     custom: item.custom,
+    attributes: item.data?.attributes,
   };
 
   if (options.codeVersion) {
@@ -27,7 +31,7 @@ function baseData(item, options, callback) {
 
   var props = Object.getOwnPropertyNames(item.custom || {});
   props.forEach(function (name) {
-    if (!data.hasOwnProperty(name)) {
+    if (!_.hasOwn(data, name)) {
       data[name] = item.custom[name];
     }
   });
@@ -141,7 +145,7 @@ function addRequestData(item, options, callback) {
       routePath = req.app._router.matchRequest(req).path;
       item.data.context =
         baseUrl && baseUrl.length ? baseUrl + routePath : routePath;
-    } catch (ignore) {
+    } catch (_ignore) {
       // Ignored
     }
   }
@@ -311,7 +315,7 @@ function _buildRequestData(req) {
     var bodyParams = {};
     if (_.isIterable(body)) {
       for (var k in body) {
-        if (Object.prototype.hasOwnProperty.call(body, k)) {
+        if (_.hasOwn(body, k)) {
           bodyParams[k] = body[k];
         }
       }

package/src/server/transport.js

@@ -1,11 +1,12 @@
-import * as _ from '../utility.js';
-import truncation from '../truncation.js';
-import logger from '../logger.js';
-
 import http from 'http';
 import https from 'https';
+
 import jsonBackup from 'json-stringify-safe';
 
+import logger from '../logger.js';
+import truncation from '../truncation.js';
+import * as _ from '../utility.js';
+
 var MAX_RATE_LIMIT_INTERVAL = 60;
 
 /*
@@ -37,7 +38,7 @@ Transport.prototype.get = function (
 ) {
   var t;
   if (!callback || !_.isFunction(callback)) {
-    callback = function () {};
+    callback = () => {};
   }
   options = options || {};
   _.addParamsAndAccessTokenToPath(accessToken, options, params);
@@ -74,7 +75,7 @@ Transport.prototype.post = function ({
 }) {
   var t;
   if (!callback || !_.isFunction(callback)) {
-    callback = function () {};
+    callback = () => {};
   }
   if (_currentTime() < this.rateLimitExpires) {
     return callback(new Error('Exceeded rate limit'));
@@ -154,7 +155,7 @@ function _headers(accessToken, options, data) {
   if (data) {
     try {
       headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
-    } catch (e) {
+    } catch (_e) {
       logger.error('Could not get the content length of the data');
     }
   }

package/src/telemetry.js

@@ -40,7 +40,7 @@ class Telemeter {
             events.splice(i, 1);
           }
         }
-      } catch (e) {
+      } catch (_e) {
         this.options.filterTelemetry = null;
       }
     }
@@ -49,7 +49,9 @@ class Telemeter {
     events = events.filter((e) => e.type !== 'connectivity');
 
     // Remove internal keys from output
-    events = events.map(({ otelAttributes, ...event }) => event);
+    events = events.map(
+      ({ otelAttributes: _otelAttributes, ...event }) => event,
+    );
 
     return events;
   }
@@ -90,7 +92,7 @@ class Telemeter {
       ) {
         return false;
       }
-    } catch (exc) {
+    } catch (_exc) {
       this.options.filterTelemetry = null;
     }
 
@@ -132,29 +134,16 @@ class Telemeter {
   }
 
   captureLog(message, level, rollbarUUID, timestamp) {
-    let otelAttributes = null;
+    const event = rollbarUUID
+      ? 'rollbar-occurrence-event'
+      : 'rollbar-log-event';
+    const otelAttributes = {
+      message,
+      level,
+      ...(rollbarUUID ? { type: 'message', uuid: rollbarUUID } : {}),
+    };
 
-    // If the uuid is present, this is a message occurrence.
-    if (rollbarUUID) {
-      ((otelAttributes = {
-        message,
-        level,
-        type: 'message',
-        uuid: rollbarUUID,
-      }),
-        this.telemetrySpan?.addEvent(
-          'rollbar-occurrence-event',
-          otelAttributes,
-          fromMillis(timestamp),
-        ));
-    } else {
-      otelAttributes = { message, level };
-      this.telemetrySpan?.addEvent(
-        'rollbar-log-event',
-        otelAttributes,
-        fromMillis(timestamp),
-      );
-    }
+    this.telemetrySpan?.addEvent(event, otelAttributes, fromMillis(timestamp));
 
     return this.capture(
       'log',
@@ -183,6 +172,14 @@ class Telemeter {
       'response.headers': JSON.stringify(metadata.response?.headers || {}),
       'response.timeUnixNano': endTimeNano.toString(),
     };
+    const requestBody = metadata.request;
+    const responseBody = metadata.response?.body;
+    if (requestBody) {
+      otelAttributes['request.body'] = JSON.stringify(requestBody);
+    }
+    if (responseBody) {
+      otelAttributes['response.body'] = JSON.stringify(responseBody);
+    }
 
     this.telemetrySpan?.addEvent(
       'rollbar-network-event',

package/src/tracing/tracer.js

@@ -1,5 +1,5 @@
-import { Span } from './span.js';
 import id from './id.js';
+import { Span } from './span.js';
 
 export class Tracer {
   constructor(tracing, spanProcessor) {
@@ -39,7 +39,7 @@ export class Tracer {
     const span = new Span({
       resource: resource,
       scope: this.tracing.scope,
-      session: this.tracing.session.session,
+      session: this.tracing.session?.session,
       context,
       spanContext,
       name,

package/src/tracing/tracing.js

@@ -1,9 +1,9 @@
 import { ContextManager, createContextKey } from './contextManager.js';
-import { Session } from './session.js';
 import { SpanExporter } from './exporter.js';
+import id from './id.js';
+import { Session } from './session.js';
 import { SpanProcessor } from './spanProcessor.js';
 import { Tracer } from './tracer.js';
-import id from './id.js';
 
 const SPAN_KEY = createContextKey('Rollbar Context Key SPAN');
 

package/src/truncation.js

@@ -1,5 +1,5 @@
-import * as _ from './utility.js';
 import traverse from './utility/traverse.js';
+import * as _ from './utility.js';
 
 function raw(payload, jsonBackup) {
   return [payload, _.stringify(payload, jsonBackup)];
@@ -19,10 +19,10 @@ function truncateFrames(payload, jsonBackup, range) {
   var frames;
   if (body.trace_chain) {
     var chain = body.trace_chain;
-    for (var i = 0; i < chain.length; i++) {
-      frames = chain[i].frames;
+    for (const trace of chain) {
+      frames = trace.frames;
       frames = selectFrames(frames, range);
-      chain[i].frames = frames;
+      trace.frames = frames;
     }
   } else if (body.trace) {
     frames = body.trace.frames;
@@ -74,8 +74,8 @@ function minBody(payload, jsonBackup) {
   var body = payload.data.body;
   if (body.trace_chain) {
     var chain = body.trace_chain;
-    for (var i = 0; i < chain.length; i++) {
-      chain[i] = truncateTraceData(chain[i]);
+    for (const [index, trace] of chain.entries()) {
+      chain[index] = truncateTraceData(trace);
     }
   } else if (body.trace) {
     body.trace = truncateTraceData(body.trace);

package/src/utility/headers.js

@@ -1,3 +1,5 @@
+import { hasOwn } from '../utility.js';
+
 /*
  * headers - Detect when fetch Headers are undefined and use a partial polyfill.
  *
@@ -72,12 +74,12 @@ FetchHeaders.prototype.get = function (name) {
 };
 
 FetchHeaders.prototype.has = function (name) {
-  return this.map.hasOwnProperty(normalizeName(name));
+  return hasOwn(this.map, normalizeName(name));
 };
 
 FetchHeaders.prototype.forEach = function (callback, thisArg) {
   for (var name in this.map) {
-    if (this.map.hasOwnProperty(name)) {
+    if (hasOwn(this.map, name)) {
       callback.call(thisArg, this.map[name], name, this);
     }
   }

package/src/utility/traverse.js

@@ -24,7 +24,7 @@ function traverse(obj, func, seen) {
 
   if (isObj) {
     for (k in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, k)) {
+      if (_.hasOwn(obj, k)) {
         keys.push(k);
       }
     }