Release v2.12.3

Author: waltjones

Diff for: README.md

@@ -1,6 +1,6 @@
 # Rollbar.js
 
-[![Build Status](https://api.travis-ci.org/rollbar/rollbar.js.png?branch=v2.12.2)](https://travis-ci.org/rollbar/rollbar.js)
+[![Build Status](https://api.travis-ci.org/rollbar/rollbar.js.png?branch=v2.12.3)](https://travis-ci.org/rollbar/rollbar.js)
 [![Code Quality: Javascript](https://img.shields.io/lgtm/grade/javascript/g/rollbar/rollbar.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rollbar/rollbar.js/context:javascript)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/rollbar/rollbar.js.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rollbar/rollbar.js/alerts)
 

Diff for: dist/rollbar.js

@@ -475,6 +475,7 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
   var message, err, custom, callback, request;
   var arg;
   var extraArgs = [];
+  var diagnostic = {};
 
   for (var i = 0, l = args.length; i < l; ++i) {
     arg = args[i];
@@ -537,6 +538,8 @@ function createItem(args, logger, notifier, requestKeys, lambdaContext) {
     custom: custom,
     timestamp: now(),
     callback: callback,
+    notifier: notifier,
+    diagnostic: diagnostic,
     uuid: uuid4()
   };
   if (custom && custom.level !== undefined) {
@@ -1768,7 +1771,7 @@ function _gWindow() {
 /* global __DEFAULT_ENDPOINT__:false */
 
 var defaultOptions = {
-  version: "2.12.2",
+  version: "2.12.3",
   scrubFields: ["pw","pass","passwd","password","secret","confirm_password","confirmPassword","password_confirmation","passwordConfirmation","access_token","accessToken","secret_key","secretKey","secretToken","cc-number","card number","cardnumber","cardnum","ccnum","ccnumber","cc num","creditcardnumber","credit card number","newcreditcardnumber","new credit card","creditcardno","credit card no","card#","card #","cc-csc","cvc","cvc2","cvv2","ccv2","security code","card verification","name on credit card","name on card","nameoncard","cardholder","card holder","name des karteninhabers","ccname","card type","cardtype","cc type","cctype","payment type","expiration date","expirationdate","expdate","cc-exp","ccmonth","ccyear"],
   logLevel: "debug",
   reportLevel: "debug",
@@ -3214,6 +3217,7 @@ function Notifier(queue, options) {
   this.queue = queue;
   this.options = options;
   this.transforms = [];
+  this.diagnostic = {};
 }
 
 /*
@@ -4863,7 +4867,7 @@ function addConfiguredOptions(item, options, callback) {
 }
 
 function addDiagnosticKeys(item, options, callback) {
-  var diagnostic = {}
+  var diagnostic = _.merge(item.notifier.client.notifier.diagnostic, item.diagnostic);
 
   if (_.get(item, 'err._isAnonymous')) {
     diagnostic.is_anonymous = true;
@@ -5175,6 +5179,7 @@ function Instrumenter(options, telemeter, rollbar, _window, _document) {
   this.defaultValueScrubber = defaultValueScrubber(options.scrubFields);
   this.telemeter = telemeter;
   this.rollbar = rollbar;
+  this.diagnostic = rollbar.client.notifier.diagnostic;
   this._window = _window || {};
   this._document = _document || {};
   this.replacements = {
@@ -5477,6 +5482,8 @@ Instrumenter.prototype.instrumentConsole = function() {
   var c = this._window.console;
 
   function wrapConsole(method) {
+    'use strict'; // See https://github.com/rollbar/rollbar.js/pull/778
+
     var orig = c[method];
     var origConsole = c;
     var level = method === 'warn' ? 'warning' : method;
@@ -5491,8 +5498,12 @@ Instrumenter.prototype.instrumentConsole = function() {
     self.replacements['log'].push([method, orig]);
   }
   var methods = ['debug','info','warn','error','log'];
-  for (var i=0, len=methods.length; i < len; i++) {
-    wrapConsole(methods[i]);
+  try {
+    for (var i=0, len=methods.length; i < len; i++) {
+      wrapConsole(methods[i]);
+    }
+  } catch (e) {
+    this.diagnostic.instrumentConsole = { error: e.message };
   }
 };