WIP move stuff around...

Author: mydea

packages/ember/.gitignore

@@ -35,3 +35,4 @@
 index.d.ts
 runloop.d.ts
 types.d.ts
+utils/*.d.ts

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

@@ -29,7 +29,11 @@ export function initialize(appInstance: ApplicationInstance): void {
   if (config['disablePerformance']) {
     return;
   }
-  instrumentForPerformance(appInstance);
+
+  // Run this in the next tick to ensure the ember router etc. is properly initialized
+  setTimeout(() => {
+    instrumentForPerformance(appInstance);
+  });
 }
 
 export default {

packages/ember/addon/utils/browserTracingIntegration.ts

@@ -1,3 +1,4 @@
+import type { BrowserClient } from '@sentry/browser';
 import {
   browserTracingIntegration as originalBrowserTracingIntegration,
   startBrowserTracingNavigationSpan,
@@ -50,10 +51,11 @@ export function browserTracingIntegration(options: EmberBrowserTracingIntegratio
 
   return {
     ...integration,
-    afterAllSetup(client) {
+    afterAllSetup(client: BrowserClient) {
       integration.afterAllSetup(client);
 
       instrumentEmberAppInstanceForPerformance(
+        client,
         appInstance,
         appInstancePerformanceConfig,
         startBrowserTracingPageLoadSpan,

packages/ember/addon/utils/instrumentEmberAppInstanceForPerformance.ts

@@ -6,17 +6,13 @@ import type {
   startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
   startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
 } from '@sentry/browser';
-import {
-  getClient,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  startInactiveSpan,
-} from '@sentry/browser';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
 import type { Span } from '@sentry/core';
 import type { EmberRouterMain } from '../types';
 import { getBackburner } from './performance';
 
 export function instrumentEmberAppInstanceForPerformance(
+  client: BrowserClient,
   appInstance: ApplicationInstance,
   config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
   startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
@@ -44,6 +40,7 @@ export function instrumentEmberAppInstanceForPerformance(
 
   routerService._hasMountedSentryPerformanceRouting = true;
   _instrumentEmberRouter(
+    client,
     routerService,
     routerMain,
     config,
@@ -79,6 +76,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {
 }
 
 function _instrumentEmberRouter(
+  client: BrowserClient,
   routerService: RouterService,
   routerMain: EmberRouterMain,
   config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
@@ -92,12 +90,6 @@ function _instrumentEmberRouter(
 
   const url = _getLocationURL(location);
 
-  const client = getClient<BrowserClient>();
-
-  if (!client) {
-    return;
-  }
-
   if (url && instrumentPageLoad !== false) {
     const routeInfo = routerService.recognize(url);
     activeRootSpan = startBrowserTracingPageLoadSpan(client, {