Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mydea committed Jan 30, 2024
1 parent 87b4bf0 commit 8fb1500
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions packages/ember/addon/instance-initializers/sentry-performance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,13 @@ export function _instrumentEmberRouter(
let activeRootSpan: Span | undefined;
let transitionSpan: Span | undefined;

// Maintaining backwards compatibility with config.browserTracingOptions, but passing it with Sentry options is preferred.
const browserTracingOptions = config.browserTracingOptions || config.sentry.browserTracingOptions || {};
const url = getLocationURL(location);

if (url) {
if (url && browserTracingOptions.startTransactionOnPageLoad !== false) {
const routeInfo = routerService.recognize(url);
Sentry.startBrowserTracingNavigationSpan({
Sentry.startBrowserTracingPageLoadSpan({
name: `route:${routeInfo.name}`,
op: 'pageload',
origin: 'auto.pageload.ember',
Expand All @@ -124,6 +126,10 @@ export function _instrumentEmberRouter(
getBackburner().off('end', finishActiveTransaction);
};

if (browserTracingOptions.startTransactionOnLocationChange === false) {
return;
}

routerService.on('routeWillChange', (transition: Transition) => {
const { fromRoute, toRoute } = getTransitionInformation(transition, routerService);
activeRootSpan?.end();
Expand Down Expand Up @@ -405,11 +411,10 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
const browserTracing = browserTracingIntegration({
idleTimeout,
...browserTracingOptions,
instrumentNavigation: false,
instrumentPageLoad: false,
});

Sentry.disableDefaultBrowserTracingNavigationSpan();
Sentry.disableDefaultBrowserTracingPageLoadSpan();

const client = Sentry.getClient<BrowserClient>();

const isAlreadyInitialized = macroCondition(isTesting()) ? !!client?.getIntegrationByName('BrowserTracing') : false;
Expand Down

0 comments on commit 8fb1500

Please sign in to comment.