Implement review suggestions

adminSiteClient/instrument.ts

@@ -1,7 +1,12 @@
 import * as Sentry from "@sentry/react"
+import {
+    COMMIT_SHA,
+    ENV,
+    SENTRY_ADMIN_DSN,
+} from "../settings/clientSettings.js"
 
 Sentry.init({
-    dsn: process.env.SENTRY_ADMIN_DSN,
-    environment: process.env.ENV,
-    release: process.env.COMMIT_SHA,
+    dsn: SENTRY_ADMIN_DSN,
+    environment: ENV,
+    release: COMMIT_SHA,
 })

adminSiteServer/app.ts

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../serverUtils/instrument.js"
 
 import { GIT_CMS_DIR } from "../gitCms/GitCmsConstants.js"

adminSiteServer/appClass.tsx

@@ -155,8 +155,8 @@ export class OwidAdminApp {
             app.use("/", mockSiteRouter)
         }
 
-        // Add this after all routes,
-        // but before any and other error-handling middlewares are defined
+        // Add this after all routes, but before any other error-handling
+        // middlewares are defined.
         Sentry.setupExpressErrorHandler(app)
 
         // Give full error messages, including in production

baker/SiteBaker.tsx

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../serverUtils/instrument.js"
 
 import fs from "fs-extra"
@@ -211,13 +212,6 @@ export class SiteBaker {
             }
         )
         this.explorerAdminServer = new ExplorerAdminServer(GIT_CMS_DIR)
-        // if (BUGSNAG_NODE_API_KEY) {
-        //     Bugsnag.start({
-        //         apiKey: BUGSNAG_NODE_API_KEY,
-        //         context: "site-baker",
-        //         autoTrackSessions: false,
-        //     })
-        // }
     }
 
     private async bakeEmbeds(knex: db.KnexReadonlyTransaction) {

baker/algolia/indexChartsToAlgolia.ts

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../../serverUtils/instrument.js"
 
 import * as db from "../../db/db.js"

baker/algolia/indexExplorerViewsAndChartsToAlgolia.ts

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../../serverUtils/instrument.js"
 
 import * as db from "../../db/db.js"

baker/algolia/indexExplorerViewsToAlgolia.ts

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../../serverUtils/instrument.js"
 
 import * as db from "../../db/db.js"

baker/startDeployQueueServer.ts

@@ -1,4 +1,5 @@
-// This must be imported first for Sentry instrumentation to work.
+// This should be imported as early as possible so the global error handler is
+// set up before any errors are thrown.
 import "../serverUtils/instrument.js"
 
 import fs from "fs-extra"

site/instrument.ts

@@ -5,7 +5,7 @@ import { getPreferenceValue, PreferenceType } from "./cookiePreferences.js"
 
 const analyticsConsent = getPreferenceValue(PreferenceType.Analytics)
 
-let sentryOpts: Sentry.BrowserOptions
+let sentryOpts: Sentry.BrowserOptions = {}
 if (analyticsConsent && !isInIFrame()) {
     // only collect session replays from: users that have consented to analytics
     // AND where page isn't embedded in an iframe
@@ -21,11 +21,6 @@ if (analyticsConsent && !isInIFrame()) {
         replaysSessionSampleRate: ENV === "development" ? 1 : 0.1,
         replaysOnErrorSampleRate: 0,
     }
-} else {
-    sentryOpts = {
-        replaysSessionSampleRate: 0,
-        replaysOnErrorSampleRate: 0,
-    }
 }
 Sentry.init({
     dsn: SENTRY_DSN,