integrate suggestions

Author: aklkv

dev-packages/e2e-tests/test-applications/ember-classic/app/instance-initializers/sentry-performance.ts

@@ -1,5 +1,5 @@
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance, {

dev-packages/e2e-tests/test-applications/ember-embroider/app/instance-initializers/sentry-performance.ts

@@ -1,5 +1,5 @@
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance, {

packages/ember/README.md

@@ -62,7 +62,7 @@ For automatic performance instrumentation (page loads, navigation, runloop, comp
 ```typescript
 // app/instance-initializers/sentry-performance.ts
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance, {

packages/ember/UPGRADE.md

@@ -126,7 +126,7 @@ In v1, performance instrumentation was automatic. In v2, create an instance-init
 
 ```typescript
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance);
@@ -141,7 +141,7 @@ export default {
 
 ```typescript
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance, {
@@ -211,7 +211,7 @@ import { instrumentRoutePerformance } from '@sentry/ember';
 import { instrumentRoutePerformance } from '@sentry/ember';
 
 // v2 - new import for setupPerformance
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 ```
 
 ### All @sentry/browser Exports
@@ -317,7 +317,7 @@ loadInitializers(App, config.modulePrefix);
 **app/instance-initializers/sentry-performance.ts:**
 ```typescript
 import type ApplicationInstance from '@ember/application/instance';
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 
 export function initialize(appInstance: ApplicationInstance): void {
   setupPerformance(appInstance);
@@ -349,7 +349,7 @@ export default { initialize };
 
 Make sure you're importing from the correct path:
 ```typescript
-import { setupPerformance } from '@sentry/ember/performance';
+import { setupPerformance } from '@sentry/ember';
 ```
 
 ### Performance spans not appearing

packages/ember/package.json

@@ -17,10 +17,6 @@
       "types": "./declarations/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./performance": {
-      "types": "./declarations/performance.d.ts",
-      "default": "./dist/performance.js"
-    },
     "./addon-main.js": "./addon-main.cjs"
   },
   "files": [

packages/ember/rollup.config.mjs

@@ -25,7 +25,7 @@ export default {
     // up your addon's public API. Also make sure your package.json#exports
     // is aligned to the config here.
     // See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
-    addon.publicEntrypoints(['**/*.js', 'index.js']),
+    addon.publicEntrypoints(['index.ts']),
 
     // These are the modules that should get reexported into the traditional
     // "app" tree. Things in here should also be in publicEntrypoints above, but

packages/ember/src/index.ts

@@ -1,259 +1,22 @@
 /**
  * @sentry/ember - Official Sentry SDK for Ember.js
  *
- * This is a v2 Ember addon that provides Sentry error tracking and performance
- * monitoring for Ember.js applications.
- *
- * ## Migration from v1 to v2 addon format
- *
- * ### 1. Config moved from environment.js to init()
- *
- * Configuration is now passed directly to `init()` instead of `config/environment.js`.
- *
- * ### 2. Initial load scripts must be added manually
- *
- * The v2 addon no longer automatically injects scripts into your HTML.
- * For initial load performance measurement, manually add these scripts to `app/index.html`:
- *
- * ```html
- * <!DOCTYPE html>
- * <html>
- *   <head>
- *     <!-- Add at start of head for accurate initial load measurement -->
- *     <script>if(window.performance&&window.performance.mark){window.performance.mark('@sentry/ember:initial-load-start');}</script>
- *   </head>
- *   <body>
- *     {{content-for "body"}}
- *     <script src="{{rootURL}}assets/vendor.js"></script>
- *     <script src="{{rootURL}}assets/your-app.js"></script>
- *     <!-- Add at end of body for accurate initial load measurement -->
- *     <script>if(window.performance&&window.performance.mark){window.performance.mark('@sentry/ember:initial-load-end');}</script>
- *   </body>
- * </html>
- * ```
- *
- * ### 3. Performance instrumentation requires manual setup
- *
- * In v1, performance was automatically instrumented via a built-in instance-initializer.
- * In v2, create your own `app/instance-initializers/sentry-performance.ts`:
- *
- * ```typescript
- * import type ApplicationInstance from '@ember/application/instance';
- * import { setupPerformance } from '@sentry/ember/performance';
- *
- * export function initialize(appInstance: ApplicationInstance): void {
- *   setupPerformance(appInstance);
- * }
- *
- * export default { initialize };
- * ```
- *
- * ## Basic Usage
- *
- * ```typescript
- * // In your app/app.ts or app/app.js
- * import Application from '@ember/application';
- * import * as Sentry from '@sentry/ember';
- *
- * Sentry.init({
- *   dsn: 'YOUR_DSN_HERE',
- *   // ...other options
- * });
- *
- * export default class App extends Application {
- *   // ...
- * }
- * ```
- *
- * ## Route Performance Instrumentation
- *
- * ```typescript
- * // In your route file
- * import Route from '@ember/routing/route';
- * import { instrumentRoutePerformance } from '@sentry/ember';
- *
- * class MyRoute extends Route {
- *   // ...
- * }
- *
- * export default instrumentRoutePerformance(MyRoute);
- * ```
+ * @see {@link https://docs.sentry.io/platforms/javascript/guides/ember/ Sentry Ember Documentation}
  */
 
-import { startSpan } from '@sentry/browser';
-import * as Sentry from '@sentry/browser';
-import {
-  applySdkMetadata,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-} from '@sentry/core';
-
-import type Route from '@ember/routing/route';
-import type { BrowserOptions } from '@sentry/browser';
-import type { Client, TransactionSource } from '@sentry/core';
-
-/**
- * Inline script for marking initial load start time.
- * Add this in a `<script>` tag at the start of `<head>` in your index.html
- * for accurate initial load measurement.
- *
- * If using CSP, add `'sha256-${INITIAL_LOAD_HEAD_SCRIPT_HASH}'` to your script-src directive.
- */
-export const INITIAL_LOAD_HEAD_SCRIPT =
-  "if(window.performance&&window.performance.mark){window.performance.mark('@sentry/ember:initial-load-start');}";
-
-/**
- * Inline script for marking initial load end time.
- * Add this in a `<script>` tag at the end of `<body>` in your index.html
- * for accurate initial load measurement.
- *
- * If using CSP, add `'sha256-${INITIAL_LOAD_BODY_SCRIPT_HASH}'` to your script-src directive.
- */
-export const INITIAL_LOAD_BODY_SCRIPT =
-  "if(window.performance&&window.performance.mark){window.performance.mark('@sentry/ember:initial-load-end');}";
-
-/**
- * SHA-256 hash of INITIAL_LOAD_HEAD_SCRIPT for CSP script-src directive.
- * Use as: `script-src 'sha256-rK59cvsWB8z8eOLy4JAib4tBp8c/beXTnlIRV+lYjhg=' ...`
- */
-export const INITIAL_LOAD_HEAD_SCRIPT_HASH =
-  'rK59cvsWB8z8eOLy4JAib4tBp8c/beXTnlIRV+lYjhg=';
-
-/**
- * SHA-256 hash of INITIAL_LOAD_BODY_SCRIPT for CSP script-src directive.
- * Use as: `script-src 'sha256-jax2B81eAvYZMwpds3uZwJJOraCENeDFUJKuNJau/bg=' ...`
- */
-export const INITIAL_LOAD_BODY_SCRIPT_HASH =
-  'jax2B81eAvYZMwpds3uZwJJOraCENeDFUJKuNJau/bg=';
-
-/**
- * Initialize the Sentry SDK for Ember.
- *
- * This should be called early in your application's startup, typically in app/app.ts
- * before your Application class is defined.
- *
- * @param config - Sentry browser options
- * @returns The Sentry client instance
- *
- * @example
- * ```typescript
- * import * as Sentry from '@sentry/ember';
- *
- * Sentry.init({
- *   dsn: 'YOUR_DSN_HERE',
- *   tracesSampleRate: 1.0,
- * });
- * ```
- */
-export function init(config?: BrowserOptions): Client | undefined {
-  const initConfig = { ...config };
-
-  applySdkMetadata(initConfig, 'ember');
-
-  return Sentry.init(initConfig);
-}
-
-type RouteConstructor = new (
-  ...args: ConstructorParameters<typeof Route>
-) => Route;
-
-/**
- * Decorator to instrument an Ember Route for performance monitoring.
- *
- * This wraps the route's lifecycle hooks (beforeModel, model, afterModel, setupController)
- * with Sentry spans to track their performance.
- *
- * @param BaseRoute - The Route class to instrument
- * @returns The instrumented Route class
- *
- * @example
- * ```typescript
- * import Route from '@ember/routing/route';
- * import { instrumentRoutePerformance } from '@sentry/ember';
- *
- * class ApplicationRoute extends Route {
- *   async model() {
- *     return this.store.findAll('post');
- *   }
- * }
- *
- * export default instrumentRoutePerformance(ApplicationRoute);
- * ```
- */
-export const instrumentRoutePerformance = <T extends RouteConstructor>(
-  BaseRoute: T,
-): T => {
-  const instrumentFunction = async (
-    op: string,
-    name: string,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Route hooks have varied signatures that can't be unified with unknown
-    fn: (...args: any[]) => any,
-    args: unknown[],
-    source: TransactionSource,
-  ): Promise<unknown> => {
-    return startSpan(
-      {
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
-        },
-        op,
-        name,
-        onlyIfParent: true,
-      },
-      () => {
-        return fn(...args);
-      },
-    );
-  };
-
-  const routeName = BaseRoute.name;
-
-  return {
-    // @ts-expect-error TS2545 We do not need to redefine a constructor here
-    [routeName]: class extends BaseRoute {
-      public beforeModel(...args: unknown[]): void | Promise<unknown> {
-        return instrumentFunction(
-          'ui.ember.route.before_model',
-          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,
-          'custom',
-        );
-      }
-
-      public afterModel(...args: unknown[]): void | Promise<unknown> {
-        return instrumentFunction(
-          'ui.ember.route.after_model',
-          this.fullRouteName,
-          super.afterModel.bind(this),
-          args,
-          'custom',
-        );
-      }
-
-      public setupController(...args: unknown[]): void | Promise<unknown> {
-        return instrumentFunction(
-          'ui.ember.route.setup_controller',
-          this.fullRouteName,
-          super.setupController.bind(this),
-          args,
-          'custom',
-        );
-      }
-    },
-  }[routeName] as T;
-};
-
 // Re-export everything from @sentry/browser
 export * from '@sentry/browser';
+
+// Sentry-specific utilities
+export {
+  INITIAL_LOAD_BODY_SCRIPT,
+  INITIAL_LOAD_BODY_SCRIPT_HASH,
+  INITIAL_LOAD_HEAD_SCRIPT,
+  INITIAL_LOAD_HEAD_SCRIPT_HASH,
+} from './utils/sentry/constants.ts';
+export { init } from './utils/sentry/init.ts';
+export { instrumentRoutePerformance } from './utils/sentry/instrument-route-performance.ts';
+export {
+  _resetGlobalInstrumentation,
+  setupPerformance,
+} from './utils/sentry/setup-performance.ts';