From b7129d5c4f13d6cef365a3c27ff2225dec24cf53 Mon Sep 17 00:00:00 2001
From: minnakt <minna.kt@mongodb.com>
Date: Wed, 1 Nov 2023 11:59:00 -0400
Subject: [PATCH 1/5] DEVPROD-931: Remove BugSnag

---
 .env-cmdrc.local.json                         |   3 +-
 .evergreen.yml                                |   2 -
 index.html                                    |   1 +
 package.json                                  |   8 +-
 scripts/deploy/app-version.sh                 |  18 --
 scripts/deploy/deploy.sh                      |   6 -
 scripts/deploy/upload-bugsnag-sourcemaps.js   |   9 -
 scripts/setup-credentials.js                  |   1 -
 .../DetailsMenu/ButtonRow/index.tsx           |   8 +-
 src/components/ErrorHandling/Bugsnag.tsx      |  67 ------
 .../ErrorHandling/ErrorBoundary.tsx           |  24 +-
 .../ErrorHandling/initialize.test.ts          |  43 ----
 src/components/ErrorHandling/initialize.ts    |   6 -
 src/components/LogPane/index.tsx              |   6 +-
 src/components/NavBar/UploadLink/index.tsx    |  13 +-
 .../usePaginatedVirtualList.ts                |   8 +-
 src/components/ProjectFiltersModal/index.tsx  |   4 +-
 src/components/Search/SearchBar/index.tsx     |  12 +-
 src/components/Search/index.tsx               |  16 +-
 .../NavGroup/FilterNavGroup/index.tsx         |  10 +-
 src/context/auth/index.tsx                    |  12 +-
 src/hooks/useFetch/index.ts                   |  10 +-
 src/hooks/useLogDownloader/index.ts           |  16 +-
 src/pages/LogDrop/FileDropper.tsx             |  12 +-
 src/pages/LogView/LoadingPage/index.tsx       |   5 +-
 src/utils/environmentVariables/index.ts       |   4 -
 .../errorReporting/errorReporting.test.ts     |  41 +---
 src/utils/errorReporting/index.ts             | 114 +++-------
 src/utils/file/index.ts                       |   4 +-
 vite.config.ts                                |   1 +
 yarn.lock                                     | 205 +-----------------
 31 files changed, 146 insertions(+), 543 deletions(-)
 delete mode 100755 scripts/deploy/app-version.sh
 delete mode 100644 scripts/deploy/upload-bugsnag-sourcemaps.js
 delete mode 100644 src/components/ErrorHandling/Bugsnag.tsx

diff --git a/.env-cmdrc.local.json b/.env-cmdrc.local.json
index f563646a..0d1f675f 100644
--- a/.env-cmdrc.local.json
+++ b/.env-cmdrc.local.json
@@ -12,8 +12,7 @@
         "REACT_APP_LOBSTER_URL": "http://localhost:9090/lobster",
         "REACT_APP_LOGKEEPER_URL": "http://localhost:8080",
         "REACT_APP_SPRUCE_URL": "http://localhost:3000",
