@sentry/ember 7.14.2 → 7.16.0

package/addon/index.ts

@@ -4,12 +4,11 @@ import { macroCondition, isDevelopingApp, getOwnConfig } from '@embroider/macros
 import { next } from '@ember/runloop';
 import { assert, warn } from '@ember/debug';
 import Ember from 'ember';
-import { timestampWithMs } from '@sentry/utils';
+import { timestampWithMs, GLOBAL_OBJ } from '@sentry/utils';
 import { GlobalConfig, OwnConfig } from './types';
-import { getGlobalObject } from '@sentry/utils';
 
 function _getSentryInitConfig() {
-  const _global = getGlobalObject<GlobalConfig>();
+  const _global = GLOBAL_OBJ as typeof GLOBAL_OBJ & GlobalConfig;
   _global.__sentryEmberConfig = _global.__sentryEmberConfig ?? {};
   return _global.__sentryEmberConfig;
 }

package/addon/instance-initializers/sentry-performance.ts

@@ -6,12 +6,12 @@ import { ExtendedBackburner } from '@sentry/ember/runloop';
 import { Span, Transaction, Integration } from '@sentry/types';
 import { EmberRunQueues } from '@ember/runloop/-private/types';
 import { getActiveTransaction } from '..';
-import { browserPerformanceTimeOrigin, getGlobalObject, timestampWithMs } from '@sentry/utils';
+import { browserPerformanceTimeOrigin, GLOBAL_OBJ, timestampWithMs } from '@sentry/utils';
 import { macroCondition, isTesting, getOwnConfig } from '@embroider/macros';
 import { EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
 
 function getSentryConfig() {
-  const _global = getGlobalObject<GlobalConfig>();
+  const _global = GLOBAL_OBJ as typeof GLOBAL_OBJ & GlobalConfig;
   _global.__sentryEmberConfig = _global.__sentryEmberConfig ?? {};
   const environmentConfig = getOwnConfig<OwnConfig>().sentryConfig;
   if (!environmentConfig.sentry) {
@@ -372,7 +372,20 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
     new tracing.Integrations.BrowserTracing({
       routingInstrumentation: (customStartTransaction, startTransactionOnPageLoad) => {
         const routerMain = appInstance.lookup('router:main');
-        const routerService = appInstance.lookup('service:router');
+        let routerService = appInstance.lookup('service:router');
+        if (routerService.externalRouter) {
+          // Using ember-engines-router-service in an engine.
+          routerService = routerService.externalRouter;
+        }
+        if (routerService._hasMountedSentryPerformanceRouting) {
+          // Routing listens to route changes on the main router, and should not be initialized multiple times per page.
+          return;
+        }
+        if (!routerService.recognize) {
+          // Router is missing critical functionality to limit cardinality of the transaction names.
+          return;
+        }
+        routerService._hasMountedSentryPerformanceRouting = true;
         _instrumentEmberRouter(routerService, routerMain, config, customStartTransaction, startTransactionOnPageLoad);
       },
       idleTimeout,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.14.2",
+  "version": "7.16.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -30,10 +30,10 @@
   },
   "dependencies": {
     "@embroider/macros": "1.8.3",
-    "@sentry/browser": "7.14.2",
-    "@sentry/tracing": "7.14.2",
-    "@sentry/types": "7.14.2",
-    "@sentry/utils": "7.14.2",
+    "@sentry/browser": "7.16.0",
+    "@sentry/tracing": "7.16.0",
+    "@sentry/types": "7.16.0",
+    "@sentry/utils": "7.16.0",
     "ember-auto-import": "~1.12.1 || ~2.2.0",
     "ember-cli-babel": "~7.26.6",
     "ember-cli-htmlbars": "^6.0.1",