feat: Enable Sentry only if analyticsEnabled is true (canonical#1673)

vladimir-cucu · Dec 5, 2023 · 5d01b93 · 5d01b93
1 parent e6b2be0
commit 5d01b93
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/components/ErrorBoundary/ErrorBoundary.tsx b/src/components/ErrorBoundary/ErrorBoundary.tsx
@@ -33,11 +33,16 @@ export default class ErrorBoundary extends Component<Props, State> {
   }
 
   componentDidCatch(error: Error, info: unknown) {
-    Sentry.withScope((scope) => {
-      scope.setExtras(info as Extras);
-      const eventId = Sentry.captureException(error);
-      this.setState({ eventId });
-    });
+    if (
+      process.env.NODE_ENV === "production" &&
+      window.jujuDashboardConfig?.analyticsEnabled
+    ) {
+      Sentry.withScope((scope) => {
+        scope.setExtras(info as Extras);
+        const eventId = Sentry.captureException(error);
+        this.setState({ eventId });
+      });
+    }
   }
 
   render() {

diff --git a/src/index.tsx b/src/index.tsx
@@ -32,7 +32,10 @@ if (!window.process) {
   window.process = process;
 }
 
-if (process.env.NODE_ENV === "production") {
+if (
+  process.env.NODE_ENV === "production" &&
+  window.jujuDashboardConfig?.analyticsEnabled
+) {
   Sentry.init({
     dsn: "https://[email protected]//29",
   });
@@ -131,7 +134,7 @@ function bootstrap() {
     }
   }
 
-  if (process.env.NODE_ENV === "production") {
+  if (process.env.NODE_ENV === "production" && config.analyticsEnabled) {
     Sentry.setTag("isJuju", config.isJuju);
   }
 

diff --git a/src/store/middleware/model-poller.ts b/src/store/middleware/model-poller.ts
@@ -106,7 +106,10 @@ export const modelPollerMiddleware: Middleware<
 
           // XXX Now that we can register multiple controllers this needs
           // to be sent per controller.
-          if (process.env.NODE_ENV === "production") {
+          if (
+            process.env.NODE_ENV === "production" &&
+            window.jujuDashboardConfig?.analyticsEnabled
+          ) {
             Sentry.setTag("jujuVersion", conn.info.serverVersion);
           }