From 83334fe5bf3f8983456a6183bdb614b0e9ed7a32 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 12 Sep 2022 10:54:37 -0400 Subject: [PATCH] Cleanup sentry init runnable Signed-off-by: Sebastian Malton --- ...alize-on-main.global-override-for-injectable.ts | 9 +++++++++ .../sentry/initialize-on-main.injectable.ts | 14 ++++++++++++++ .../setup.injectable.ts} | 9 +++++---- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts create mode 100644 src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts rename src/main/start-main-application/runnables/{setup-sentry.injectable.ts => sentry/setup.injectable.ts} (51%) diff --git a/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts b/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts new file mode 100644 index 0000000000..3850c736a0 --- /dev/null +++ b/src/main/start-main-application/runnables/sentry/initialize-on-main.global-override-for-injectable.ts @@ -0,0 +1,9 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; +import initializeSentryOnMainInjectable from "./initialize-on-main.injectable"; + +export default getGlobalOverride(initializeSentryOnMainInjectable, () => () => {}); diff --git a/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts b/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts new file mode 100644 index 0000000000..e60f16ff46 --- /dev/null +++ b/src/main/start-main-application/runnables/sentry/initialize-on-main.injectable.ts @@ -0,0 +1,14 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { init } from "@sentry/electron/main"; + +const initializeSentryOnMainInjectable = getInjectable({ + id: "initialize-sentry-on-main", + instantiate: () => init, + causesSideEffects: true, +}); + +export default initializeSentryOnMainInjectable; diff --git a/src/main/start-main-application/runnables/setup-sentry.injectable.ts b/src/main/start-main-application/runnables/sentry/setup.injectable.ts similarity index 51% rename from src/main/start-main-application/runnables/setup-sentry.injectable.ts rename to src/main/start-main-application/runnables/sentry/setup.injectable.ts index 7e0b4651e5..59eacc4199 100644 --- a/src/main/start-main-application/runnables/setup-sentry.injectable.ts +++ b/src/main/start-main-application/runnables/sentry/setup.injectable.ts @@ -3,17 +3,18 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { init } from "@sentry/electron/main"; -import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token"; -import initializeSentryReportingWithInjectable from "../../../common/error-reporting/initialize-sentry-reporting.injectable"; +import { beforeElectronIsReadyInjectionToken } from "../../runnable-tokens/before-electron-is-ready-injection-token"; +import initializeSentryReportingWithInjectable from "../../../../common/error-reporting/initialize-sentry-reporting.injectable"; +import initializeSentryOnMainInjectable from "./initialize-on-main.injectable"; const setupSentryInjectable = getInjectable({ id: "setup-sentry", instantiate: (di) => { const initializeSentryReportingWith = di.inject(initializeSentryReportingWithInjectable); + const initializeSentryOnMain = di.inject(initializeSentryOnMainInjectable); return { - run: () => initializeSentryReportingWith(init), + run: () => initializeSentryReportingWith(initializeSentryOnMain), }; }, injectionToken: beforeElectronIsReadyInjectionToken,