From 91a05d636f61784b508170a4f01a64fec1e28b8d Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Thu, 10 Oct 2019 13:15:35 -0400
Subject: [PATCH] redo sentry tag key and values, move ErrorBoundary around
 embed

---
 src/components/errorboundary/errorboundary.jsx | 2 +-
 src/components/page/www/page.jsx               | 2 +-
 src/views/join/join.jsx                        | 2 +-
 src/views/preview/embed-view.jsx               | 9 +++------
 src/views/preview/embed.jsx                    | 6 ++++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/errorboundary/errorboundary.jsx b/src/components/errorboundary/errorboundary.jsx
index 75d60b8ac..41a641421 100644
--- a/src/components/errorboundary/errorboundary.jsx
+++ b/src/components/errorboundary/errorboundary.jsx
@@ -19,7 +19,7 @@ class ErrorBoundary extends React.Component {
         Sentry.withScope(scope => {
             scope.setTag('project', 'scratch-www');
             if (this.props.name) {
-                scope.setTag('errorboundary', this.props.name);
+                scope.setTag('component', this.props.name);
             }
             Object.keys(errorInfo).forEach(key => {
                 scope.setExtra(key, errorInfo[key]);
diff --git a/src/components/page/www/page.jsx b/src/components/page/www/page.jsx
index 19142005a..150c03c52 100644
--- a/src/components/page/www/page.jsx
+++ b/src/components/page/www/page.jsx
@@ -10,7 +10,7 @@ const Page = ({
     children,
     className
 }) => (
-    <ErrorBoundary name="page">
+    <ErrorBoundary name="Page">
         <div className={classNames('page', className)}>
             <div
                 className={classNames({
diff --git a/src/views/join/join.jsx b/src/views/join/join.jsx
index a18a092b1..1b1b7f1c2 100644
--- a/src/views/join/join.jsx
+++ b/src/views/join/join.jsx
@@ -10,7 +10,7 @@ initSentry();
 
 require('./join.scss');
 const Register = () => (
-    <ErrorBoundary name="join">
+    <ErrorBoundary name="Join">
         <div className="join">
             <a
                 aria-label="Scratch"
diff --git a/src/views/preview/embed-view.jsx b/src/views/preview/embed-view.jsx
index 789c6917b..783f6b712 100644
--- a/src/views/preview/embed-view.jsx
+++ b/src/views/preview/embed-view.jsx
@@ -5,7 +5,6 @@ const PropTypes = require('prop-types');
 const connect = require('react-redux').connect;
 const injectIntl = require('react-intl').injectIntl;
 
-const ErrorBoundary = require('../../components/errorboundary/errorboundary.jsx');
 const projectShape = require('./projectshape.jsx').projectShape;
 const NotAvailable = require('../../components/not-available/not-available.jsx');
 const Meta = require('./meta.jsx');
@@ -35,11 +34,9 @@ class EmbedView extends React.Component {
     render () {
         if (this.props.projectNotAvailable || this.state.invalidProject) {
             return (
-                <ErrorBoundary name="embed">
-                    <div className="preview">
-                        <NotAvailable />
-                    </div>
-                </ErrorBoundary>
+                <div className="preview">
+                    <NotAvailable />
+                </div>
             );
         }
 
diff --git a/src/views/preview/embed.jsx b/src/views/preview/embed.jsx
index 8ef61e37e..8285ffa04 100644
--- a/src/views/preview/embed.jsx
+++ b/src/views/preview/embed.jsx
@@ -13,7 +13,9 @@ const UnsupportedBrowser = require('./unsupported-browser.jsx');
 if (isSupportedBrowser()) {
     const EmbedView = require('./embed-view.jsx');
     render(
-        <EmbedView.View />,
+        <ErrorBoundary name="EmbedView">
+            <EmbedView.View />
+        </ErrorBoundary>,
         document.getElementById('app'),
         {
             preview: previewActions.previewReducer,
@@ -27,7 +29,7 @@ if (isSupportedBrowser()) {
     );
 } else {
     render(
-        <ErrorBoundary name="unsupportedbrowser"><UnsupportedBrowser /></ErrorBoundary>,
+        <ErrorBoundary name="UnsupportedBrowser"><UnsupportedBrowser /></ErrorBoundary>,
         document.getElementById('app')
     );
 }