@sentry/ember 7.107.0 → 8.0.0-alpha.3

package/README.md

@@ -13,13 +13,12 @@
 
 ## General
 
-This package is an Ember addon that wraps `@sentry/browser`, with added functionality related to Ember. All methods available in
-`@sentry/browser` can be imported from `@sentry/ember`.
+This package is an Ember addon that wraps `@sentry/browser`, with added functionality related to Ember. All methods
+available in `@sentry/browser` can be imported from `@sentry/ember`.
 
 ### Installation
 
-As with other Ember addons, run:
-`ember install @sentry/ember`
+As with other Ember addons, run: `ember install @sentry/ember`
 
 Then add the following to your `<your-app>/app.js`
 
@@ -38,8 +37,9 @@ Then add the following to your `<your-app>/app.js`
 
 ### Usage
 
-To use this SDK, call `Sentry.init` before the application is initialized, in `app.js`. This will allow Sentry to capture information while your app is starting.
-Any additional SDK settings can be modified via the usual config in `environment.js` for you, see the Additional Configuration section for more details.
+To use this SDK, call `Sentry.init` before the application is initialized, in `app.js`. This will allow Sentry to
+capture information while your app is starting. Any additional SDK settings can be modified via the usual config in
+`environment.js` for you, see the Additional Configuration section for more details.
 
 ```javascript
 import Application from '@ember/application';
@@ -66,7 +66,8 @@ export default class App extends Application {
 
 ### Additional Configuration
 
-Aside from configuration passed from this addon into `@sentry/browser` via the `sentry` property, there is also the following Ember specific configuration:
+Aside from configuration passed from this addon into `@sentry/browser` via the `sentry` property, there is also the
+following Ember specific configuration:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -93,8 +94,8 @@ ENV['@sentry/ember'] = {
 
 #### Disabling Performance
 
-
-`@sentry/ember` captures performance by default, if you would like to disable the automatic performance instrumentation, you can add the following to your `config/environment.js`:
+`@sentry/ember` captures performance by default, if you would like to disable the automatic performance instrumentation,
+you can add the following to your `config/environment.js`:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -102,7 +103,6 @@ ENV['@sentry/ember'] = {
 };
 ```
 
-
 ### Performance
 
 #### Routes
@@ -149,8 +149,8 @@ ENV['@sentry/ember'] = {
 };
 ```
 
-Additionally, components whose render time is below a threshold (by default 2ms) will not be included as spans.
-If you would like to change this threshold, add the following to your config:
+Additionally, components whose render time is below a threshold (by default 2ms) will not be included as spans. If you
+would like to change this threshold, add the following to your config:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -172,8 +172,8 @@ ENV['@sentry/ember'] = {
 
 ### Supported Versions
 
-* **Ember.js**: v4.0 or above
-* **Node**: v14 or above
+- **Ember.js**: v4.0 or above
+- **Node**: v14.18 or above
 
 ### Previous Integration
 
@@ -182,8 +182,8 @@ this Ember addon to offer more Ember-specific error and performancing monitoring
 
 ## Testing
 
-For this package itself, you can find example instrumentation in the `dummy` application, which is also used for testing.
-To test with the dummy application, you must pass the dsn as an environment variable.
+For this package itself, you can find example instrumentation in the `dummy` application, which is also used for
+testing. To test with the dummy application, you must pass the dsn as an environment variable.
 
 ```javascript
 SENTRY_DSN=__DSN__ ember serve

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

@@ -118,22 +118,15 @@ export function _instrumentEmberRouter(
     return;
   }
 
-  if (
-    url &&
-    browserTracingOptions.startTransactionOnPageLoad !== false &&
-    browserTracingOptions.instrumentPageLoad !== false
-  ) {
+  if (url && browserTracingOptions.instrumentPageLoad !== false) {
     const routeInfo = routerService.recognize(url);
     activeRootSpan = startBrowserTracingPageLoadSpan(client, {
       name: `route:${routeInfo.name}`,
-      origin: 'auto.pageload.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
         url,
         toRoute: routeInfo.name,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
   }
@@ -146,10 +139,7 @@ export function _instrumentEmberRouter(
     getBackburner().off('end', finishActiveTransaction);
   };
 
-  if (
-    browserTracingOptions.startTransactionOnLocationChange === false &&
-    browserTracingOptions.instrumentNavigation === false
-  ) {
+  if (browserTracingOptions.instrumentNavigation === false) {
     return;
   }
 
@@ -159,14 +149,11 @@ export function _instrumentEmberRouter(
 
     activeRootSpan = startBrowserTracingNavigationSpan(client, {
       name: `route:${toRoute}`,
-      origin: 'auto.navigation.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
         fromRoute,
         toRoute,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
 
@@ -236,7 +223,7 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
             },
             name: 'runloop',
             op: `ui.ember.runloop.${queue}`,
-            startTimestamp: currentQueueStart,
+            startTime: currentQueueStart,
           })?.end(now);
         }
         currentQueueStart = undefined;
@@ -308,8 +295,10 @@ function processComponentRenderAfter(
     startInactiveSpan({
       name: payload.containerKey || payload.object,
       op,
-      origin: 'auto.ui.ember',
-      startTimestamp: begin.now,
+      startTime: begin.now,
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
+      },
     })?.end(now);
   }
 }
@@ -385,8 +374,8 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const measure = measures[0]!;
 
-  const startTimestamp = (measure.startTime + browserPerformanceTimeOrigin) / 1000;
-  const endTimestamp = startTimestamp + measure.duration / 1000;
+  const startTime = (measure.startTime + browserPerformanceTimeOrigin) / 1000;
+  const endTime = startTime + measure.duration / 1000;
 
   startInactiveSpan({
     op: 'ui.ember.init',
@@ -394,8 +383,8 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
     },
-    startTimestamp,
-  })?.end(endTimestamp);
+    startTime,
+  })?.end(endTime);
   performance.clearMarks(startName);
   performance.clearMarks(endName);
 

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.107.0",
+  "version": "8.0.0-alpha.3",
   "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.107.0",
-    "@sentry/core": "7.107.0",
-    "@sentry/types": "7.107.0",
-    "@sentry/utils": "7.107.0",
+    "@sentry/browser": "8.0.0-alpha.3",
+    "@sentry/core": "8.0.0-alpha.3",
+    "@sentry/types": "8.0.0-alpha.3",
+    "@sentry/utils": "8.0.0-alpha.3",
     "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.18"
   },
   "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;