Skip to content

Commit

Permalink
fix: Setup Sentry only when Desktop is onboarded
Browse files Browse the repository at this point in the history
  We need a valid Desktop config to setup our Sentry integration as we
  use the Cozy URL to determine the domain, the instance and the
  environment of the Cozy to tag our events.

  Since we want to receive events as soon as possible, we setup Sentry
  very early and, when Desktop is not onboarded already, we get an error
  since we don't have the required data.
  This is not a big deal but the error is printed in the console.

  We'll now make sure we have a valid configuration before trying to
  setup the integration and we'll also make sure to set it up after the
  onboarding is done to receive events without the need for an app
  restart.
  • Loading branch information
taratatach committed Jul 26, 2023
1 parent 110a5a6 commit 294ed6d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions gui/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ if (!mainInstance && !process.env.COZY_DESKTOP_PROPERTY_BASED_TESTING) {
app.exit()
}

let desktop = new Desktop.App(process.env.COZY_DESKTOP_DIR)
sentry.setup(desktop.clientInfo())
const desktop = new Desktop.App(process.env.COZY_DESKTOP_DIR)
if (desktop.config.cozyUrl) {
sentry.setup(desktop.clientInfo())
}

let diskTimeout = null
let onboardingWindow = null
Expand Down Expand Up @@ -650,6 +652,7 @@ app.on('ready', async () => {
log.trace('Setting up onboarding WM...')
onboardingWindow = new OnboardingWM(app, desktop)
onboardingWindow.onOnboardingDone(async () => {
sentry.setup(desktop.clientInfo())
await setupDesktop()
onboardingWindow.hide()
await trayWindow.show()
Expand Down

0 comments on commit 294ed6d

Please sign in to comment.