use new crash reporter api

brave/muon#279

app/common/tracing.js

@@ -0,0 +1,77 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global performance */
+
+let nodeTimer
+if (typeof performance === 'undefined') {
+  nodeTimer = {
+    now: function () {
+      const NS_PER_SEC = 1e9
+      const NS_PER_MS = 1e6
+      const time = process.hrtime()
+      const seconds = time[0]
+      const nanoseconds = time[1] + (seconds * NS_PER_SEC)
+      return nanoseconds / NS_PER_MS
+    }
+  }
+}
+const timer = nodeTimer || performance
+
+const filterArgs = function (args) {
+  const filteredArgs = []
+  for (let i = 0; i < args.length; i++) {
+    if (typeof args === 'object') {
+      filteredArgs[i] = '[Filtered]'
+    } else {
+      filteredArgs[i] = args[i]
+    }
+  }
+  return filteredArgs
+}
+
+exports.trace = (obj, ...args) => {
+  let filter = filterArgs
+  let metadata = {}
+  for (let i = 0; i < args.length; i++) {
+    if (typeof args[i] === 'function') {
+      filter = args[i]
+    } else if (typeof args[i] === 'object') {
+      metadata = args[i]
+    } else {
+      console.warn('invalid argument for trace: ' + args[i])
+    }
+  }
+
+  let handler = {
+    get (target, propKey, receiver) {
+      const propValue = target[propKey]
+      if (typeof propValue !== 'function') {
+        return propValue
+      }
+      return function (...fnArgs) {
+        metadata.name = propKey
+        muon.crashReporter.setCrashKeyValue('javascript-info', JSON.stringify(metadata))
+        let result, end, exception
+        const start = timer.now()
+        try {
+          result = propValue.apply(this, fnArgs)
+          end = timer.now()
+          metadata.durationMS = Math.ceil(end - start)
+        } catch (e) {
+          metadata.args = filter(fnArgs)
+          metadata.stack = e.stack != null ? e.stack : e.name + ': ' + e.message
+          exception = e
+        }
+        muon.crashReporter.setCrashKeyValue('javascript-info', JSON.stringify(metadata))
+        if (exception) {
+          muon.crashReporter.dumpWithoutCrashing()
+          throw exception
+        }
+        return result
+      }
+    }
+  }
+  return new Proxy(obj, handler)
+}

app/crash-herald.js

@@ -2,20 +2,34 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const appConfig = require('../js/constants/appConfig')
 const buildConfig = require('../js/constants/buildConfig')
-const crashReporter = require('electron').crashReporter
+const Channel = require('./channel')
 
