@sentry/ember 8.0.0-alpha.2 → 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.8 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/instance-initializers/sentry-performance.ts

@@ -6,20 +6,21 @@ 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 type { ExtendedBackburner } from '@sentry/ember/runloop';
-import type { Span } from '@sentry/types';
-import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/utils';
-
-import type { BrowserClient } from '@sentry/browser';
+import type {
+  BrowserClient,
+  startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
+  startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
+} from '@sentry/browser';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getActiveSpan,
   getClient,
-  startBrowserTracingNavigationSpan,
-  startBrowserTracingPageLoadSpan,
   startInactiveSpan,
 } 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 type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
 
 function getSentryConfig(): EmberSentryConfig {
@@ -99,6 +100,8 @@ export function _instrumentEmberRouter(
   routerService: RouterService,
   routerMain: EmberRouterMain,
   config: EmberSentryConfig,
+  startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
+  startBrowserTracingNavigationSpan: typeof startBrowserTracingNavigationSpanType,
 ): void {
   const { disableRunloopPerformance } = config;
   const location = routerMain.location;
@@ -119,9 +122,9 @@ export function _instrumentEmberRouter(
     const routeInfo = routerService.recognize(url);
     activeRootSpan = startBrowserTracingPageLoadSpan(client, {
       name: `route:${routeInfo.name}`,
-      origin: 'auto.pageload.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
         url,
         toRoute: routeInfo.name,
       },
@@ -146,9 +149,9 @@ export function _instrumentEmberRouter(
 
     activeRootSpan = startBrowserTracingNavigationSpan(client, {
       name: `route:${toRoute}`,
-      origin: 'auto.navigation.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
         fromRoute,
         toRoute,
       },
@@ -220,7 +223,7 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
             },
             name: 'runloop',
             op: `ui.ember.runloop.${queue}`,
-            startTimestamp: currentQueueStart,
+            startTime: currentQueueStart,
           })?.end(now);
         }
         currentQueueStart = undefined;
@@ -292,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);
   }
 }
@@ -369,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',
@@ -378,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);
 
@@ -411,7 +416,8 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   // Maintaining backwards compatibility with config.browserTracingOptions, but passing it with Sentry options is preferred.
   const browserTracingOptions = config.browserTracingOptions || config.sentry.browserTracingOptions || {};
 
-  const { browserTracingIntegration } = await import('@sentry/browser');
+  const { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } =
+    await import('@sentry/browser');
 
   const idleTimeout = config.transitionTimeout || 5000;
 
@@ -431,7 +437,7 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   }
 
   // We _always_ call this, as it triggers the page load & navigation spans
-  _instrumentNavigation(appInstance, config);
+  _instrumentNavigation(appInstance, config, startBrowserTracingPageLoadSpan, startBrowserTracingNavigationSpan);
 
   // Skip instrumenting the stuff below again in tests, as these are not reset between tests
   if (isAlreadyInitialized) {
@@ -443,7 +449,12 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   _instrumentInitialLoad(config);
 }
 
-function _instrumentNavigation(appInstance: ApplicationInstance, config: EmberSentryConfig): void {
+function _instrumentNavigation(
+  appInstance: ApplicationInstance,
+  config: EmberSentryConfig,
+  startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
+  startBrowserTracingNavigationSpan: typeof startBrowserTracingNavigationSpanType,
+): void {
   // eslint-disable-next-line ember/no-private-routing-service
   const routerMain = appInstance.lookup('router:main') as EmberRouterMain;
   let routerService = appInstance.lookup('service:router') as RouterService & {
@@ -465,7 +476,13 @@ function _instrumentNavigation(appInstance: ApplicationInstance, config: EmberSe
   }
 
   routerService._hasMountedSentryPerformanceRouting = true;
-  _instrumentEmberRouter(routerService, routerMain, config);
+  _instrumentEmberRouter(
+    routerService,
+    routerMain,
+    config,
+    startBrowserTracingPageLoadSpan,
+    startBrowserTracingNavigationSpan,
+  );
 }
 
 export default {

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

@@ -1,8 +1,9 @@
 import type ApplicationInstance from '@ember/application/instance';
 import type RouterService from '@ember/routing/router-service';
+import type { startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType, startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType } from '@sentry/browser';
 import type { EmberRouterMain, EmberSentryConfig } from '../types';
 export declare function initialize(appInstance: ApplicationInstance): void;
-export declare function _instrumentEmberRouter(routerService: RouterService, routerMain: EmberRouterMain, config: EmberSentryConfig): void;
+export declare function _instrumentEmberRouter(routerService: RouterService, routerMain: EmberRouterMain, config: EmberSentryConfig, startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType, startBrowserTracingNavigationSpan: typeof startBrowserTracingNavigationSpanType): void;
 export declare function instrumentForPerformance(appInstance: ApplicationInstance): Promise<void>;
 declare const _default: {
     initialize: typeof initialize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "8.0.0-alpha.2",
+  "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": "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",
+    "@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.8"
+    "node": ">=14.18"
   },
   "ember": {
     "edition": "octane"