PR cleanup

Author: mydea

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

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import type ApplicationInstance from '@ember/application/instance';
 import { instrumentForPerformance, getSentryConfig } from '../utils/performance';
 

packages/ember/addon/utils/browserTracingIntegration.ts

@@ -1,4 +1,3 @@
-import type { BrowserClient } from '@sentry/browser';
 import {
   browserTracingIntegration as originalBrowserTracingIntegration,
   startBrowserTracingNavigationSpan,
@@ -51,7 +50,7 @@ export function browserTracingIntegration(options: EmberBrowserTracingIntegratio
 
   return {
     ...integration,
-    afterAllSetup(client: BrowserClient) {
+    afterAllSetup(client) {
       integration.afterAllSetup(client);
 
       // Run this in the next tick to ensure the ember router etc. is properly initialized

packages/ember/addon/utils/instrumentEmberAppInstanceForPerformance.ts

@@ -2,17 +2,16 @@ import type ApplicationInstance from '@ember/application/instance';
 import type Transition from '@ember/routing/-private/transition';
 import type RouterService from '@ember/routing/router-service';
 import type {
-  BrowserClient,
   startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
   startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
 } from '@sentry/browser';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
-import type { Span } from '@sentry/core';
+import type { Client, Span } from '@sentry/core';
 import type { EmberRouterMain } from '../types';
 import { getBackburner } from './performance';
 
 export function instrumentEmberAppInstanceForPerformance(
-  client: BrowserClient,
+  client: Client,
   appInstance: ApplicationInstance,
   config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
   startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
@@ -76,7 +75,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {
 }
 
 function _instrumentEmberRouter(
-  client: BrowserClient,
+  client: Client,
   routerService: RouterService,
   routerMain: EmberRouterMain,
   config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },

packages/ember/addon/utils/performance.ts

@@ -1,8 +1,6 @@
-/* eslint-disable max-lines */
 import type ApplicationInstance from '@ember/application/instance';
 import { _backburner, run } from '@ember/runloop';
 import { getOwnConfig, importSync, isTesting, macroCondition } from '@embroider/macros';
-import type { BrowserClient } from '@sentry/browser';
 import { getClient } from '@sentry/browser';
 import { addIntegration, GLOBAL_OBJ } from '@sentry/core';
 import type { ExtendedBackburner } from '@sentry/ember/runloop';
@@ -71,7 +69,7 @@ export function instrumentForPerformance(appInstance: ApplicationInstance): void
     ...emberSpecificConfig,
   });
 
-  const client = getClient<BrowserClient>();
+  const client = getClient();
   const isAlreadyInitialized = macroCondition(isTesting()) ? client?.getIntegrationByName('BrowserTracing') : false;
   addIntegration(browserTracing);
 

packages/ember/tests/acceptance/sentry-replay-test.ts

@@ -1,5 +1,5 @@
 import { visit } from '@ember/test-helpers';
-import type { BrowserClient, replayIntegration } from '@sentry/ember';
+import type { replayIntegration } from '@sentry/ember';
 import * as Sentry from '@sentry/ember';
 import { setupApplicationTest } from 'ember-qunit';
 import { module, test } from 'qunit';
@@ -12,8 +12,7 @@ module('Acceptance | Sentry Session Replay', function (hooks) {
   test('Test replay', async function (assert) {
     await visit('/replay');
 
-    const integration =
-      Sentry.getClient<BrowserClient>()?.getIntegrationByName<ReturnType<typeof replayIntegration>>('Replay');
+    const integration = Sentry.getClient()?.getIntegrationByName<ReturnType<typeof replayIntegration>>('Replay');
     assert.ok(integration);
 
     const replay = integration!['_replay'];

packages/ember/tests/dummy/app/routes/replay.ts

@@ -1,11 +1,10 @@
 import Route from '@ember/routing/route';
-import type { BrowserClient } from '@sentry/ember';
 import * as Sentry from '@sentry/ember';
 
 export default class ReplayRoute extends Route {
   public async beforeModel(): Promise<void> {
     const { replayIntegration } = Sentry;
-    const client = Sentry.getClient<BrowserClient>();
+    const client = Sentry.getClient();
     if (client && !client.getIntegrationByName('Replay')) {
       client.addIntegration(replayIntegration());
     }