@sentry/ember 7.104.0 → 8.0.0-alpha.2

package/README.md

@@ -173,7 +173,7 @@ ENV['@sentry/ember'] = {
 ### Supported Versions
 
 * **Ember.js**: v4.0 or above
-* **Node**: v14 or above
+* **Node**: v14.8 or above
 
 ### Previous Integration
 

package/addon/index.ts

@@ -9,7 +9,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core
 import { GLOBAL_OBJ } from '@sentry/utils';
 import Ember from 'ember';
 
-import type { Transaction } from '@sentry/types';
+import type { TransactionSource } from '@sentry/types';
 import type { EmberSentryConfig, GlobalConfig, OwnConfig } from './types';
 
 function _getSentryInitConfig(): EmberSentryConfig['sentry'] {
@@ -60,33 +60,24 @@ export function init(_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 => {
-  // eslint-disable-next-line deprecation/deprecation
-  return Sentry.getCurrentScope().getTransaction();
-};
-
 type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Route;
 
 export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const instrumentFunction = async <X extends (...args: unknown[]) => any>(
     op: string,
-    description: string,
+    name: string,
     fn: X,
     args: Parameters<X>,
+    source: TransactionSource,
   ): Promise<ReturnType<X>> => {
     return startSpan(
       {
         attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'ember',
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
         },
         op,
-        name: description,
+        name,
       },
       () => {
         return fn(...args);
@@ -105,15 +96,22 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
           this.fullRouteName,
           super.beforeModel.bind(this),
           args,
+          'custom',
         );
       }
 
       public async model(...args: unknown[]): Promise<unknown> {
-        return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args);
+        return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
       }
 
       public afterModel(...args: unknown[]): void | Promise<unknown> {
-        return instrumentFunction('ui.ember.route.after_model', this.fullRouteName, super.afterModel.bind(this), args);
+        return instrumentFunction(
+          'ui.ember.route.after_model',
+          this.fullRouteName,
+          super.afterModel.bind(this),
+          args,
+          'custom',
+        );
       }
 
       public setupController(...args: unknown[]): void | Promise<unknown> {
@@ -122,6 +120,7 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
           this.fullRouteName,
           super.setupController.bind(this),
           args,
+          'custom',
         );
       }
     },

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

@@ -6,14 +6,20 @@ import type RouterService from '@ember/routing/router-service';
 import { _backburner, run, scheduleOnce } from '@ember/runloop';
 import type { EmberRunQueues } from '@ember/runloop/-private/types';
 import { getOwnConfig, isTesting, macroCondition } from '@embroider/macros';
-import * as Sentry from '@sentry/browser';
 import type { ExtendedBackburner } from '@sentry/ember/runloop';
 import type { Span } from '@sentry/types';
 import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/utils';
 
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import type { BrowserClient } from '..';
-import { getActiveSpan, startInactiveSpan } from '..';
+import type { BrowserClient } from '@sentry/browser';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  getActiveSpan,
+  getClient,
+  startBrowserTracingNavigationSpan,
+  startBrowserTracingPageLoadSpan,
+  startInactiveSpan,
+} from '@sentry/browser';
 import type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
 
 function getSentryConfig(): EmberSentryConfig {
@@ -103,28 +109,21 @@ export function _instrumentEmberRouter(
   const browserTracingOptions = config.browserTracingOptions || config.sentry.browserTracingOptions || {};
   const url = getLocationURL(location);
 
-  const client = Sentry.getClient<BrowserClient>();
+  const client = getClient<BrowserClient>();
 
   if (!client) {
     return;
   }
 
-  if (
-    url &&
-    browserTracingOptions.startTransactionOnPageLoad !== false &&
-    browserTracingOptions.instrumentPageLoad !== false
-  ) {
+  if (url && browserTracingOptions.instrumentPageLoad !== false) {
     const routeInfo = routerService.recognize(url);
-    activeRootSpan = Sentry.startBrowserTracingPageLoadSpan(client, {
+    activeRootSpan = startBrowserTracingPageLoadSpan(client, {
       name: `route:${routeInfo.name}`,
       origin: 'auto.pageload.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
         url,
         toRoute: routeInfo.name,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
   }
@@ -137,10 +136,7 @@ export function _instrumentEmberRouter(
     getBackburner().off('end', finishActiveTransaction);
   };
 
-  if (
-    browserTracingOptions.startTransactionOnLocationChange === false &&
-    browserTracingOptions.instrumentNavigation === false
-  ) {
+  if (browserTracingOptions.instrumentNavigation === false) {
     return;
   }
 
@@ -148,16 +144,13 @@ export function _instrumentEmberRouter(
     const { fromRoute, toRoute } = getTransitionInformation(transition, routerService);
     activeRootSpan?.end();
 
-    activeRootSpan = Sentry.startBrowserTracingNavigationSpan(client, {
+    activeRootSpan = startBrowserTracingNavigationSpan(client, {
       name: `route:${toRoute}`,
       origin: 'auto.navigation.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
         fromRoute,
         toRoute,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
 
@@ -429,7 +422,7 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
     instrumentPageLoad: false,
   });
 
-  const client = Sentry.getClient<BrowserClient>();
+  const client = getClient<BrowserClient>();
 
   const isAlreadyInitialized = macroCondition(isTesting()) ? !!client?.getIntegrationByName('BrowserTracing') : false;
 

package/addon/types.ts

@@ -1,9 +1,7 @@
-import type { BrowserOptions, BrowserTracing, browserTracingIntegration } from '@sentry/browser';
+import type { BrowserOptions, browserTracingIntegration } from '@sentry/browser';
 import type { Transaction, TransactionContext } from '@sentry/types';
 
-type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0] &
-  // eslint-disable-next-line deprecation/deprecation
-  ConstructorParameters<typeof BrowserTracing>[0];
+type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0];
 
 export type EmberSentryConfig = {
   sentry: BrowserOptions & { browserTracingOptions?: BrowserTracingOptions };

package/index.d.ts

@@ -1,16 +1,9 @@
 import type Route from '@ember/routing/route';
 import type { BrowserOptions } from '@sentry/browser';
-import type { Transaction } from '@sentry/types';
 /**
  * Initialize the Sentry SDK for Ember.
  */
 export declare function init(_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;
 export * from '@sentry/browser';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.104.0",
+  "version": "8.0.0-alpha.2",
   "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": "7.104.0",
-    "@sentry/core": "7.104.0",
-    "@sentry/types": "7.104.0",
-    "@sentry/utils": "7.104.0",
+    "@sentry/browser": "8.0.0-alpha.2",
+    "@sentry/core": "8.0.0-alpha.2",
+    "@sentry/types": "8.0.0-alpha.2",
+    "@sentry/utils": "8.0.0-alpha.2",
     "ember-auto-import": "^1.12.1 || ^2.4.3",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.1.1",
@@ -83,7 +83,7 @@
     "webpack": "~5.74.0"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": ">=14.8"
   },
   "ember": {
     "edition": "octane"

package/types.d.ts

@@ -1,6 +1,6 @@
-import type { BrowserOptions, BrowserTracing, browserTracingIntegration } from '@sentry/browser';
+import type { BrowserOptions, browserTracingIntegration } from '@sentry/browser';
 import type { Transaction, TransactionContext } from '@sentry/types';
-type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0] & ConstructorParameters<typeof BrowserTracing>[0];
+type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0];
 export type EmberSentryConfig = {
     sentry: BrowserOptions & {
         browserTracingOptions?: BrowserTracingOptions;