avoid importing Ember bundle

Where possible, import the module directly.

Author: mydea

packages/ember/addon/ember.d.ts

@@ -1,6 +1,6 @@
 import ApplicationInstance from '@ember/application/instance';
-import Ember from 'ember';
 import { run, _backburner, scheduleOnce } from '@ember/runloop';
+import { subscribe } from '@ember/instrumentation';
 import * as Sentry from '@sentry/browser';
 import { ExtendedBackburner } from '@sentry/ember/runloop';
 import { Span, Transaction, Integration } from '@sentry/types';
@@ -279,7 +279,6 @@ function _instrumentComponents(config: EmberSentryConfig) {
   const beforeEntries = {} as RenderEntries;
   const beforeComponentDefinitionEntries = {} as RenderEntries;
 
-  const subscribe = Ember.subscribe;
   function _subscribeToRenderEvents() {
     subscribe('render.component', {
       before(_name: string, _timestamp: number, payload: Payload) {
@@ -310,6 +309,7 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
   const endName = '@sentry/ember:initial-load-end';
 
   const { performance } = window;
+  // @ts-ignore
   const HAS_PERFORMANCE = performance && performance.clearMarks && performance.clearMeasures;
 
   if (!HAS_PERFORMANCE) {
@@ -324,6 +324,7 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
 
   // Split performance check in two so clearMarks still happens even if timeOrigin isn't available.
   const HAS_PERFORMANCE_TIMING =
+    // @ts-ignore
     performance.measure && performance.getEntriesByName && browserPerformanceTimeOrigin !== undefined;
   if (!HAS_PERFORMANCE_TIMING) {
     return;

packages/ember/addon/instance-initializers/sentry-performance.ts

@@ -1,7 +1,7 @@
 import { test, module } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { find, click, visit } from '@ember/test-helpers';
-import { run } from '@ember/runloop';
+import { next } from '@ember/runloop';
 import { setupSentryTest } from '../helpers/setup-sentry';
 
 const defaultAssertOptions = {
@@ -78,7 +78,7 @@ module('Acceptance | Sentry Errors', function (hooks) {
 
     const done = assert.async();
 
-    run.next(() => {
+    next(() => {
       assertSentryErrorCount(assert, 1);
       assertSentryCall(assert, 0, { errorBodyContains: [...this.errorMessages] });
       done();

packages/ember/tests/acceptance/sentry-errors-test.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
 import sinon from 'sinon';
 import { _instrumentEmberRouter } from '@sentry/ember/instance-initializers/sentry-performance';
+import { resetOnerror, setupOnerror } from '@ember/test-helpers';
 
 // Keep a reference to the original startTransaction as the application gets re-initialized and setup for
 // the integration doesn't occur again after the first time.
@@ -41,11 +41,10 @@ export function setupSentryTest(hooks) {
       return true;
     };
 
-    Ember.onerror = function (...args) {
-      const [error] = args;
+    setupOnerror(function (error) {
       errorMessages.push(error.message);
       throw error;
-    };
+    });
 
     this._windowOnError = window.onerror;
 
@@ -64,5 +63,6 @@ export function setupSentryTest(hooks) {
     this.fetchStub.restore();
     this.qunitOnUnhandledRejection.restore();
     window.onerror = this._windowOnError;
+    resetOnerror();
   });
 }

packages/ember/tests/helpers/setup-sentry.js

@@ -10,10 +10,10 @@ import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
-import Ember from 'ember';
+import { isTesting } from '@embroider/macros';
 
-Sentry.addGlobalEventProcessor((event) => {
-  if (Ember.testing) {
+Sentry.addGlobalEventProcessor(event => {
+  if (isTesting()) {
     if (!window._sentryTestEvents) {
       window._sentryTestEvents = [];
     }

packages/ember/tests/test-helper.js

@@ -4,3 +4,11 @@ declare module '@sentry/ember/templates/*' {
   const tmpl: TemplateFactory;
   export default tmpl;
 }
+
+/**
+ * This is private as of now.
+ * See https://github.com/emberjs/ember.js/blob/master/packages/@ember/instrumentation/index.ts
+ */
+declare module '@ember/instrumentation' {
+  export function subscribe(pattern: string, object: {}): any;
+}