From 50a917280a1b2ac37ab0c03fe3a57f9eb18eb855 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Thu, 20 Dec 2018 12:53:33 -0500
Subject: [PATCH] Use new sentry API provided by www, and use analytics ID from
www
---
src/containers/error-boundary.jsx | 11 ++++++++---
src/lib/analytics.js | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/containers/error-boundary.jsx b/src/containers/error-boundary.jsx
index e5bfb3ea2..cc34b87dd 100644
--- a/src/containers/error-boundary.jsx
+++ b/src/containers/error-boundary.jsx
@@ -27,7 +27,7 @@ class ErrorBoundary extends React.Component {
// Display fallback UI
this.setState({
hasError: true,
- errorId: window.Raven ? window.Raven.lastEventId() : null
+ errorId: window.Sentry ? window.Sentry.lastEventId() : null
});
// Log errors to analytics, separating supported browsers from unsupported.
@@ -37,8 +37,13 @@ class ErrorBoundary extends React.Component {
action: this.props.action,
label: error.message
});
- if (window.Raven) {
- window.Raven.captureException(error, {extra: info});
+ if (window.Sentry) {
+ window.Sentry.withScope(scope => {
+ Object.keys(info).forEach(key => {
+ scope.setExtra(key, info[key]);
+ });
+ window.Sentry.captureException(error);
+ });
}
} else {
analytics.event({
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
index 7b3098d6b..a411ed958 100644
--- a/src/lib/analytics.js
+++ b/src/lib/analytics.js
@@ -1,6 +1,6 @@
import GoogleAnalytics from 'react-ga';
-GoogleAnalytics.initialize(process.env.GA_ID, {
+GoogleAnalytics.initialize(process.env.GA_ID || window.GA_ID, {
debug: (process.env.NODE_ENV !== 'production'),
titleCase: true,
sampleRate: (process.env.NODE_ENV === 'production') ? 100 : 0,
--
GitLab