@sentry/ember 8.0.0-beta.3 → 8.0.0-beta.5

package/addon/index.ts

@@ -5,7 +5,7 @@ import { getOwnConfig, isDevelopingApp, macroCondition } from '@embroider/macros
 import { startSpan } from '@sentry/browser';
 import type { BrowserOptions } from '@sentry/browser';
 import * as Sentry from '@sentry/browser';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core';
 import { GLOBAL_OBJ } from '@sentry/utils';
 import Ember from 'ember';
 
@@ -75,9 +75,11 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
       {
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
         },
         op,
         name,
+        onlyIfParent: true,
       },
       () => {
         return fn(...args);

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

@@ -145,6 +145,12 @@ export function _instrumentEmberRouter(
 
   routerService.on('routeWillChange', (transition: Transition) => {
     const { fromRoute, toRoute } = getTransitionInformation(transition, routerService);
+
+    // We want to ignore loading && error routes
+    if (transitionIsIntermediate(transition)) {
+      return;
+    }
+
     activeRootSpan?.end();
 
     activeRootSpan = startBrowserTracingNavigationSpan(client, {
@@ -163,11 +169,12 @@ export function _instrumentEmberRouter(
       },
       op: 'ui.ember.transition',
       name: `route:${fromRoute} -> route:${toRoute}`,
+      onlyIfParent: true,
     });
   });
 
-  routerService.on('routeDidChange', () => {
-    if (!transitionSpan || !activeRootSpan) {
+  routerService.on('routeDidChange', transition => {
+    if (!transitionSpan || !activeRootSpan || transitionIsIntermediate(transition)) {
       return;
     }
     transitionSpan.end();
@@ -224,6 +231,7 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
             name: 'runloop',
             op: `ui.ember.runloop.${queue}`,
             startTime: currentQueueStart,
+            onlyIfParent: true,
           })?.end(now);
         }
         currentQueueStart = undefined;
@@ -299,6 +307,7 @@ function processComponentRenderAfter(
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
       },
+      onlyIfParent: true,
     })?.end(now);
   }
 }
@@ -384,6 +393,7 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
     },
     startTime,
+    onlyIfParent: true,
   })?.end(endTime);
   performance.clearMarks(startName);
   performance.clearMarks(endName);
@@ -488,3 +498,18 @@ function _instrumentNavigation(
 export default {
   initialize,
 };
+
+function transitionIsIntermediate(transition: Transition): boolean {
+  //  We want to use ignore, as this may actually be defined on new versions
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore This actually exists on newer versions
+  const isIntermediate: boolean | undefined = transition.isIntermediate;
+
+  if (typeof isIntermediate === 'boolean') {
+    return isIntermediate;
+  }
+
+  // For versions without this, we look if the route is a `.loading` or `.error` route
+  // This is not perfect and may false-positive in some cases, but it's the best we can do
+  return transition.to?.localName === 'loading' || transition.to?.localName === 'error';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0-beta.5",
   "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",
@@ -32,10 +32,10 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.9.0",
-    "@sentry/browser": "8.0.0-beta.3",
-    "@sentry/core": "8.0.0-beta.3",
-    "@sentry/types": "8.0.0-beta.3",
-    "@sentry/utils": "8.0.0-beta.3",
+    "@sentry/browser": "8.0.0-beta.5",
+    "@sentry/core": "8.0.0-beta.5",
+    "@sentry/types": "8.0.0-beta.5",
+    "@sentry/utils": "8.0.0-beta.5",
     "ember-auto-import": "^1.12.1 || ^2.4.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",