Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,13 @@ test('sends a pageload transaction with a parameterized URL', async ({ page }) =
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand DownExpand Up@@ -43,6 +50,13 @@ test('sends a navigation transaction with a parameterized URL', async ({ page })
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -75,6 +89,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'pageload',
origin: 'auto.pageload.ember',
data: {
'sentry.origin': 'auto.pageload.ember',
'sentry.source': 'route',
'url.template': '/',
'url.path': '/',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/$/),
},
},
},
transaction: 'route:index',
Expand All@@ -88,6 +109,13 @@ test('sends a navigation transaction even if the pageload span is still active',
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/tracing',
'url.path': '/tracing',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/tracing$/),
},
},
},
transaction: 'route:tracing',
Expand DownExpand Up@@ -124,6 +152,13 @@ test('captures correct spans for navigation', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.ember',
data: {
'sentry.origin': 'auto.navigation.ember',
'sentry.source': 'route',
'url.template': '/slow-loading-route',
'url.path': '/slow-loading-route',
'url.full': expect.stringMatching(/^https?:\/\/localhost:\d+\/slow-loading-route$/),
},
},
},
transaction: 'route:slow-loading-route.index',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,11 +5,22 @@ import type {
startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startInactiveSpan } from '@sentry/browser';
import {
getAbsoluteUrl,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
import type { Client, Span } from '@sentry/core';
import type { EmberRouterMain } from '../types';
import { getBackburner } from './performance';

const URL_FULL = 'url.full';
const URL_PATH = 'url.path';
const URL_TEMPLATE = 'url.template';

type TransitionWithIntent = Transition & { intent?: { url?: string } };

export function instrumentEmberAppInstanceForPerformance(
client: Client,
appInstance: ApplicationInstance,
Expand All@@ -22,6 +33,7 @@ export function instrumentEmberAppInstanceForPerformance(
let routerService = appInstance.lookup('service:router') as RouterService & {
externalRouter?: RouterService;
_hasMountedSentryPerformanceRouting?: boolean;
currentURL?: string;
};

if (routerService.externalRouter) {
Expand DownExpand Up@@ -60,6 +72,52 @@ function getTransitionInformation(
};
}

function getUrlPathFromEmberLocation(url: string): string {
if (!url) {
return '/';
}

const withoutQuery = url.split('?')[0] ?? url;

if (withoutQuery.includes('#')) {
const hashPart = withoutQuery.substring(withoutQuery.indexOf('#') + 1);
return hashPart.startsWith('/') ? hashPart : `/${hashPart}`;
}
Comment thread
cursor[bot] marked this conversation as resolved.

return withoutQuery.startsWith('/') ? withoutQuery : `/${withoutQuery}`;
}

function buildUrlTemplate(path: string, params: Record<string, unknown> = {}): string {
let template = path;

const paramEntries = Object.entries(params)
.filter((entry): entry is [string, string] => typeof entry[1] === 'string' && entry[1].length > 0)
.sort(([, a], [, b]) => b.length - a.length);

for (const [key, value] of paramEntries) {
template = template.replace(`/${value}`, `/:${key}`);
Comment thread
cursor[bot] marked this conversation as resolved.
Comment thread
sentry[bot] marked this conversation as resolved.
}

return template;
}

// Only exported for testing
export function _getRouteUrlAttributes(
url: string,
params: Record<string, unknown> = {},
fullUrl: string = url,
): Record<string, string> {
const path = getUrlPathFromEmberLocation(url);

// `url.full` is derived from the unstripped URL so that hash-location apps keep their `#/...`
// fragment (e.g. `https://host/#/tracing`), which would otherwise be lost by `getUrlPathFromEmberLocation`.
return {
[URL_PATH]: path,
[URL_FULL]: getAbsoluteUrl(fullUrl),
[URL_TEMPLATE]: buildUrlTemplate(path, params),
Comment thread
cursor[bot] marked this conversation as resolved.
};
}

// Only exported for testing
export function _getLocationURL(location: EmberRouterMain['location']): string {
if (!location?.getURL || !location?.formatURL) {
Expand All@@ -76,7 +134,7 @@ export function _getLocationURL(location: EmberRouterMain['location']): string {

function _instrumentEmberRouter(
client: Client,
routerService: RouterService,
routerService: RouterService & { currentURL?: string },
routerMain: EmberRouterMain,
config: { disableRunloopPerformance?: boolean; instrumentPageLoad?: boolean; instrumentNavigation?: boolean },
startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
Expand All@@ -96,6 +154,7 @@ function _instrumentEmberRouter(
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
..._getRouteUrlAttributes(url, routeInfo.params),
Comment thread
sentry[bot] marked this conversation as resolved.
url,
toRoute: routeInfo.name,
},
Expand DownExpand Up@@ -124,11 +183,19 @@ function _instrumentEmberRouter(

activeRootSpan?.end();

// Only `intent.url` reliably reflects the *destination* URL at `routeWillChange` time. The
// router's location still points at the current (pre-transition) route here, so falling back to
// it would tag the navigation span with the previous route's `url.*` attributes. When we don't
// have a trustworthy target URL, we omit them and let `routeDidChange` set them from `currentURL`.
const targetUrl = (transition as TransitionWithIntent).intent?.url;
const urlAttributes = targetUrl ? _getRouteUrlAttributes(targetUrl, transition.to?.params) : {};

activeRootSpan = startBrowserTracingNavigationSpan(client, {
name: `route:${toRoute}`,
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
...urlAttributes,
Comment thread
cursor[bot] marked this conversation as resolved.
fromRoute,
toRoute,
},
Expand All@@ -150,6 +217,15 @@ function _instrumentEmberRouter(
}
transitionSpan.end();

const url = routerService.currentURL ?? _getLocationURL(location);
if (url) {
const routeInfo = routerService.recognize(url);
// `currentURL` is the normalized route path and never includes the hash fragment, so we source
// `url.full` from the location URL (which preserves `#/...` for hash-location apps) when available.
const fullUrl = _getLocationURL(location) || url;
activeRootSpan.setAttributes(_getRouteUrlAttributes(url, routeInfo.params ?? transition.to?.params, fullUrl));
}

if (disableRunloopPerformance) {
activeRootSpan.end();
return;
Expand Down
35 changes: 34 additions & 1 deletion packages/ember/tests/unit/instrument-router-location-test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import type { EmberRouterMain } from '@sentry/ember/addon/types';
import { _getLocationURL } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { _getLocationURL, _getRouteUrlAttributes } from '@sentry/ember/utils/instrumentEmberAppInstanceForPerformance';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import type { SentryTestContext } from '../helpers/setup-sentry';
Expand DownExpand Up@@ -97,4 +97,37 @@ module('Unit | Utility | instrument-router-location', function (hooks) {
const result = _getLocationURL(mockLocation);
assert.strictEqual(result, '', 'Should return empty string when formatURL is not available');
});

test('_getRouteUrlAttributes handles history location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/tracing'), 'url.full includes the path');
});

test('_getRouteUrlAttributes parameterizes dynamic segments', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/users/123', { user_id: '123' });

assert.strictEqual(result['url.path'], '/users/123');
assert.strictEqual(result['url.template'], '/users/:user_id');
assert.ok(result['url.full']?.includes('/users/123'), 'url.full includes the path');
});

test('_getRouteUrlAttributes handles hash location paths', function (this: SentryTestContext, assert) {
const result = _getRouteUrlAttributes('/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment');
});

test('_getRouteUrlAttributes sources url.full from an explicit fullUrl', function (this: SentryTestContext, assert) {
// Mirrors `routeDidChange`, where the route path (`currentURL`) has no hash but the location URL does.
const result = _getRouteUrlAttributes('/tracing', {}, '/#/tracing');

assert.strictEqual(result['url.path'], '/tracing');
assert.strictEqual(result['url.template'], '/tracing');
assert.ok(result['url.full']?.includes('/#/tracing'), 'url.full preserves the hash fragment from fullUrl');
});
});
Loading