@sentry/ember 7.92.0 → 7.94.1

package/addon/index.ts

@@ -2,13 +2,14 @@ import { assert, warn } from '@ember/debug';
 import type Route from '@ember/routing/route';
 import { next } from '@ember/runloop';
 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 { SDK_VERSION } from '@sentry/browser';
-import type { Transaction } from '@sentry/types';
-import { GLOBAL_OBJ, timestampInSeconds } from '@sentry/utils';
+import { GLOBAL_OBJ } from '@sentry/utils';
 import Ember from 'ember';
 
+import type { Transaction } from '@sentry/types';
 import type { EmberSentryConfig, GlobalConfig, OwnConfig } from './types';
 
 function _getSentryInitConfig(): EmberSentryConfig['sentry'] {
@@ -66,8 +67,14 @@ export function InitSentryForEmber(_runtimeConfig?: BrowserOptions): void {
   }
 }
 
+/**
+ * Grabs active transaction off scope.
+ *
+ * @deprecated You should not rely on the transaction, but just use `startSpan()` APIs instead.
+ */
 export const getActiveTransaction = (): Transaction | undefined => {
-  return Sentry.getCurrentHub().getScope().getTransaction();
+  // eslint-disable-next-line deprecation/deprecation
+  return Sentry.getCurrentScope().getTransaction();
 };
 
 type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Route;
@@ -80,22 +87,16 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
     fn: X,
     args: Parameters<X>,
   ): Promise<ReturnType<X>> => {
-    const startTimestamp = timestampInSeconds();
-    const result = await fn(...args);
-
-    const currentTransaction = getActiveTransaction();
-    if (!currentTransaction) {
-      return result;
-    }
-    currentTransaction
-      .startChild({
+    return startSpan(
+      {
         op,
-        description,
+        name: description,
         origin: 'auto.ui.ember',
-        startTimestamp,
-      })
-      .end();
-    return result;
+      },
+      () => {
+        return fn(...args);
+      },
+    );
   };
 
   const routeName = BaseRoute.name;

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

@@ -12,7 +12,7 @@ import type { Span, Transaction } from '@sentry/types';
 import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/utils';
 
 import type { BrowserClient } from '..';
-import { getActiveTransaction } from '..';
+import { getActiveSpan, startInactiveSpan } from '..';
 import type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig, StartTransactionFunction } from '../types';
 
 type SentryTestRouterService = RouterService & {
@@ -149,9 +149,9 @@ export function _instrumentEmberRouter(
         'routing.instrumentation': '@sentry/ember',
       },
     });
-    transitionSpan = activeTransaction?.startChild({
+    transitionSpan = startInactiveSpan({
       op: 'ui.ember.transition',
-      description: `route:${fromRoute} -> route:${toRoute}`,
+      name: `route:${fromRoute} -> route:${toRoute}`,
       origin: 'auto.ui.ember',
     });
   });
@@ -195,8 +195,8 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
     if (previousInstance) {
       return;
     }
-    const activeTransaction = getActiveTransaction();
-    if (!activeTransaction) {
+    const activeSpan = getActiveSpan();
+    if (!activeSpan) {
       return;
     }
     if (currentQueueSpan) {
@@ -211,22 +211,20 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
         const minQueueDuration = minimumRunloopQueueDuration ?? 5;
 
         if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
-          activeTransaction
-            ?.startChild({
-              op: `ui.ember.runloop.${queue}`,
-              origin: 'auto.ui.ember',
-              startTimestamp: currentQueueStart,
-              endTimestamp: now,
-            })
-            .end();
+          startInactiveSpan({
+            name: 'runloop',
+            op: `ui.ember.runloop.${queue}`,
+            origin: 'auto.ui.ember',
+            startTimestamp: currentQueueStart,
+          })?.end(now);
         }
         currentQueueStart = undefined;
       }
 
       // Setup for next queue
 
-      const stillActiveTransaction = getActiveTransaction();
-      if (!stillActiveTransaction) {
+      const stillActiveSpan = getActiveSpan();
+      if (!stillActiveSpan) {
         return;
       }
       currentQueueStart = timestampInSeconds();
@@ -286,15 +284,12 @@ function processComponentRenderAfter(
   const componentRenderDuration = now - begin.now;
 
   if (componentRenderDuration * 1000 >= minComponentDuration) {
-    const activeTransaction = getActiveTransaction();
-
-    activeTransaction?.startChild({
+    startInactiveSpan({
+      name: payload.containerKey || payload.object,
       op,
-      description: payload.containerKey || payload.object,
       origin: 'auto.ui.ember',
       startTimestamp: begin.now,
-      endTimestamp: now,
-    });
+    })?.end(now);
   }
 }
 
@@ -372,13 +367,12 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
   const startTimestamp = (measure.startTime + browserPerformanceTimeOrigin) / 1000;
   const endTimestamp = startTimestamp + measure.duration / 1000;
 
-  const transaction = getActiveTransaction();
-  const span = transaction?.startChild({
+  startInactiveSpan({
     op: 'ui.ember.init',
+    name: 'init',
     origin: 'auto.ui.ember',
     startTimestamp,
-  });
-  span?.end(endTimestamp);
+  })?.end(endTimestamp);
   performance.clearMarks(startName);
   performance.clearMarks(endName);
 
@@ -443,19 +437,19 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   });
 
   if (macroCondition(isTesting())) {
-    const client = Sentry.getCurrentHub().getClient();
+    const client = Sentry.getClient();
 
     if (
       client &&
-      (client as BrowserClient).getIntegrationById &&
-      (client as BrowserClient).getIntegrationById('BrowserTracing')
+      (client as BrowserClient).getIntegrationByName &&
+      (client as BrowserClient).getIntegrationByName('BrowserTracing')
     ) {
       // Initializers are called more than once in tests, causing the integrations to not be setup correctly.
       return;
     }
   }
 
-  const client = Sentry.getCurrentHub().getClient();
+  const client = Sentry.getClient();
   if (client && client.addIntegration) {
     client.addIntegration(browserTracing);
   }

package/index.d.ts

@@ -2,6 +2,11 @@ import type Route from '@ember/routing/route';
 import type { BrowserOptions } from '@sentry/browser';
 import type { Transaction } from '@sentry/types';
 export declare function InitSentryForEmber(_runtimeConfig?: BrowserOptions): void;
+/**
+ * Grabs active transaction off scope.
+ *
+ * @deprecated You should not rely on the transaction, but just use `startSpan()` APIs instead.
+ */
 export declare const getActiveTransaction: () => Transaction | undefined;
 type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Route;
 export declare const instrumentRoutePerformance: <T extends RouteConstructor>(BaseRoute: T) => T;

package/package.json

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