From 04ec64074927e5588abd80c63ccebc007de1aba1 Mon Sep 17 00:00:00 2001 From: k-fish Date: Mon, 14 Mar 2022 08:42:47 -0400 Subject: [PATCH] fix(ember): Fix merging env config Previously getting config from macros looks to be potentially pulling a fresh object instance in prod mode, which means the previous assign into the object no longer applies, and if the config didn't have a Sentry entry the initialize would crash. This should hopefully fix this issue for those no longer using config. --- .../ember/addon/instance-initializers/sentry-performance.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts index 0a43bc582c96..e6ddf066f21c 100644 --- a/packages/ember/addon/instance-initializers/sentry-performance.ts +++ b/packages/ember/addon/instance-initializers/sentry-performance.ts @@ -14,6 +14,11 @@ function getSentryConfig() { const _global = getGlobalObject(); _global.__sentryEmberConfig = _global.__sentryEmberConfig ?? {}; const environmentConfig = getOwnConfig().sentryConfig; + if (!environmentConfig.sentry) { + environmentConfig.sentry = { + browserTracingOptions: {}, + }; + } Object.assign(environmentConfig.sentry, _global.__sentryEmberConfig); return environmentConfig; }