-exports.init = () => {
-  const options = {
-    productName: 'Brave Developers',
-    companyName: 'Brave.com',
-    submitURL: appConfig.crashes.crashSubmitUrl,
-    autoSubmit: true,
-    extra: {
-      node_env: process.env.NODE_ENV,
-      rev: buildConfig.BROWSER_LAPTOP_REV || 'unknown'
-    }
+const version = buildConfig.BROWSER_LAPTOP_REV || 'unknown'
+const channel = Channel.channel()
+
+const crashKeys = {
+  'node-env': process.env.NODE_ENV,
+  '_version': version,
+  'channel': channel
+}
+
+const initCrashKeys = () => {
+  for (let key in crashKeys) {
+    muon.crashReporter.setCrashKeyValue(key, crashKeys[key])
+  }
+}
+
+exports.init = (enabled) => {
+  initCrashKeys()
+  const {app} = require('electron')
+  // set muon-app-version switch to pass version to renderer processes
+  app.commandLine.appendSwitch('muon-app-version', version)
+  app.commandLine.appendSwitch('muon-app-channel', channel)
+  muon.crashReporter.setEnabled(enabled)
+  if (enabled) {
+    console.log('Crash reporting enabled')
+  } else {
+    console.log('Crash reporting disabled')
   }
-  crashReporter.start(options)
 }

app/index.js

@@ -7,7 +7,6 @@
 
 let ready = false
 
-// Setup the crash handling
 const CrashHerald = require('./crash-herald')
 const telemetry = require('./telemetry')
 
@@ -20,7 +19,8 @@ const handleUncaughtError = (error) => {
   message = 'Uncaught Exception:\n' + stack
   console.error('An uncaught exception occurred in the main process ' + message)
 
-  // TODO(bridiver) - this should also send a notification to Brave
+  muon.crashReporter.setCrashKeyValue('javascript-info', JSON.stringify({stack}))
+  muon.crashReporter.dumpWithoutCrashing()
 
   if (!ready) {
     console.error('Waiting 60 seconds for process to load')
@@ -71,6 +71,7 @@ const locale = require('./locale')
 const contentSettings = require('../js/state/contentSettings')
 const privacy = require('../js/state/privacy')
 const settings = require('../js/constants/settings')
+const {getSetting} = require('../js/settings')
 const BookmarksExporter = require('./browser/bookmarksExporter')
 
 app.commandLine.appendSwitch('enable-features', 'BlockSmallPluginContent,PreferHtmlOverPlugins')
@@ -95,18 +96,15 @@ let loadAppStatePromise = SessionStore.loadAppState()
 
 // Some settings must be set right away on startup, those settings should be handled here.
 loadAppStatePromise.then((initialImmutableState) => {
-  telemetry.setCheckpointAndReport('state-loaded')
   const {HARDWARE_ACCELERATION_ENABLED, SMOOTH_SCROLL_ENABLED, SEND_CRASH_REPORTS} = require('../js/constants/settings')
-  if (initialImmutableState.getIn(['settings', HARDWARE_ACCELERATION_ENABLED]) === false) {
+  CrashHerald.init(getSetting(SEND_CRASH_REPORTS, initialImmutableState.get('settings')))
+
+  telemetry.setCheckpointAndReport('state-loaded')
+  if (getSetting(HARDWARE_ACCELERATION_ENABLED, initialImmutableState.get('settings')) === false) {
     app.disableHardwareAcceleration()
   }
-  if (initialImmutableState.getIn(['settings', SEND_CRASH_REPORTS]) !== false) {
-    console.log('Crash reporting enabled')
-    CrashHerald.init()
-  } else {
-    console.log('Crash reporting disabled')
-  }
-  if (initialImmutableState.getIn(['settings', SMOOTH_SCROLL_ENABLED]) === false) {
+
+  if (getSetting(SMOOTH_SCROLL_ENABLED, initialImmutableState.get('settings')) === false) {
     app.commandLine.appendSwitch('disable-smooth-scrolling')
   }
 })

js/constants/appConfig.js

@@ -6,7 +6,6 @@ const {getTargetAboutUrl} = require('../lib/appUrlUtil')
 // BRAVE_UPDATE_HOST should be set to the host name for the auto-updater server
 const updateHost = process.env.BRAVE_UPDATE_HOST || 'https://brave-laptop-updates.global.ssl.fastly.net'
 const winUpdateHost = process.env.BRAVE_WIN_UPDATE_HOST || 'https://brave-download.global.ssl.fastly.net'
-const crashURL = process.env.BRAVE_CRASH_URL || 'https://brave-laptop-updates.herokuapp.com/1/crashes'
 const adHost = process.env.AD_HOST || 'https://oip.brave.com'
 const isTest = process.env.NODE_ENV === 'test'
 
@@ -99,9 +98,6 @@ module.exports = {
     enabled: false,
     url: adHost
   },
-  crashes: {
-    crashSubmitUrl: crashURL
-  },
   payments: {
     delayNotificationTryPayments: 1000 * 60 * 60 * 24 * 10 // 10 days (from firstRunTimestamp)
   },

tools/utilAppRunner.js

@@ -14,7 +14,7 @@ function runUtilApp (cmd, file, stdioOptions) {
   }
   cmd = cmd.split(' ')
   if (process.env.NODE_ENV === 'development') {
-    cmd.push('--user-data-dir=brave-development')
+    cmd.push('--user-data-dir-name=brave-development')
   }
   const utilApp = proc.spawnSync('electron', [utilAppDir].concat(cmd), options)
   if (utilApp.error) {