fixes

Author: mydea

packages/ember/addon/instance-initializers/sentry-performance.ts

@@ -1,22 +1,6 @@
 /* eslint-disable max-lines */
 import type ApplicationInstance from '@ember/application/instance';
-import { getOwnConfig } from '@embroider/macros';
-import { GLOBAL_OBJ } from '@sentry/core';
-import type { EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
-import { instrumentForPerformance } from '../utils/performance';
-
-function getSentryConfig(): EmberSentryConfig {
-  const _global = GLOBAL_OBJ as typeof GLOBAL_OBJ & GlobalConfig;
-  _global.__sentryEmberConfig = _global.__sentryEmberConfig ?? {};
-  const environmentConfig = getOwnConfig<OwnConfig>().sentryConfig;
-  if (!environmentConfig.sentry) {
-    environmentConfig.sentry = {
-      browserTracingOptions: {},
-    };
-  }
-  Object.assign(environmentConfig.sentry, _global.__sentryEmberConfig);
-  return environmentConfig;
-}
+import { instrumentForPerformance, getSentryConfig } from '../utils/performance';
 
 export function initialize(appInstance: ApplicationInstance): void {
   // Disable in fastboot - we only want to run Sentry client-side

packages/ember/addon/utils/browserTracingIntegration.ts

@@ -42,9 +42,9 @@ export function browserTracingIntegration(options: EmberBrowserTracingIntegratio
 
   const globalsPerformanceConfig = {
     disableRunloopPerformance: options.disableRunloopPerformance ?? false,
-    minimumRunloopQueueDuration: options.minimumRunloopQueueDuration ?? 0,
+    minimumRunloopQueueDuration: options.minimumRunloopQueueDuration,
     disableInstrumentComponents: options.disableInstrumentComponents ?? false,
-    minimumComponentRenderDuration: options.minimumComponentRenderDuration ?? 0,
+    minimumComponentRenderDuration: options.minimumComponentRenderDuration,
     enableComponentDefinitions: options.enableComponentDefinitions ?? false,
     disableInitialLoadInstrumentation: options.disableInitialLoadInstrumentation ?? false,
   };

packages/ember/addon/utils/performance.ts

@@ -55,10 +55,20 @@ export function instrumentForPerformance(appInstance: ApplicationInstance): void
 
   const idleTimeout = config.transitionTimeout || 5000;
 
+  const emberSpecificConfig = {
+    minimumRunloopQueueDuration: config.minimumRunloopQueueDuration,
+    minimumComponentRenderDuration: config.minimumComponentRenderDuration,
+    enableComponentDefinitions: config.enableComponentDefinitions,
+    disableInitialLoadInstrumentation: config.disableInitialLoadInstrumentation,
+    disableRunloopPerformance: config.disableRunloopPerformance,
+    disableInstrumentComponents: config.disableInstrumentComponents,
+  };
+
   const browserTracing = browserTracingIntegration({
     appInstance,
     idleTimeout,
     ...browserTracingOptions,
+    ...emberSpecificConfig,
   });
 
   const client = getClient<BrowserClient>();