@sentry/ember 6.15.0 → 6.17.0

package/addon/index.ts

@@ -8,10 +8,6 @@ import { timestampWithMs } from '@sentry/utils';
 import { GlobalConfig, OwnConfig } from './types';
 import { getGlobalObject } from '@sentry/utils';
 
-declare module '@ember/debug' {
-  export function assert(desc: string, test: unknown): void;
-}
-
 function _getSentryInitConfig() {
   const _global = getGlobalObject<GlobalConfig>();
   _global.__sentryEmberConfig = _global.__sentryEmberConfig ?? {};

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

@@ -109,7 +109,7 @@ export function _instrumentEmberRouter(
       },
     });
     transitionSpan = activeTransaction.startChild({
-      op: 'ember.transition',
+      op: 'ui.ember.transition',
       description: `route:${fromRoute} -> route:${toRoute}`,
     });
   });
@@ -173,7 +173,7 @@ function _instrumentEmberRunloop(config: EmberSentryConfig) {
             if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
               activeTransaction
                 ?.startChild({
-                  op: `ember.runloop.${queue}`,
+                  op: `ui.ember.runloop.${queue}`,
                   startTimestamp: currentQueueStart,
                   endTimestamp: now,
                 })
@@ -273,7 +273,7 @@ function _instrumentComponents(config: EmberSentryConfig) {
       },
 
       after(_name: string, _timestamp: number, payload: any, _beganIndex: number) {
-        processComponentRenderAfter(payload, beforeEntries, 'ember.component.render', minComponentDuration);
+        processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
       },
     });
     if (enableComponentDefinitions) {
@@ -283,7 +283,7 @@ function _instrumentComponents(config: EmberSentryConfig) {
         },
 
         after(_name: string, _timestamp: number, payload: any, _beganIndex: number) {
-          processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ember.component.definition', 0);
+          processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
         },
       });
     }
@@ -331,7 +331,7 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
 
   const transaction = getActiveTransaction();
   const span = transaction?.startChild({
-    op: 'ember.initial-load',
+    op: 'ui.ember.init',
     startTimestamp,
   });
   span?.finish(endTimestamp);

package/index.d.ts

@@ -1,7 +1,4 @@
 import { BrowserOptions } from '@sentry/browser';
-declare module '@ember/debug' {
-    function assert(desc: string, test: unknown): void;
-}
 export declare function InitSentryForEmber(_runtimeConfig?: BrowserOptions): void;
 export declare const getActiveTransaction: () => import("@sentry/types").Transaction | undefined;
 export declare const instrumentRoutePerformance: (BaseRoute: any) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "6.15.0",
+  "version": "6.17.0",
   "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",
@@ -23,32 +23,31 @@
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
     "pack": "npm pack",
-    "prepublishOnly": "ember ts:precompile",
-    "postpublish": "ember ts:clean",
+    "prepack": "ember ts:precompile",
+    "postpack": "ember ts:clean",
     "start": "ember serve",
-    "test": "node ./scripts/run_tests.js",
-    "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each"
+    "test": "ember try:each",
+    "test:all": "node ./scripts/run-CI-tests.js"
   },
   "dependencies": {
     "@embroider/macros": "~0.47.2",
-    "@sentry/browser": "6.15.0",
-    "@sentry/tracing": "6.15.0",
-    "@sentry/types": "6.15.0",
-    "@sentry/utils": "6.15.0",
-    "ember-auto-import": "^1.12.0",
+    "@sentry/browser": "6.17.0",
+    "@sentry/tracing": "6.17.0",
+    "@sentry/types": "6.17.0",
+    "@sentry/utils": "6.17.0",
+    "ember-auto-import": "^1.12.0 || ^2.2.0",
     "ember-cli-babel": "~7.26.6",
-    "ember-cli-htmlbars": "^5.7.1",
-    "ember-cli-typescript": "~3.1.4"
+    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-typescript": "^4.2.1"
   },
   "devDependencies": {
     "@ember/optional-features": "~1.3.0",
     "@embroider/test-setup": "~0.47.2",
     "@glimmer/component": "~1.0.0",
     "@glimmer/tracking": "~1.0.0",
-    "@sentry-internal/eslint-config-sdk": "6.15.0",
     "@types/ember": "~3.16.5",
     "@types/ember-qunit": "~3.4.9",
+    "@types/ember__debug": "^3.16.5",
     "@types/ember__test-helpers": "~1.7.0",
     "@types/qunit": "~2.9.1",
     "@types/rsvp": "~4.0.3",
@@ -76,9 +75,8 @@
     "eslint-plugin-ember": "~8.6.0",
     "eslint-plugin-node": "^11.1.0",
     "loader.js": "~4.7.0",
-    "npm-run-all": "^4.1.5",
     "qunit-dom": "~1.2.0",
-    "typescript": "3.7.5"
+    "webpack": "^5.65.0"
   },
   "engines": {
     "node": "10.* || >= 12"

package/scripts/run-CI-tests.js

@@ -0,0 +1,17 @@
+/*eslint-env node*/
+const { spawnSync } = require('child_process');
+
+console.log('Mimicking the CI environment in order to run tests against multiple versions of Ember');
+
+const result = spawnSync('yarn test', {
+  shell: true,
+  stdio: 'inherit',
+  env: {
+    ...process.env,
+    GITHUB_ACTIONS: true,
+    GITHUB_EVENT_NAME: 'push',
+    GITHUB_HEAD_REF: 'master',
+  },
+});
+
+process.exit(result.status);

package/scripts/run_tests.js

@@ -1,15 +0,0 @@
-// running compatibilty tests takes ~15 min on a 2019 2.6 GHz 6-Core Intel i7 16" MacBook Pro w 32 GB of RAM, vs ~25 sec
-// for the regular tests
-
-/*eslint-env node*/
-const { spawnSync } = require('child_process');
-
-if (process.env.TRAVIS || process.env.GITHUB_ACTIONS) {
-  console.log('In CI - running tests against multiple versions of Ember');
-  const result = spawnSync('yarn npm-run-all lint:* test:*', { shell: true, stdio: 'inherit' });
-  process.exit(result.status);
-} else {
-  console.log('Tests running locally - will only run tests against default version of Ember');
-  const result = spawnSync('yarn npm-run-all lint:* test:ember', { shell: true, stdio: 'inherit' });
-  process.exit(result.status);
-}