From 88ff08b048b561106d51371b3c5b5c794f7f5685 Mon Sep 17 00:00:00 2001 From: k-fish Date: Mon, 11 Jan 2021 10:17:51 -0800 Subject: [PATCH 1/2] fix(ember): Fix rootURL breaking route recognition Mentioned in #2977, route recognition needs the url to be correctly formatted. Since there are different location types, using formatURL should get the correct URL out for use in recognition. --- .../ember/addon/instance-initializers/sentry-performance.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts index 7f42c44cc538..6f0f01a9535d 100644 --- a/packages/ember/addon/instance-initializers/sentry-performance.ts +++ b/packages/ember/addon/instance-initializers/sentry-performance.ts @@ -41,7 +41,7 @@ export function _instrumentEmberRouter( let activeTransaction: Transaction; let transitionSpan: Span; - const url = location && location.getURL && location.getURL(); + const url = location && location.getURL && location.formatURL() && location.formatURL(location.getURL()); if (macroCondition(isTesting())) { routerService._sentryInstrumented = true; From 44f397ad4aaa24b2e41f8cd53d79ae98b0fc8455 Mon Sep 17 00:00:00 2001 From: k-fish Date: Tue, 12 Jan 2021 11:38:33 -0800 Subject: [PATCH 2/2] Update packages/ember/addon/instance-initializers/sentry-performance.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kamil Ogórek --- .../ember/addon/instance-initializers/sentry-performance.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts index 6f0f01a9535d..340a1b71a1d0 100644 --- a/packages/ember/addon/instance-initializers/sentry-performance.ts +++ b/packages/ember/addon/instance-initializers/sentry-performance.ts @@ -41,7 +41,7 @@ export function _instrumentEmberRouter( let activeTransaction: Transaction; let transitionSpan: Span; - const url = location && location.getURL && location.formatURL() && location.formatURL(location.getURL()); + const url = location && location.getURL && location.formatURL && location.formatURL(location.getURL()); if (macroCondition(isTesting())) { routerService._sentryInstrumented = true;