From f3339d7b4efb1fd893b8ee1713b3b9361ad8b2fc Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 6 Feb 2024 15:36:13 -0500
Subject: [PATCH 1/2] feat(v8/ember): Remove deprecated exports

---
 packages/ember/addon/index.ts         | 11 -----------
 packages/ember/addon/types.ts         |  6 ++----
 packages/ember/tests/helpers/utils.ts |  7 +++----
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/packages/ember/addon/index.ts b/packages/ember/addon/index.ts
index b3ccfffa404f..f403df54284e 100644
--- a/packages/ember/addon/index.ts
+++ b/packages/ember/addon/index.ts
@@ -9,7 +9,6 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core
 import { GLOBAL_OBJ } from '@sentry/utils';
 import Ember from 'ember';
 
-import type { Transaction } from '@sentry/types';
 import type { EmberSentryConfig, GlobalConfig, OwnConfig } from './types';
 
 function _getSentryInitConfig(): EmberSentryConfig['sentry'] {
@@ -60,16 +59,6 @@ export function init(_runtimeConfig?: BrowserOptions): void {
   }
 }
 
-/**
- * Grabs active transaction off scope.
- *
- * @deprecated You should not rely on the transaction, but just use `startSpan()` APIs instead.
- */
-export const getActiveTransaction = (): Transaction | undefined => {
-  // eslint-disable-next-line deprecation/deprecation
-  return Sentry.getCurrentScope().getTransaction();
-};
-
 type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Route;
 
 export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
diff --git a/packages/ember/addon/types.ts b/packages/ember/addon/types.ts
index bf333740ee5b..1b6825442be1 100644
--- a/packages/ember/addon/types.ts
+++ b/packages/ember/addon/types.ts
@@ -1,9 +1,7 @@
-import type { BrowserOptions, BrowserTracing, browserTracingIntegration } from '@sentry/browser';
+import type { BrowserOptions, browserTracingIntegration } from '@sentry/browser';
 import type { Transaction, TransactionContext } from '@sentry/types';
 
-type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0] &
-  // eslint-disable-next-line deprecation/deprecation
-  ConstructorParameters<typeof BrowserTracing>[0];
+type BrowserTracingOptions = Parameters<typeof browserTracingIntegration>[0];
 
 export type EmberSentryConfig = {
   sentry: BrowserOptions & { browserTracingOptions?: BrowserTracingOptions };
diff --git a/packages/ember/tests/helpers/utils.ts b/packages/ember/tests/helpers/utils.ts
index 0be2c3d2f422..7e7715fc57f5 100644
--- a/packages/ember/tests/helpers/utils.ts
+++ b/packages/ember/tests/helpers/utils.ts
@@ -72,13 +72,12 @@ export function assertSentryTransactions(
       return !op?.startsWith('ui.ember.runloop.') && !op?.startsWith('ui.long-task');
     })
     .map(s => {
-      // eslint-disable-next-line deprecation/deprecation
-      return `${s.op} | ${spanToJSON(s).description}`;
+      const spanJson = spanToJSON(s);
+      return `${spanJson.op} | ${spanJson.description}`;
     });
 
   assert.true(
-    // eslint-disable-next-line deprecation/deprecation
-    spans.some(span => span.op?.startsWith('ui.ember.runloop.')),
+    spans.some(span => spanToJSON(span).op?.startsWith('ui.ember.runloop.')),
     'it captures runloop spans',
   );
   assert.deepEqual(filteredSpans, options.spans, 'Has correct spans');

From 4e5a54b8a5350e96350901ca0b93e6308d6030e1 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 6 Feb 2024 18:28:57 -0500
Subject: [PATCH 2/2] don't use old API

---
 .../addon/instance-initializers/sentry-performance.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts
index f4c47998ea90..5b7ee172542a 100644
--- a/packages/ember/addon/instance-initializers/sentry-performance.ts
+++ b/packages/ember/addon/instance-initializers/sentry-performance.ts
@@ -109,11 +109,7 @@ export function _instrumentEmberRouter(
     return;
   }
 
-  if (
-    url &&
-    browserTracingOptions.startTransactionOnPageLoad !== false &&
-    browserTracingOptions.instrumentPageLoad !== false
-  ) {
+  if (url && browserTracingOptions.instrumentPageLoad !== false) {
     const routeInfo = routerService.recognize(url);
     Sentry.startBrowserTracingPageLoadSpan(client, {
       name: `route:${routeInfo.name}`,
@@ -136,10 +132,7 @@ export function _instrumentEmberRouter(
     getBackburner().off('end', finishActiveTransaction);
   };
 
-  if (
-    browserTracingOptions.startTransactionOnLocationChange === false &&
-    browserTracingOptions.instrumentNavigation === false
-  ) {
+  if (browserTracingOptions.instrumentNavigation === false) {
     return;
   }