From 651e48dbd6a8bbcf2561d62c93897309143e2a9e Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 27 Mar 2018 12:37:30 -0700
Subject: sentry - simplify all ethjs errors for better batching

---
 app/scripts/lib/extractEthjsErrorMessage.js | 27 +++++++++++++++++++++++++++
 app/scripts/lib/reportFailedTxToSentry.js   | 26 ++------------------------
 app/scripts/lib/setupRaven.js               |  7 ++++++-
 3 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 app/scripts/lib/extractEthjsErrorMessage.js

(limited to 'app/scripts')

diff --git a/app/scripts/lib/extractEthjsErrorMessage.js b/app/scripts/lib/extractEthjsErrorMessage.js
new file mode 100644
index 000000000..bac541735
--- /dev/null
+++ b/app/scripts/lib/extractEthjsErrorMessage.js
@@ -0,0 +1,27 @@
+const ethJsRpcSlug = 'Error: [ethjs-rpc] rpc error with payload '
+const errorLabelPrefix = 'Error: '
+
+module.exports = extractEthjsErrorMessage
+
+
+//
+// ethjs-rpc provides overly verbose error messages
+// if we detect this type of message, we extract the important part
+// Below is an example input and output
+//
+// Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced
+//
+// Transaction Failed: replacement transaction underpriced
+//
+
+
+function extractEthjsErrorMessage(errorMessage) {
+  const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug)
+  if (isEthjsRpcError) {
+    const payloadAndError = errorMessage.slice(ethJsRpcSlug.length)
+    const originalError = payloadAndError.slice(payloadAndError.indexOf(errorLabelPrefix) + errorLabelPrefix.length)
+    return originalError
+  } else {
+    return errorMessage
+  }
+}
diff --git a/app/scripts/lib/reportFailedTxToSentry.js b/app/scripts/lib/reportFailedTxToSentry.js
index ee73f6845..e09f4f1f8 100644
--- a/app/scripts/lib/reportFailedTxToSentry.js
+++ b/app/scripts/lib/reportFailedTxToSentry.js
@@ -1,5 +1,4 @@
-const ethJsRpcSlug = 'Error: [ethjs-rpc] rpc error with payload '
-const errorLabelPrefix = 'Error: '
+const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
 
 module.exports = reportFailedTxToSentry
 
@@ -9,30 +8,9 @@ module.exports = reportFailedTxToSentry
 //
 
 function reportFailedTxToSentry({ raven, txMeta }) {
-  const errorMessage = extractErrorMessage(txMeta.err.message)
+  const errorMessage = 'Transaction Failed: ' + extractEthjsErrorMessage(txMeta.err.message)
   raven.captureMessage(errorMessage, {
     // "extra" key is required by Sentry
     extra: txMeta,
   })
 }
-
-//
-// ethjs-rpc provides overly verbose error messages
-// if we detect this type of message, we extract the important part
-// Below is an example input and output
-//
-// Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced
-//
-// Transaction Failed: replacement transaction underpriced
-//
-
-function extractErrorMessage(errorMessage) {
-  const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug)
-  if (isEthjsRpcError) {
-    const payloadAndError = errorMessage.slice(ethJsRpcSlug.length)
-    const originalError = payloadAndError.slice(payloadAndError.indexOf(errorLabelPrefix) + errorLabelPrefix.length)
-    return `Transaction Failed: ${originalError}`
-  } else {
-    return `Transaction Failed: ${errorMessage}`
-  }
-}
diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index 02c01b755..a869588d0 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -1,5 +1,6 @@
 const Raven = require('raven-js')
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
+const extractEthjsErrorMessage = require('./extractEthjsErrorMessage')
 const PROD = 'https://3567c198f8a8412082d32655da2961d0@sentry.io/273505'
 const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496'
 
@@ -21,8 +22,12 @@ function setupRaven(opts) {
   const client = Raven.config(ravenTarget, {
     release,
     transport: function(opts) {
-      // modify report urls
       const report = opts.data
+      // simplify ethjs error messages
+      report.exception.values.forEach(item => {
+        item.value = extractEthjsErrorMessage(item.value)
+      })
+      // modify report urls
       rewriteReportUrls(report)
       // make request normally
       client._makeRequest(opts)
-- 
cgit v1.2.3