-        "REACT_APP_RELEASE_STAGE": "local",
-        "REACT_APP_BUGSNAG_API_KEY": "local"
+        "REACT_APP_RELEASE_STAGE": "local"
     },
     "devStaging": {
         "REACT_APP_EVERGREEN_URL": "https://evergreen-staging.corp.mongodb.com",
diff --git a/.evergreen.yml b/.evergreen.yml
index 4aa7a558..fc7337b7 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -177,7 +177,6 @@ functions:
       shell: bash
       script: |
         echo "Generating .env-cmdrc.json"
-        REACT_APP_BUGSNAG_API_KEY=${REACT_APP_BUGSNAG_API_KEY} \
         REACT_APP_SENTRY_AUTH_TOKEN=${REACT_APP_SENTRY_AUTH_TOKEN} \
         REACT_APP_SENTRY_DSN=${REACT_APP_SENTRY_DSN} \
         NEW_RELIC_ACCOUNT_ID=${NEW_RELIC_ACCOUNT_ID} \
@@ -344,7 +343,6 @@ functions:
       shell: bash
       script: |
         ${PREPARE_SHELL}
-        REACT_APP_BUGSNAG_API_KEY=${REACT_APP_BUGSNAG_API_KEY} \
         BUCKET=${bucket} \
         AWS_ACCESS_KEY_ID=${aws_key} \
         AWS_SECRET_ACCESS_KEY=${aws_secret} \
diff --git a/index.html b/index.html
index 2140cab8..a3404e9a 100644
--- a/index.html
+++ b/index.html
@@ -5,6 +5,7 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta name="ui-version" content="%GIT_SHA%">
+  <meta name="package-version" content="%APP_VERSION%" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <title>Parsley</title>
   <script type="text/javascript">
diff --git a/package.json b/package.json
index dbd1b6ab..17db634e 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "1.0.121",
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
-    "build": "tsc && . ./scripts/deploy/app-version.sh && GIT_SHA=`git rev-parse HEAD` vite build",
+    "build": "tsc && GIT_SHA=`git rev-parse HEAD` APP_VERSION=$npm_package_version vite build",
     "build:local": "env-cmd -e local -r .env-cmdrc.local.json yarn build",
     "build:beta": "env-cmd -e beta yarn build",
     "build:staging": "env-cmd -e staging yarn build",
@@ -31,16 +31,13 @@
     "start": "vite",
     "verify-backend": "./scripts/verify-backend.sh",
     "storybook": "storybook dev -p 6006",
-    "storybook:build": "./scripts/deploy/app-version.sh && env-cmd -e local -r .env-cmdrc.local.json storybook build",
+    "storybook:build": "env-cmd -e local -r .env-cmdrc.local.json storybook build",
     "test": "jest --watchAll=false",
     "test:watch": "jest --watch --verbose",
-    "upload-source-maps": "env-cmd -e production node ./scripts/deploy/upload-bugsnag-sourcemaps",
     "postversion": "scripts/push-version.sh"
   },
   "dependencies": {
     "@apollo/client": "3.7.12",
-    "@bugsnag/js": "7.20.2",
-    "@bugsnag/plugin-react": "7.19.0",
     "@emotion/react": "11.11.0",
     "@emotion/styled": "11.11.0",
     "@leafygreen-ui/badge": "8.0.2",
@@ -83,7 +80,6 @@
     "xss": "1.0.14"
   },
   "devDependencies": {
-    "@bugsnag/source-maps": "2.3.1",
     "@emotion/babel-plugin": "11.11.0",
     "@emotion/eslint-plugin": "11.11.0",
     "@emotion/jest": "11.11.0",
diff --git a/scripts/deploy/app-version.sh b/scripts/deploy/app-version.sh
deleted file mode 100755
index 4302a239..00000000
--- a/scripts/deploy/app-version.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# This script fetches the version of the app from the package.json file
-# and writes it to a env variable. It also adds a flag if this is a custom build
-
-HAS_CHANGES=False
-if [[ -n $(git diff) ]]; then
-    HAS_CHANGES=True
-fi
-
-REACT_APP_VERSION=$(node -pe "require('./package.json').version")
-
-# If there are changes add the custom flag to REACT_APP_VERSION
-if [[ $HAS_CHANGES == True ]]; then
-    REACT_APP_VERSION="${REACT_APP_VERSION}-custom"
-fi
-export REACT_APP_VERSION
-echo "$REACT_APP_VERSION"
diff --git a/scripts/deploy/deploy.sh b/scripts/deploy/deploy.sh
index bc61c8a1..d8bc4ef9 100644
--- a/scripts/deploy/deploy.sh
+++ b/scripts/deploy/deploy.sh
@@ -1,14 +1,8 @@
 #!/bin/sh
 
 # This script runs the aws cli command to deploy the app to s3
-# It also uploads source maps to bugsnag
 
 # Try this step and throw an error if it fails
 echo "Deploying to S3"
 aws s3 sync dist/ s3://"${BUCKET}"/ --acl public-read --follow-symlinks --delete --exclude .env-cmdrc.json 
 echo "Deployed to S3"
-
-# If the above step succeeds, run this step
-echo "Uploading source maps to Bugsnag"
-./scripts/deploy/app-version.sh && node ./scripts/deploy/upload-bugsnag-sourcemaps.js
-echo "Source maps uploaded to Bugsnag"
diff --git a/scripts/deploy/upload-bugsnag-sourcemaps.js b/scripts/deploy/upload-bugsnag-sourcemaps.js
deleted file mode 100644
index 9a7e54a7..00000000
--- a/scripts/deploy/upload-bugsnag-sourcemaps.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const { browser } = require("@bugsnag/source-maps");
-
-browser.uploadMultiple({
-  apiKey: process.env.REACT_APP_BUGSNAG_API_KEY,
-  appVersion: process.env.REACT_APP_VERSION,
-  overwrite: true,
-  directory: "./dist/assets",
-  baseUrl: `${process.env.REACT_APP_PARSLEY_URL}/assets`,
-});
diff --git a/scripts/setup-credentials.js b/scripts/setup-credentials.js
index ec44f4e2..f7784f38 100644
--- a/scripts/setup-credentials.js
+++ b/scripts/setup-credentials.js
@@ -11,7 +11,6 @@ const production = {
   REACT_APP_PARSLEY_URL: "https://parsley.mongodb.com",
   REACT_APP_RELEASE_STAGE: "production",
   BUCKET: process.env.BUCKET,
-  REACT_APP_BUGSNAG_API_KEY: process.env.REACT_APP_BUGSNAG_API_KEY,
   NEW_RELIC_ACCOUNT_ID: process.env.NEW_RELIC_ACCOUNT_ID,
   NEW_RELIC_TRUST_KEY: process.env.NEW_RELIC_TRUST_KEY,
   NEW_RELIC_AGENT_ID: process.env.NEW_RELIC_AGENT_ID,
diff --git a/src/components/DetailsMenu/ButtonRow/index.tsx b/src/components/DetailsMenu/ButtonRow/index.tsx
index 5b5320ad..f31d38ff 100644
--- a/src/components/DetailsMenu/ButtonRow/index.tsx
+++ b/src/components/DetailsMenu/ButtonRow/index.tsx
@@ -7,7 +7,7 @@ import Icon from "components/Icon";
 import { QueryParams } from "constants/queryParams";
 import { useLogContext } from "context/LogContext";
 import { useQueryParam } from "hooks/useQueryParam";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import { copyToClipboard, getJiraFormat } from "utils/string";
 import { DetailRow } from "../styles";
 
@@ -35,7 +35,11 @@ const ButtonRow: React.FC = () => {
             disabled={!bookmarks.length}
             leftGlyph={<Icon glyph="Copy" />}
             onClick={async () => {
-              leaveBreadcrumb("copy-jira", { bookmarks }, "user");
+              leaveBreadcrumb(
+                "copy-jira",
+                { bookmarks },
+                SentryBreadcrumb.User
+              );
               await copyToClipboard(getJiraFormat(bookmarks, getLine));
               setHasCopied(!hasCopied);
               sendEvent({ name: "Clicked Copy To Jira" });
diff --git a/src/components/ErrorHandling/Bugsnag.tsx b/src/components/ErrorHandling/Bugsnag.tsx
deleted file mode 100644
index b0c9ba2c..00000000
--- a/src/components/ErrorHandling/Bugsnag.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from "react";
-import Bugsnag, { Event as BugsnagEvent } from "@bugsnag/js";
-import BugsnagPluginReact from "@bugsnag/plugin-react";
-import {
-  getAppVersion,
-  getBugsnagApiKey,
-  getReleaseStage,
-} from "utils/environmentVariables";
-import { DefaultErrorBoundary } from "./ErrorBoundary";
-import ErrorFallback from "./ErrorFallback";
-
-const initializeBugsnag = () => {
-  try {
-    Bugsnag.start({
-      apiKey: getBugsnagApiKey(),
-      appVersion: getAppVersion(),
-      plugins: [new BugsnagPluginReact()],
-      releaseStage: getReleaseStage(),
-    });
-  } catch (e) {
-    console.error("Failed to initialize Bugsnag", e);
-  }
-};
-
-const ErrorBoundary: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
-  const bugsnagPlugin = Bugsnag.getPlugin("react");
-
-  const Boundary =
-    bugsnagPlugin !== undefined
-      ? bugsnagPlugin.createErrorBoundary(React)
-      : DefaultErrorBoundary;
-
-  const onError = (event: BugsnagEvent) => {
-    const userId = localStorage.getItem("userId") ?? undefined;
-    event.setUser(userId);
-    event.addMetadata("metadata", {
-      viewedErrorPage: true,
-    });
-  };
-
-  return (
-    <Boundary FallbackComponent={ErrorFallback} onError={onError}>
-      {children}
-    </Boundary>
-  );
-};
-
-const sendError = (
-  err: Error,
-  severity: BugsnagEvent["severity"],
-  metadata?: { [key: string]: any }
-) => {
-  const userId = localStorage.getItem("userId") ?? "";
-  Bugsnag.notify(err, (event) => {
-    // reassigning param is recommended usage in bugsnag docs
-    // eslint-disable-next-line no-param-reassign
-    event.severity = severity;
-    event.setUser(userId);
-    if (metadata) {
-      event.addMetadata("metadata", metadata);
-    }
-  });
-};
-
-export { ErrorBoundary, initializeBugsnag, sendError };
diff --git a/src/components/ErrorHandling/ErrorBoundary.tsx b/src/components/ErrorHandling/ErrorBoundary.tsx
index 2f5530ba..47a5051a 100644
--- a/src/components/ErrorHandling/ErrorBoundary.tsx
+++ b/src/components/ErrorHandling/ErrorBoundary.tsx
@@ -1,6 +1,4 @@
 import { Component } from "react";
-import Bugsnag from "@bugsnag/js";
-import { ErrorBoundary as BugsnagErrorBoundary } from "./Bugsnag";
 import ErrorFallback from "./ErrorFallback";
 import { ErrorBoundary as SentryErrorBoundary, isInitialized } from "./Sentry";
 
@@ -38,26 +36,10 @@ export class DefaultErrorBoundary extends Component<
 export const ErrorBoundary: React.FC<{ children: React.ReactNode }> = ({
   children,
 }) => {
-  const bugsnagEnabled = Bugsnag.isStarted();
   const sentryEnabled = isInitialized();
 
-  if (!bugsnagEnabled && !sentryEnabled) {
-    return <DefaultErrorBoundary>{children}</DefaultErrorBoundary>;
+  if (sentryEnabled) {
+    return <SentryErrorBoundary>{children}</SentryErrorBoundary>;
   }
-
-  let errorBoundary = children;
-
-  if (sentryEnabled && bugsnagEnabled) {
-    errorBoundary = (
-      <BugsnagErrorBoundary>
-        <SentryErrorBoundary>{children}</SentryErrorBoundary>
-      </BugsnagErrorBoundary>
-    );
-  } else if (sentryEnabled) {
-    errorBoundary = <SentryErrorBoundary>{children}</SentryErrorBoundary>;
-  } else if (bugsnagEnabled) {
-    errorBoundary = <BugsnagErrorBoundary>{children}</BugsnagErrorBoundary>;
-  }
-
-  return <>{errorBoundary}</>; // eslint-disable-line react/jsx-no-useless-fragment
+  return <DefaultErrorBoundary>{children}</DefaultErrorBoundary>;
 };
diff --git a/src/components/ErrorHandling/initialize.test.ts b/src/components/ErrorHandling/initialize.test.ts
index ab72f4e5..551a2b5a 100644
--- a/src/components/ErrorHandling/initialize.test.ts
+++ b/src/components/ErrorHandling/initialize.test.ts
@@ -1,5 +1,3 @@
-import Bugsnag from "@bugsnag/js";
-import BugsnagPluginReact from "@bugsnag/plugin-react";
 import * as Sentry from "@sentry/react";
 import { mockEnvironmentVariables } from "test_utils/utils";
 import { initializeErrorHandling } from ".";
@@ -8,8 +6,6 @@ const { cleanup, mockEnv } = mockEnvironmentVariables();
 
 describe("should initialize error handlers according to release stage", () => {
   beforeEach(() => {
-    jest.spyOn(Bugsnag, "start").mockImplementation(jest.fn());
-    jest.spyOn(Bugsnag, "isStarted").mockImplementation(jest.fn(() => false));
     jest.spyOn(Sentry, "init").mockImplementation(jest.fn());
     jest
       .spyOn(Sentry, "Replay")
@@ -23,29 +19,18 @@ describe("should initialize error handlers according to release stage", () => {
 
   it("development", () => {
     mockEnv("NODE_ENV", "development");
-    mockEnv("REACT_APP_VERSION", "1.0.0");
     mockEnv("REACT_APP_RELEASE_STAGE", "production");
     initializeErrorHandling();
 
-    expect(Bugsnag.start).not.toHaveBeenCalled();
     expect(Sentry.init).not.toHaveBeenCalled();
   });
 
   it("production", () => {
     mockEnv("NODE_ENV", "production");
-    mockEnv("REACT_APP_VERSION", "1.0.0");
     mockEnv("REACT_APP_RELEASE_STAGE", "production");
-    mockEnv("REACT_APP_BUGSNAG_API_KEY", "fake-bugsnag-key");
     mockEnv("REACT_APP_SENTRY_DSN", "fake-sentry-key");
     initializeErrorHandling();
 
-    expect(Bugsnag.start).toHaveBeenCalledWith({
-      apiKey: "fake-bugsnag-key",
-      appVersion: "1.0.0",
-      plugins: [new BugsnagPluginReact()],
-      releaseStage: "production",
-    });
-
     expect(Sentry.init).toHaveBeenCalledWith({
       debug: false,
       dsn: "fake-sentry-key",
@@ -60,18 +45,9 @@ describe("should initialize error handlers according to release stage", () => {
   it("beta", () => {
     mockEnv("REACT_APP_RELEASE_STAGE", "beta");
     mockEnv("NODE_ENV", "production");
-    mockEnv("REACT_APP_VERSION", "1.0.0");
-    mockEnv("REACT_APP_BUGSNAG_API_KEY", "fake-bugsnag-key");
     mockEnv("REACT_APP_SENTRY_DSN", "fake-sentry-key");
     initializeErrorHandling();
 
-    expect(Bugsnag.start).toHaveBeenCalledWith({
-      apiKey: "fake-bugsnag-key",
-      appVersion: "1.0.0",
-      plugins: [new BugsnagPluginReact()],
-      releaseStage: "beta",
-    });
-
     expect(Sentry.init).toHaveBeenCalledWith({
       debug: true,
       dsn: "fake-sentry-key",
@@ -85,19 +61,10 @@ describe("should initialize error handlers according to release stage", () => {
 
   it("staging", () => {
     mockEnv("NODE_ENV", "production");
-    mockEnv("REACT_APP_VERSION", "1.0.0");
     mockEnv("REACT_APP_RELEASE_STAGE", "staging");
-    mockEnv("REACT_APP_BUGSNAG_API_KEY", "fake-bugsnag-key");
     mockEnv("REACT_APP_SENTRY_DSN", "fake-sentry-key");
     initializeErrorHandling();
 
-    expect(Bugsnag.start).toHaveBeenCalledWith({
-      apiKey: "fake-bugsnag-key",
-      appVersion: "1.0.0",
-      plugins: [new BugsnagPluginReact()],
-      releaseStage: "staging",
-    });
-
     expect(Sentry.init).toHaveBeenCalledWith({
       debug: true,
       dsn: "fake-sentry-key",
@@ -112,8 +79,6 @@ describe("should initialize error handlers according to release stage", () => {
 
 describe("should not initialize if the client is already running", () => {
   beforeEach(() => {
-    jest.spyOn(Bugsnag, "start").mockImplementation(jest.fn());
-    jest.spyOn(Bugsnag, "isStarted").mockImplementation(jest.fn(() => false));
     jest.spyOn(Sentry, "init").mockImplementation(jest.fn());
     mockEnv("NODE_ENV", "production");
   });
@@ -123,19 +88,11 @@ describe("should not initialize if the client is already running", () => {
     cleanup();
   });
 
-  it("does not initialize Bugsnag twice", () => {
-    jest.spyOn(Bugsnag, "isStarted").mockImplementation(jest.fn(() => true));
-    initializeErrorHandling();
-    expect(Bugsnag.start).not.toHaveBeenCalled();
-    expect(Sentry.init).toHaveBeenCalledTimes(1);
-  });
-
   it("does not initialize Sentry twice", () => {
     const mockClient = { getClient: jest.fn(() => true) };
     // @ts-expect-error - Type error occurs because the entire return value of getCurrentHub is not mocked
     jest.spyOn(Sentry, "getCurrentHub").mockReturnValue(mockClient);
     initializeErrorHandling();
-    expect(Bugsnag.start).toHaveBeenCalledTimes(1);
     expect(Sentry.init).not.toHaveBeenCalled();
   });
 });
diff --git a/src/components/ErrorHandling/initialize.ts b/src/components/ErrorHandling/initialize.ts
index d28a7ace..a3dc7f9d 100644
--- a/src/components/ErrorHandling/initialize.ts
+++ b/src/components/ErrorHandling/initialize.ts
@@ -1,6 +1,4 @@
-import Bugsnag from "@bugsnag/js";
 import { isProductionBuild } from "utils/environmentVariables";
-import { initializeBugsnag } from "./Bugsnag";
 import { initializeSentry, isInitialized } from "./Sentry";
 
 export const initializeErrorHandling = () => {
@@ -8,10 +6,6 @@ export const initializeErrorHandling = () => {
     return;
   }
 
-  if (!Bugsnag.isStarted()) {
-    initializeBugsnag();
-  }
-
   if (!isInitialized()) {
     initializeSentry();
   }
diff --git a/src/components/LogPane/index.tsx b/src/components/LogPane/index.tsx
index fe3cfbf7..7015617e 100644
--- a/src/components/LogPane/index.tsx
+++ b/src/components/LogPane/index.tsx
@@ -5,7 +5,7 @@ import { WRAP } from "constants/cookies";
 import { QueryParams } from "constants/queryParams";
 import { useLogContext } from "context/LogContext";
 import { useQueryParam } from "hooks/useQueryParam";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import { findLineIndex } from "utils/findLineIndex";
 
 interface LogPaneProps {
@@ -32,14 +32,14 @@ const LogPane: React.FC<LogPaneProps> = ({ rowCount, rowRenderer }) => {
           leaveBreadcrumb(
             "Triggered scroll to shareLine",
             { initialScrollIndex, shareLine },
-            "user"
+            SentryBreadcrumb.User
           );
           scrollToLine(initialScrollIndex);
         } else {
           leaveBreadcrumb(
             "shareLine not provided or found in processedLogLines",
             { shareLine },
-            "process"
+            SentryBreadcrumb.UI
           );
         }
 
diff --git a/src/components/NavBar/UploadLink/index.tsx b/src/components/NavBar/UploadLink/index.tsx
index b9b3dea2..d731e22a 100644
--- a/src/components/NavBar/UploadLink/index.tsx
+++ b/src/components/NavBar/UploadLink/index.tsx
@@ -1,12 +1,12 @@
 import { useCallback, useState } from "react";
 import { css } from "@emotion/react";
 import ConfirmationModal from "@leafygreen-ui/confirmation-modal";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import { useLogDropAnalytics } from "analytics";
 import { StyledRouterLink } from "components/styles";
 import routes from "constants/routes";
 import { zIndex } from "constants/tokens";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 
 interface UploadLinkProps {
   hasLogs: boolean | null;
@@ -15,17 +15,22 @@ interface UploadLinkProps {
 const UploadLink: React.FC<UploadLinkProps> = ({ clearLogs, hasLogs }) => {
   const [open, setOpen] = useState(false);
   const navigate = useNavigate();
+  const { pathname } = useLocation();
   const { sendEvent } = useLogDropAnalytics();
   const handleClick = useCallback(() => {
     if (hasLogs) {
       sendEvent({ hasLogs: true, name: "Clicked Upload Link" });
       setOpen(true);
     } else {
-      leaveBreadcrumb("upload-link", { hasLogs }, "navigation");
+      leaveBreadcrumb(
+        "upload-link",
+        { from: pathname, hasLogs: false, to: "/upload" },
+        SentryBreadcrumb.Navigation
+      );
       sendEvent({ hasLogs: false, name: "Clicked Upload Link" });
       navigate(routes.upload);
     }
-  }, [hasLogs, sendEvent, navigate]);
+  }, [hasLogs, pathname, sendEvent, navigate]);
   return (
     <>
       <StyledRouterLink
diff --git a/src/components/PaginatedVirtualList/usePaginatedVirtualList.ts b/src/components/PaginatedVirtualList/usePaginatedVirtualList.ts
index 63e1caed..88b575d4 100644
--- a/src/components/PaginatedVirtualList/usePaginatedVirtualList.ts
+++ b/src/components/PaginatedVirtualList/usePaginatedVirtualList.ts
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { VirtuosoHandle } from "react-virtuoso";
 import usePrevious from "hooks/usePrevious";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import { calculatePageSize, calculateStartingIndex } from "./utils";
 
 interface UsePaginatedVirtualListProps {
@@ -78,7 +78,7 @@ const usePaginatedVirtualList = ({
           paginationThreshold,
           totalPageCount,
         },
-        "process"
+        SentryBreadcrumb.UI
       );
     } else {
       // This setTimeout is necessary because the first scroll doesn't always work
@@ -99,7 +99,7 @@ const usePaginatedVirtualList = ({
           paginationThreshold,
           totalPageCount,
         },
-        "process"
+        SentryBreadcrumb.UI
       );
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -135,7 +135,7 @@ const usePaginatedVirtualList = ({
           paginationThreshold,
           startingIndex,
         },
-        "process"
+        SentryBreadcrumb.UI
       );
       // This setTimeout is necessary to avoid a race condition where the list hasn't finished rendering the next page
       setTimeout(() => {
diff --git a/src/components/ProjectFiltersModal/index.tsx b/src/components/ProjectFiltersModal/index.tsx
index 48774b16..fc92679a 100644
--- a/src/components/ProjectFiltersModal/index.tsx
+++ b/src/components/ProjectFiltersModal/index.tsx
@@ -13,7 +13,7 @@ import {
 import { PROJECT_FILTERS } from "gql/queries";
 import { useFilterParam } from "hooks/useFilterParam";
 import { useTaskQuery } from "hooks/useTaskQuery";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import ProjectFilter from "./ProjectFilter";
 import useSelectedFiltersState from "./state";
 
@@ -56,7 +56,7 @@ const ProjectFiltersModal: React.FC<ProjectFiltersModalProps> = ({
     leaveBreadcrumb(
       "applied-project-filters",
       { filters: state.selectedFilters },
-      "user"
+      SentryBreadcrumb.User
     );
     sendEvent({
       filters: state.selectedFilters,
diff --git a/src/components/Search/SearchBar/index.tsx b/src/components/Search/SearchBar/index.tsx
index 9a3b1609..de7b5a69 100644
--- a/src/components/Search/SearchBar/index.tsx
+++ b/src/components/Search/SearchBar/index.tsx
@@ -12,7 +12,7 @@ import { CharKey, ModifierKey } from "constants/keys";
 import { size, textInputHeight, zIndex } from "constants/tokens";
 import { DIRECTION } from "context/LogContext/types";
 import { useKeyboardShortcut } from "hooks";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import SearchPopover from "./SearchPopover";
 
 interface SearchBarProps {
@@ -75,14 +75,18 @@ const SearchBar: React.FC<SearchBarProps> = ({
 
   const handleChangeSelect = (value: string) => {
     setSelected(value as SearchBarActions);
-    leaveBreadcrumb("search-bar-select", { value }, "user");
+    leaveBreadcrumb("search-bar-select", { value }, SentryBreadcrumb.User);
   };
 
   const handleOnSubmit = () => {
     debounceSearch.cancel(); // Cancel the debounce request to prevent delayed search.
     inputRef.current?.blur();
     setInput("");
-    leaveBreadcrumb("search-bar-submit", { input, selected }, "user");
+    leaveBreadcrumb(
+      "search-bar-submit",
+      { input, selected },
+      SentryBreadcrumb.User
+    );
     onSubmit(selected, input);
   };
 
@@ -149,7 +153,7 @@ const SearchBar: React.FC<SearchBarProps> = ({
               leaveBreadcrumb(
                 "applied-search-suggestion",
                 { suggestion },
-                "user"
+                SentryBreadcrumb.User
               );
             }}
             searchSuggestions={searchSuggestions}
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 0a9762a4..4e571c5d 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -16,7 +16,7 @@ import { PROJECT_FILTERS } from "gql/queries";
 import { useFilterParam } from "hooks/useFilterParam";
 import { useHighlightParam } from "hooks/useHighlightParam";
 import { useTaskQuery } from "hooks/useTaskQuery";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import { validateRegexp } from "utils/validators";
 
 const Search: React.FC = () => {
@@ -59,7 +59,11 @@ const Search: React.FC = () => {
             },
           ]);
           sendEvent({ filterExpression: value, name: "Added Filter" });
-          leaveBreadcrumb("Added Filter", { filterExpression: value }, "user");
+          leaveBreadcrumb(
+            "Added Filter",
+            { filterExpression: value },
+            SentryBreadcrumb.User
+          );
         }
         break;
       case SearchBarActions.Highlight:
@@ -70,7 +74,7 @@ const Search: React.FC = () => {
           leaveBreadcrumb(
             "Added Highlight",
             { highlightExpression: value },
-            "user"
+            SentryBreadcrumb.User
           );
         }
         break;
@@ -82,7 +86,11 @@ const Search: React.FC = () => {
   const handleOnChange = (value: string) => {
     setSearch(value);
     sendEvent({ name: "Applied Search", searchExpression: value });
-    leaveBreadcrumb("Applied Search", { searchExpression: value }, "user");
+    leaveBreadcrumb(
+      "Applied Search",
+      { searchExpression: value },
+      SentryBreadcrumb.User
+    );
   };
 
   return (
diff --git a/src/components/SidePanel/NavGroup/FilterNavGroup/index.tsx b/src/components/SidePanel/NavGroup/FilterNavGroup/index.tsx
index 7b45212a..f35f4c32 100644
--- a/src/components/SidePanel/NavGroup/FilterNavGroup/index.tsx
+++ b/src/components/SidePanel/NavGroup/FilterNavGroup/index.tsx
@@ -7,7 +7,7 @@ import { CaseSensitivity, MatchType } from "constants/enums";
 import { size } from "constants/tokens";
 import { useFilterParam } from "hooks/useFilterParam";
 import { Filter } from "types/logs";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import FilterGroup from "./FilterGroup";
 import BaseNavGroup from "../BaseNavGroup";
 
@@ -31,7 +31,11 @@ const FilterNavGroup: React.FC<FilterNavGroupProps> = ({
     if (newFilters.length === 0) {
       clearExpandedLines();
     }
-    leaveBreadcrumb("delete-filter", { filterExpression }, "user");
+    leaveBreadcrumb(
+      "delete-filter",
+      { filterExpression },
+      SentryBreadcrumb.User
+    );
     sendEvent({ filterExpression, name: "Deleted Filter" });
   };
 
@@ -59,7 +63,7 @@ const FilterNavGroup: React.FC<FilterNavGroupProps> = ({
     leaveBreadcrumb(
       "edit-filter",
       { fieldName, fieldValue, filterExpression: filter.expression },
-      "user"
+      SentryBreadcrumb.User
     );
     sendEvent({
       after: newFilters[idxToReplace],
diff --git a/src/context/auth/index.tsx b/src/context/auth/index.tsx
index 95e4aedb..34527892 100644
--- a/src/context/auth/index.tsx
+++ b/src/context/auth/index.tsx
@@ -12,7 +12,11 @@ import {
   graphqlURL,
   isDevelopmentBuild,
 } from "utils/environmentVariables";
-import { leaveBreadcrumb, reportError } from "utils/errorReporting";
+import {
+  SentryBreadcrumb,
+  leaveBreadcrumb,
+  reportError,
+} from "utils/errorReporting";
 
 type LoginCreds = { username: string; password: string };
 
@@ -50,19 +54,19 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
       })
         .then((response) => {
           if (response.ok) {
-            leaveBreadcrumb("Authenticated", {}, "user");
+            leaveBreadcrumb("Authenticated", {}, SentryBreadcrumb.User);
             setIsAuthenticated(true);
           } else {
             leaveBreadcrumb(
               "Not Authenticated",
               { statusCode: response.status },
-              "user"
+              SentryBreadcrumb.User
             );
             logoutAndRedirect();
           }
         })
         .catch((err: Error) => {
-          leaveBreadcrumb("checkLogin", { err }, "error");
+          leaveBreadcrumb("checkLogin", { err }, SentryBreadcrumb.Error);
           reportError(err).severe();
         });
     };
diff --git a/src/hooks/useFetch/index.ts b/src/hooks/useFetch/index.ts
index 024385a3..d4f7c6a0 100644
--- a/src/hooks/useFetch/index.ts
+++ b/src/hooks/useFetch/index.ts
@@ -1,6 +1,10 @@
 import { useEffect, useState } from "react";
 import { isProduction } from "utils/environmentVariables";
-import { leaveBreadcrumb, reportError } from "utils/errorReporting";
+import {
+  SentryBreadcrumb,
+  leaveBreadcrumb,
+  reportError,
+} from "utils/errorReporting";
 /**
  * `useFetch` is a custom hook that downloads json from a given URL.
  * @param url - the url to fetch
@@ -24,7 +28,7 @@ const useFetch = <T extends object>(
   const [isLoading, setIsLoading] = useState(false);
 
   useEffect(() => {
-    leaveBreadcrumb("useFetch", { url }, "request");
+    leaveBreadcrumb("useFetch", { url }, SentryBreadcrumb.HTTP);
     const req = new Request(url, { method: "GET" });
     const abortController = new AbortController();
 
@@ -46,7 +50,7 @@ const useFetch = <T extends object>(
           setData(json);
         })
         .catch((err: Error) => {
-          leaveBreadcrumb("useFetch", { err, url }, "error");
+          leaveBreadcrumb("useFetch", { err, url }, SentryBreadcrumb.Error);
           reportError(err).severe();
           setError(err.message);
         })
diff --git a/src/hooks/useLogDownloader/index.ts b/src/hooks/useLogDownloader/index.ts
index d0a12a60..2b23478f 100644
--- a/src/hooks/useLogDownloader/index.ts
+++ b/src/hooks/useLogDownloader/index.ts
@@ -9,7 +9,11 @@ import { LOG_FILE_SIZE_LIMIT } from "constants/logs";
 import { useToastContext } from "context/toast";
 import useStateRef from "hooks/useStateRef";
 import { isProduction } from "utils/environmentVariables";
-import { leaveBreadcrumb, reportError } from "utils/errorReporting";
+import {
+  SentryBreadcrumb,
+  leaveBreadcrumb,
+  reportError,
+} from "utils/errorReporting";
 import { fetchLogFile } from "utils/fetchLogFile";
 import { getBytesAsString } from "utils/string";
 
@@ -39,7 +43,7 @@ const useLogDownloader = (
   const dispatchToast = useToastContext();
 
   useEffect(() => {
-    leaveBreadcrumb("useLogDownloader", { url }, "request");
+    leaveBreadcrumb("useLogDownloader", { url }, SentryBreadcrumb.HTTP);
     const abortController = new AbortController();
     const timeStart = Date.now();
 
@@ -101,7 +105,11 @@ const useLogDownloader = (
           }
         })
         .catch((err: Error) => {
-          leaveBreadcrumb("useLogDownloader", { err, url }, "error");
+          leaveBreadcrumb(
+            "useLogDownloader",
+            { err, url },
+            SentryBreadcrumb.Error
+          );
           reportError(err).severe();
           setError(err.message);
           sendEvent({
@@ -119,7 +127,7 @@ const useLogDownloader = (
               time: Date.now() - timeStart,
               url,
             },
-            "request"
+            SentryBreadcrumb.HTTP
           );
           sendEvent({
             duration: Date.now() - timeStart,
diff --git a/src/pages/LogDrop/FileDropper.tsx b/src/pages/LogDrop/FileDropper.tsx
index 7ff85a78..86812363 100644
--- a/src/pages/LogDrop/FileDropper.tsx
+++ b/src/pages/LogDrop/FileDropper.tsx
@@ -9,7 +9,11 @@ import { LOG_FILE_SIZE_LIMIT, LOG_LINE_SIZE_LIMIT } from "constants/logs";
 import { size } from "constants/tokens";
 import { useLogContext } from "context/LogContext";
 import { useToastContext } from "context/toast";
-import { leaveBreadcrumb, reportError } from "utils/errorReporting";
+import {
+  SentryBreadcrumb,
+  leaveBreadcrumb,
+  reportError,
+} from "utils/errorReporting";
 import { fileToStream } from "utils/file";
 import { decodeStream } from "utils/streams";
 import FileSelector from "./FileSelector";
@@ -28,7 +32,7 @@ const FileDropper: React.FC = () => {
 
   const onDrop = useCallback(
     (acceptedFiles: File[]) => {
-      leaveBreadcrumb("Dropped file", {}, "user");
+      leaveBreadcrumb("Dropped file", {}, SentryBreadcrumb.User);
       sendEvent({ name: "Dropped file" });
       dispatch({ file: acceptedFiles[0], type: "DROPPED_FILE" });
     },
@@ -39,7 +43,7 @@ const FileDropper: React.FC = () => {
     (logType: LogTypes | undefined) => {
       if (logType) {
         setLogMetadata({ logType });
-        leaveBreadcrumb("Parsing file", { logType }, "process");
+        leaveBreadcrumb("Parsing file", { logType }, SentryBreadcrumb.UI);
         dispatch({ type: "PARSE_FILE" });
         startTransition(() => {
           (async () => {
@@ -55,7 +59,7 @@ const FileDropper: React.FC = () => {
                 leaveBreadcrumb(
                   "Decoded file",
                   { fileSize: logLines.length },
-                  "process"
+                  SentryBreadcrumb.UI
                 );
                 sendEvent({
                   fileSize: logLines?.length,
diff --git a/src/pages/LogView/LoadingPage/index.tsx b/src/pages/LogView/LoadingPage/index.tsx
index 22614f0a..d245f541 100644
--- a/src/pages/LogView/LoadingPage/index.tsx
+++ b/src/pages/LogView/LoadingPage/index.tsx
@@ -14,7 +14,7 @@ import { useLogDownloader } from "hooks";
 import { useFetch } from "hooks/useFetch";
 import NotFound from "pages/404";
 import { LogkeeperMetadata } from "types/api";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 import { getBytesAsString } from "utils/string";
 import { useResolveLogURL } from "./useResolveLogURL";
 
@@ -68,7 +68,7 @@ const LoadingPage: React.FC<LoadingPageProps> = ({ logType }) => {
 
   useEffect(() => {
     if (data) {
-      leaveBreadcrumb("ingest-log-lines", { logType }, "process");
+      leaveBreadcrumb("ingest-log-lines", { logType }, SentryBreadcrumb.UI);
       setLogMetadata({
         buildID,
         execution: execution || String(logkeeperMetadata?.execution || 0),
@@ -90,6 +90,7 @@ const LoadingPage: React.FC<LoadingPageProps> = ({ logType }) => {
     }
   }, [
     data,
+    fileName,
     ingestLines,
     error,
     logType,
diff --git a/src/utils/environmentVariables/index.ts b/src/utils/environmentVariables/index.ts
index c4f911cc..283cf918 100644
--- a/src/utils/environmentVariables/index.ts
+++ b/src/utils/environmentVariables/index.ts
@@ -10,9 +10,7 @@ enum Environment {
   Production = "production",
 }
 
-const getAppVersion = () => process.env.REACT_APP_VERSION || "";
 const getReleaseStage = () => process.env.REACT_APP_RELEASE_STAGE || "";
-const getBugsnagApiKey = () => process.env.REACT_APP_BUGSNAG_API_KEY || "";
 const getSentryDSN = () => process.env.REACT_APP_SENTRY_DSN || "";
 
 const isLocal = () => getReleaseStage() === ReleaseStage.Local;
@@ -40,8 +38,6 @@ export {
   lobsterURL,
   logkeeperURL,
   spruceURL,
-  getAppVersion,
   getReleaseStage,
-  getBugsnagApiKey,
   getSentryDSN,
 };
diff --git a/src/utils/errorReporting/errorReporting.test.ts b/src/utils/errorReporting/errorReporting.test.ts
index 5384573e..f6182a5f 100644
--- a/src/utils/errorReporting/errorReporting.test.ts
+++ b/src/utils/errorReporting/errorReporting.test.ts
@@ -1,14 +1,16 @@
-import Bugsnag from "@bugsnag/js";
 import * as Sentry from "@sentry/react";
 import { mockEnvironmentVariables } from "test_utils/utils";
-import { leaveBreadcrumb, reportError } from "utils/errorReporting";
+import {
+  SentryBreadcrumb,
+  leaveBreadcrumb,
+  reportError,
+} from "utils/errorReporting";
 
 const { cleanup, mockEnv } = mockEnvironmentVariables();
 
 describe("error reporting", () => {
   beforeEach(() => {
     jest.spyOn(console, "error").mockImplementation(() => {});
-    jest.spyOn(Bugsnag, "notify");
     jest.spyOn(Sentry, "captureException");
   });
   afterEach(() => {
@@ -29,28 +31,23 @@ describe("error reporting", () => {
       err,
       severity: "warning",
     });
-    expect(Bugsnag.notify).not.toHaveBeenCalled();
     expect(Sentry.captureException).not.toHaveBeenCalled();
   });
 
-  it("should report errors to Bugsnag and Sentry when in production", () => {
+  it("should report errors to Sentry when in production", () => {
     mockEnv("NODE_ENV", "production");
-    jest.spyOn(Bugsnag, "notify").mockImplementation(jest.fn());
     jest.spyOn(Sentry, "captureException").mockImplementation(jest.fn());
 
     const err = new Error("test error");
     const result = reportError(err);
     result.severe();
-    expect(Bugsnag.notify).toHaveBeenCalledWith(err, expect.any(Function));
     expect(Sentry.captureException).toHaveBeenCalledWith(err);
     result.warning();
-    expect(Bugsnag.notify).toHaveBeenLastCalledWith(err, expect.any(Function));
     expect(Sentry.captureException).toHaveBeenCalledWith(err);
   });
 
   it("supports metadata field", () => {
     mockEnv("NODE_ENV", "production");
-    jest.spyOn(Bugsnag, "notify").mockImplementation(jest.fn());
     jest.spyOn(Sentry, "captureException").mockImplementation(jest.fn());
     const err = {
       message: "GraphQL Error",
@@ -60,10 +57,8 @@ describe("error reporting", () => {
     const metadata = { customField: "foo" };
     const result = reportError(err, metadata);
     result.severe();
-    expect(Bugsnag.notify).toHaveBeenCalledWith(err, expect.any(Function));
     expect(Sentry.captureException).toHaveBeenCalledWith(err);
     result.warning();
-    expect(Bugsnag.notify).toHaveBeenLastCalledWith(err, expect.any(Function));
     expect(Sentry.captureException).toHaveBeenCalledWith(err);
   });
 });
@@ -71,7 +66,6 @@ describe("error reporting", () => {
 describe("breadcrumbs", () => {
   beforeEach(() => {
     jest.spyOn(console, "debug").mockImplementation(() => {});
-    jest.spyOn(Bugsnag, "leaveBreadcrumb");
     jest.spyOn(Sentry, "addBreadcrumb");
   });
   afterEach(() => {
@@ -81,7 +75,7 @@ describe("breadcrumbs", () => {
 
   it("should log breadcrumbs into console when not in production", () => {
     const message = "my message";
-    const type = "error";
+    const type = SentryBreadcrumb.Error;
     const metadata = { foo: "bar" };
 
     leaveBreadcrumb(message, metadata, type);
@@ -90,26 +84,19 @@ describe("breadcrumbs", () => {
       metadata,
       type,
     });
-    expect(Bugsnag.leaveBreadcrumb).not.toHaveBeenCalled();
     expect(Sentry.addBreadcrumb).not.toHaveBeenCalled();
   });
 
-  it("should report breadcrumbs to Bugsnag and Sentry when in production and convert Sentry breadcrumbs", () => {
+  it("should report breadcrumbs to Sentry when in production", () => {
     jest.useFakeTimers().setSystemTime(new Date("2020-01-01"));
     mockEnv("NODE_ENV", "production");
-    jest.spyOn(Bugsnag, "leaveBreadcrumb").mockImplementation(jest.fn());
     jest.spyOn(Sentry, "addBreadcrumb").mockImplementation(jest.fn());
 
     const message = "my message";
-    const type = "log";
-    const metadata = { statusCode: 401 };
+    const type = SentryBreadcrumb.Info;
+    const metadata = { status_code: 401 };
 
     leaveBreadcrumb(message, metadata, type);
-    expect(Bugsnag.leaveBreadcrumb).toHaveBeenCalledWith(
-      message,
-      metadata,
-      type
-    );
     expect(Sentry.addBreadcrumb).toHaveBeenCalledWith({
       data: { status_code: 401 },
       message,
@@ -123,11 +110,10 @@ describe("breadcrumbs", () => {
     jest.useFakeTimers().setSystemTime(new Date("2020-01-01"));
     jest.spyOn(console, "warn").mockImplementation(() => {});
     mockEnv("NODE_ENV", "production");
-    jest.spyOn(Bugsnag, "leaveBreadcrumb").mockImplementation(jest.fn());
     jest.spyOn(Sentry, "addBreadcrumb").mockImplementation(jest.fn());
 
     const message = "navigation message";
-    const type = "navigation";
+    const type = SentryBreadcrumb.Navigation;
     const metadata = {};
 
     leaveBreadcrumb(message, metadata, type);
@@ -139,11 +125,6 @@ describe("breadcrumbs", () => {
       2,
       "Navigation breadcrumbs should include a 'to' metadata field."
     );
-    expect(Bugsnag.leaveBreadcrumb).toHaveBeenCalledWith(
-      message,
-      metadata,
-      type
-    );
     expect(Sentry.addBreadcrumb).toHaveBeenCalledWith({
       data: {},
       message,
diff --git a/src/utils/errorReporting/index.ts b/src/utils/errorReporting/index.ts
index b2f5bb6c..6dc10783 100644
--- a/src/utils/errorReporting/index.ts
+++ b/src/utils/errorReporting/index.ts
@@ -1,6 +1,4 @@
-import Bugsnag, { BreadcrumbType } from "@bugsnag/js";
 import { Breadcrumb, addBreadcrumb } from "@sentry/react";
-import { sendError as bugsnagSendError } from "components/ErrorHandling/Bugsnag";
 import { sendError as sentrySendError } from "components/ErrorHandling/Sentry";
 import { isProductionBuild } from "utils/environmentVariables";
 
@@ -26,55 +24,14 @@ const reportError = (
 
   return {
     severe: () => {
-      bugsnagSendError(err, "error", metadata);
       sentrySendError(err, "error", metadata);
     },
     warning: () => {
-      bugsnagSendError(err, "warning", metadata);
       sentrySendError(err, "warning", metadata);
     },
   };
 };
 
-type Metadata = {
-  [key: string]: any;
-};
-
-const leaveBreadcrumb = (
-  message: string,
-  metadata: Metadata,
-  type: BreadcrumbType
-) => {
-  if (!isProductionBuild()) {
-    console.debug({ message, metadata, type });
-  } else {
-    Bugsnag.leaveBreadcrumb(message, metadata, type);
-    addBreadcrumb(convertToSentryBreadcrumb(message, metadata, type));
-  }
-};
-
-/**
- * Convert a Bugsnag breadcrumb to Sentry's type.
- * @param message - a string indicating details about the breadcrumb
- * @param metadata - additional fields
- * @param type - the type of Bugsnag breadcrumb to be sent
- * @returns a Sentry breadcrumb
- */
-const convertToSentryBreadcrumb = (
-  message: string,
-  metadata: Metadata,
-  type: BreadcrumbType
-): Breadcrumb => {
-  const breadcrumbType = convertBreadcrumbType(type);
-  return {
-    data: convertMetadata(metadata, breadcrumbType),
-    message,
-    // Divide date by 1000 because Sentry wants the timestamp in RFC 3339, or seconds (not milliseconds!) since the Unix epoch.
-    timestamp: new Date().getTime() / 1000,
-    type: breadcrumbType,
-  };
-};
-
 // The "type" field for Sentry breadcrumbs is just "string", but we can approximate the types listed here:
 // https://develop.sentry.dev/sdk/event-payloads/breadcrumbs/#breadcrumb-types
 enum SentryBreadcrumb {
@@ -90,68 +47,49 @@ enum SentryBreadcrumb {
   User = "user",
 }
 
-/**
- * Convert a Bugsnag breadcrumb type to one of our custom Sentry types.
- * @param breadcrumbType - the type of Bugsnag breadcrumb to be sent
- * @returns a custom Sentry breadcrumb type
- */
-const convertBreadcrumbType = (
-  breadcrumbType: BreadcrumbType
-): SentryBreadcrumb => {
-  switch (breadcrumbType) {
-    case "error":
-      return SentryBreadcrumb.Error;
-    case "navigation":
-      return SentryBreadcrumb.Navigation;
-    case "process":
-      return SentryBreadcrumb.UI;
-    case "request":
-      return SentryBreadcrumb.HTTP;
-    case "user":
-      return SentryBreadcrumb.User;
-    case "log":
-      return SentryBreadcrumb.Info;
-    case "manual":
-    case "state":
-    default:
-      return SentryBreadcrumb.Default;
+const leaveBreadcrumb = (
+  message: string,
+  metadata: Breadcrumb["data"],
+  type: SentryBreadcrumb
+) => {
+  if (!isProductionBuild()) {
+    console.debug({ message, metadata, type });
+  } else {
+    const bc: Breadcrumb = {
+      data: validateMetadata(metadata, type),
+      message,
+      // Divide date by 1000 because Sentry wants the timestamp in RFC 3339, or seconds (not milliseconds!) since the Unix epoch.
+      timestamp: new Date().getTime() / 1000,
+      type,
+    };
+    addBreadcrumb(bc);
   }
 };
 
 /**
- * Convert a Bugsnag metadata field to use Sentry's key names and warn about missing fields.
+ * Ensure metadata follows Sentry's breadcrumb guidelines.
  * https://develop.sentry.dev/sdk/event-payloads/breadcrumbs/#breadcrumb-types
- * @param bugsnagMetadata - Metadata object using Bugsnag-specific key names
+ * @param metadata - Metadata object
  * @param breadcrumbType - Sentry breadcrumb type
- * @returns an object with the key names converted to Sentry's names.
+ * @returns an object adhering to Sentry's metadata rules.
  */
-const convertMetadata = (
-  bugsnagMetadata: Metadata,
+const validateMetadata = (
+  metadata: Breadcrumb["data"],
   breadcrumbType: SentryBreadcrumb
-): Metadata => {
-  // Convert statusCode => status_code
-  if (bugsnagMetadata.statusCode) {
-    const { statusCode, ...rest } = bugsnagMetadata;
-    return {
-      ...rest,
-      status_code: statusCode,
-    };
-  }
-
+): Breadcrumb["data"] => {
   if (breadcrumbType === SentryBreadcrumb.Navigation) {
-    if (!bugsnagMetadata.from) {
+    if (!metadata?.from) {
       console.warn(
         "Navigation breadcrumbs should include a 'from' metadata field."
       );
     }
-    if (!bugsnagMetadata.to) {
+    if (!metadata?.to) {
       console.warn(
         "Navigation breadcrumbs should include a 'to' metadata field."
       );
     }
   }
-
-  return bugsnagMetadata;
+  return metadata;
 };
 
-export { leaveBreadcrumb, reportError };
+export { leaveBreadcrumb, reportError, SentryBreadcrumb };
diff --git a/src/utils/file/index.ts b/src/utils/file/index.ts
index a200a3a9..4ac8c4b3 100644
--- a/src/utils/file/index.ts
+++ b/src/utils/file/index.ts
@@ -1,4 +1,4 @@
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 
 type StreamedFileOptions = {
   fileSizeLimit?: number;
@@ -37,7 +37,7 @@ const fileToStream = async (
               leaveBreadcrumb(
                 "File size limit exceeded",
                 { bytesRead },
-                "process"
+                SentryBreadcrumb.UI
               );
               break;
             }
diff --git a/vite.config.ts b/vite.config.ts
index 134c314c..de95cabe 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -17,6 +17,7 @@ export default defineConfig({
         injectVariablesInHTML({
           files: "dist/index.html",
           variables: [
+            "%APP_VERSION%",
             "%GIT_SHA%",
             "%REACT_APP_RELEASE_STAGE%",
             "%NEW_RELIC_ACCOUNT_ID%",
diff --git a/yarn.lock b/yarn.lock
index f5c914a4..a4cb5bd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2057,72 +2057,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bugsnag/browser@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.20.2.tgz#1db0c52fbe6b90217c4efd7ac79e16ccb7336b78"
-  integrity sha512-4J4s53ZpYr3hHA+QjxUjOI6U+A8+XuUVH45UshE87Jp2Y4mV8ML2DovejqJS8J8yjdbnh2z1Wtg/v3WUNt4ayQ==
-  dependencies:
-    "@bugsnag/core" "^7.19.0"
-
-"@bugsnag/core@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.19.0.tgz#7663a4addb1322e8315a4012dc9db2aad3fea53b"
-  integrity sha512-2KGwdaLD9PhR7Wk7xPi3jGuGsKTatc/28U4TOZIDU3CgC2QhGjubwiXSECel5gwxhZ3jACKcMKSV2ovHhv1NrA==
-  dependencies:
-    "@bugsnag/cuid" "^3.0.0"
-    "@bugsnag/safe-json-stringify" "^6.0.0"
-    error-stack-parser "^2.0.3"
-    iserror "0.0.2"
-    stack-generator "^2.0.3"
-
-"@bugsnag/cuid@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@bugsnag/cuid/-/cuid-3.0.1.tgz#ed05265d17ecca8c93e5898a1b4ddeed52d48693"
-  integrity sha512-ZWOywEsXGWMBb9PULGGbP2S/mUDp30ZjaozrOy/pv2xyFoCFiCdk5PB2HA3muH4W/ppb9pXr3b5f7al74qZ5sg==
-
-"@bugsnag/js@7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.20.2.tgz#218ec77d1df8b70d9353d4f2f2ccd3e51a331786"
-  integrity sha512-Q08k0h0h6NFwFGkFmib39Uln2WpvJdqT1EGF1JlyYiGW03Y+VopVb9r37pZrRrN9IY08mxaIEO8la5xeaWAs6A==
-  dependencies:
-    "@bugsnag/browser" "^7.20.2"
-    "@bugsnag/node" "^7.19.0"
-
-"@bugsnag/node@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.19.0.tgz#6a8e5d0f5e73a1d0bad19537def1a7ff65e19787"
-  integrity sha512-c4snyxx5d/fsMogmgehFBGc//daH6+4XCplia4zrEQYltjaQ+l8ud0dPx623DgJl/2j1+2zlRc7y7IHSd7Gm5w==
-  dependencies:
-    "@bugsnag/core" "^7.19.0"
-    byline "^5.0.0"
-    error-stack-parser "^2.0.2"
-    iserror "^0.0.2"
-    pump "^3.0.0"
-    stack-generator "^2.0.3"
-
-"@bugsnag/plugin-react@7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.19.0.tgz#3f86c6ed2745cd60a4099d0e14ca46f2b9cf501f"
-  integrity sha512-owC4QXYJWGllMoOPcH5P7sbDIDuFLMCbjGAU6FwH5mBMObSQo+1ViSKImlTJQUFXATM8ySISTBVt7w3C6FFHng==
-
-"@bugsnag/safe-json-stringify@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz#22abdcd83e008c369902976730c34c150148a758"
-  integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==
-
-"@bugsnag/source-maps@2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@bugsnag/source-maps/-/source-maps-2.3.1.tgz#3caa33b7b9879e58e233eae017726852c50b1106"
-  integrity sha512-9xJTcf5+W7+y1fQBftSOste/3ORi+d5EeCCMdvaHSX69MKQP0lrDiSYpLwX/ErcXrTbvu7nimGGKJP2vBdF7zQ==
-  dependencies:
-    command-line-args "^5.1.1"
-    command-line-usage "^6.1.0"
-    concat-stream "^2.0.0"
-    consola "^2.15.0"
-    form-data "^3.0.0"
-    glob "^7.1.6"
-    read-pkg-up "^7.0.1"
-
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -6601,16 +6535,6 @@ aria-query@^5.0.0, aria-query@^5.1.3:
   dependencies:
     dequal "^2.0.3"
 
-array-back@^3.0.1, array-back@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
-  integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
-
-array-back@^4.0.1, array-back@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e"
-  integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==
-
 array-buffer-byte-length@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
@@ -7172,11 +7096,6 @@ busboy@^1.6.0:
   dependencies:
     streamsearch "^1.1.0"
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
-
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -7577,26 +7496,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-command-line-args@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
-  integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
-  dependencies:
-    array-back "^3.1.0"
-    find-replace "^3.0.0"
-    lodash.camelcase "^4.3.0"
-    typical "^4.0.0"
-
-command-line-usage@^6.1.0:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.3.tgz#428fa5acde6a838779dfa30e44686f4b6761d957"
-  integrity sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==
-  dependencies:
-    array-back "^4.0.2"
-    chalk "^2.4.2"
-    table-layout "^1.0.2"
-    typical "^5.2.0"
-
 commander@^10.0.0:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
@@ -7677,26 +7576,11 @@ concat-stream@^1.6.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
-  integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.0.2"
-    typedarray "^0.0.6"
-
 confusing-browser-globals@^1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-consola@^2.15.0:
-  version "2.15.3"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
-  integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
-
 console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -8023,7 +7907,7 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.9"
 
-deep-extend@^0.6.0, deep-extend@~0.6.0:
+deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
@@ -8397,13 +8281,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error-stack-parser@^2.0.2, error-stack-parser@^2.0.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
-  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
-  dependencies:
-    stackframe "^1.3.4"
-
 es-abstract@^1.19.0, es-abstract@^1.19.5:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
@@ -9357,13 +9234,6 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-replace@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
-  integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
-  dependencies:
-    array-back "^3.0.1"
-
 find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
@@ -9735,7 +9605,7 @@ glob@^10.0.0:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
-glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -10649,11 +10519,6 @@ isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
-iserror@0.0.2, iserror@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/iserror/-/iserror-0.0.2.tgz#bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"
-  integrity sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -11712,11 +11577,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -13190,19 +13050,19 @@ readable-stream@^2.0.2, readable-stream@^2.2.2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.2, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
-  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -13254,11 +13114,6 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-reduce-flatten@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
-  integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
-
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
@@ -13991,13 +13846,6 @@ sshpk@^1.14.1:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-stack-generator@^2.0.3:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d"
-  integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==
-  dependencies:
-    stackframe "^1.3.4"
-
 stack-utils@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
@@ -14005,11 +13853,6 @@ stack-utils@^2.0.3:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-stackframe@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
-  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
@@ -14308,16 +14151,6 @@ tabbable@^5.3.3:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf"
   integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==
 
-table-layout@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04"
-  integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==
-  dependencies:
-    array-back "^4.0.1"
-    deep-extend "~0.6.0"
-    typical "^5.2.0"
-    wordwrapjs "^4.0.0"
-
 tar-fs@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
@@ -14728,16 +14561,6 @@ typescript@5.1.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"
   integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==
 
-typical@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
-  integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
-
-typical@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066"
-  integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==
-
 ua-parser-js@^0.7.30:
   version "0.7.34"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.34.tgz#afb439e2e3e394bdc90080acb661a39c685b67d7"
@@ -15282,14 +15105,6 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-wordwrapjs@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f"
-  integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==
-  dependencies:
-    reduce-flatten "^2.0.0"
-    typical "^5.2.0"
-
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

From e6ac3b18ee57c09ccd99f55f1b500098953b53d9 Mon Sep 17 00:00:00 2001
From: minnakt <minna.kt@mongodb.com>
Date: Wed, 1 Nov 2023 12:08:28 -0400
Subject: [PATCH 2/5] Temporary measure to get around merge conflict

---
 src/utils/errorReporting/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/errorReporting/index.ts b/src/utils/errorReporting/index.ts
index 6dc10783..bbb0cead 100644
--- a/src/utils/errorReporting/index.ts
+++ b/src/utils/errorReporting/index.ts
@@ -50,7 +50,7 @@ enum SentryBreadcrumb {
 const leaveBreadcrumb = (
   message: string,
   metadata: Breadcrumb["data"],
-  type: SentryBreadcrumb
+  type: SentryBreadcrumb | "process"
 ) => {
   if (!isProductionBuild()) {
     console.debug({ message, metadata, type });
@@ -75,7 +75,7 @@ const leaveBreadcrumb = (
  */
 const validateMetadata = (
   metadata: Breadcrumb["data"],
-  breadcrumbType: SentryBreadcrumb
+  breadcrumbType: SentryBreadcrumb | "process"
 ): Breadcrumb["data"] => {
   if (breadcrumbType === SentryBreadcrumb.Navigation) {
     if (!metadata?.from) {

From 5946ff122bd68b5faa565f29cb99a29e1d798350 Mon Sep 17 00:00:00 2001
From: minnakt <minna.kt@mongodb.com>
Date: Wed, 1 Nov 2023 12:10:20 -0400
Subject: [PATCH 3/5] Remove temporary measure

---
 src/context/MultiLineSelectContext/index.tsx | 8 ++++----
 src/utils/errorReporting/index.ts            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/context/MultiLineSelectContext/index.tsx b/src/context/MultiLineSelectContext/index.tsx
index 0fd2a9bc..56dfb0c5 100644
--- a/src/context/MultiLineSelectContext/index.tsx
+++ b/src/context/MultiLineSelectContext/index.tsx
@@ -8,7 +8,7 @@ import {
 import { QueryParams } from "constants/queryParams";
 import useLineRangeSelection from "hooks/useLineRangeSelection";
 import { useQueryParam } from "hooks/useQueryParam";
-import { leaveBreadcrumb } from "utils/errorReporting";
+import { SentryBreadcrumb, leaveBreadcrumb } from "utils/errorReporting";
 
 type MultiLineSelectContextState = {
   handleSelectLine: (selectedLine: number, shiftClick: boolean) => void;
@@ -59,7 +59,7 @@ const MultiLineSelectContextProvider: React.FC<{
   const clearSelection = useCallback(() => {
     setSelectedLines({ endingLine: undefined, startingLine: undefined });
     setMenuPosition(undefined);
-    leaveBreadcrumb("Clear line range", {}, "process");
+    leaveBreadcrumb("Clear line range", {}, SentryBreadcrumb.UI);
   }, [setSelectedLines]);
 
   const handleSelectLine = useCallback(
@@ -76,14 +76,14 @@ const MultiLineSelectContextProvider: React.FC<{
             endingLine: selectedLine,
             startingLine: selectedLines.startingLine,
           },
-          "process"
+          SentryBreadcrumb.UI
         );
       } else {
         setSelectedLines({ endingLine: undefined, startingLine: selectedLine });
         leaveBreadcrumb(
           "Set initial line range",
           { endingLine: undefined, startingLine: selectedLine },
-          "process"
+          SentryBreadcrumb.UI
         );
       }
 
diff --git a/src/utils/errorReporting/index.ts b/src/utils/errorReporting/index.ts
index bbb0cead..6dc10783 100644
--- a/src/utils/errorReporting/index.ts
+++ b/src/utils/errorReporting/index.ts
@@ -50,7 +50,7 @@ enum SentryBreadcrumb {
 const leaveBreadcrumb = (
   message: string,
   metadata: Breadcrumb["data"],
-  type: SentryBreadcrumb | "process"
+  type: SentryBreadcrumb
 ) => {
   if (!isProductionBuild()) {
     console.debug({ message, metadata, type });
@@ -75,7 +75,7 @@ const leaveBreadcrumb = (
  */
 const validateMetadata = (
   metadata: Breadcrumb["data"],
-  breadcrumbType: SentryBreadcrumb | "process"
+  breadcrumbType: SentryBreadcrumb
 ): Breadcrumb["data"] => {
   if (breadcrumbType === SentryBreadcrumb.Navigation) {
     if (!metadata?.from) {

From 651c99318a18beca38dca129587cbf354a3a8954 Mon Sep 17 00:00:00 2001
From: minnakt <minna.kt@mongodb.com>
Date: Thu, 2 Nov 2023 17:33:28 -0400
Subject: [PATCH 4/5] Fix small errors

---
 scripts/deploy/deploy.sh                | 2 +-
 src/context/auth/index.tsx              | 2 +-
 src/pages/LogView/LoadingPage/index.tsx | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/deploy/deploy.sh b/scripts/deploy/deploy.sh
index d8bc4ef9..e7665178 100644
--- a/scripts/deploy/deploy.sh
+++ b/scripts/deploy/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# This script runs the aws cli command to deploy the app to s3
+# This script runs the AWS CLI command to deploy the app to S3.
 
 # Try this step and throw an error if it fails
 echo "Deploying to S3"
diff --git a/src/context/auth/index.tsx b/src/context/auth/index.tsx
index 34527892..27a7026f 100644
--- a/src/context/auth/index.tsx
+++ b/src/context/auth/index.tsx
@@ -59,7 +59,7 @@ const AuthProvider: React.FC<{ children: React.ReactNode }> = ({
           } else {
             leaveBreadcrumb(
               "Not Authenticated",
-              { statusCode: response.status },
+              { status_code: response.status },
               SentryBreadcrumb.User
             );
             logoutAndRedirect();
diff --git a/src/pages/LogView/LoadingPage/index.tsx b/src/pages/LogView/LoadingPage/index.tsx
index a212e838..02a3acce 100644
--- a/src/pages/LogView/LoadingPage/index.tsx
+++ b/src/pages/LogView/LoadingPage/index.tsx
@@ -91,7 +91,6 @@ const LoadingPage: React.FC<LoadingPageProps> = ({ logType }) => {
     }
   }, [
     data,
-    fileName,
     ingestLines,
     error,
     logType,

From dc7391098baaca40ef8320674c1d8f5dd641b443 Mon Sep 17 00:00:00 2001
From: minnakt <minna.kt@mongodb.com>
Date: Thu, 2 Nov 2023 18:06:41 -0400
Subject: [PATCH 5/5] Codegen

---
 src/gql/generated/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
index aa92e778..e3b5fcb5 100644
--- a/src/gql/generated/types.ts
+++ b/src/gql/generated/types.ts
@@ -936,6 +936,7 @@ export type MainlineCommitsOptions = {
   limit?: InputMaybe<Scalars["Int"]["input"]>;
   projectIdentifier: Scalars["String"]["input"];
   requesters?: InputMaybe<Array<Scalars["String"]["input"]>>;
+  revision?: InputMaybe<Scalars["String"]["input"]>;
   shouldCollapse?: InputMaybe<Scalars["Boolean"]["input"]>;
   skipOrderNumber?: InputMaybe<Scalars["Int"]["input"]>;
 };
@@ -1503,6 +1504,7 @@ export type Patches = {
  */
 export type PatchesInput = {
   includeCommitQueue?: InputMaybe<Scalars["Boolean"]["input"]>;
+  includeHidden?: InputMaybe<Scalars["Boolean"]["input"]>;
   limit?: Scalars["Int"]["input"];
   onlyCommitQueue?: InputMaybe<Scalars["Boolean"]["input"]>;
   page?: Scalars["Int"]["input"];