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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
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@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest(
'creates a pageload and navigation root spans each with multiple navigation.redirect childspans',
Expand DownExpand Up@@ -57,6 +58,8 @@ sentryTest(
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: expect.any(String),
[URL_PATH]: expect.any(String),
},
description: expect.stringContaining('/sub-page-redirect-'),
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
} from '@sentry/core';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

sentryTest('creates a pageload root span with navigation.redirect childspan', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
Expand DownExpand Up@@ -53,6 +54,8 @@ sentryTest('creates a pageload root span with navigation.redirect childspan', as
'sentry.op': 'navigation.redirect',
'sentry.origin': 'auto.navigation.browser',
'sentry.source': 'url',
[URL_FULL]: 'http://sentry-test.io/sub-page',
[URL_PATH]: '/sub-page',
},
description: '/sub-page',
op: 'navigation.redirect',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import { SENTRY_TRACE_LIFECYCLE } from '@sentry/conventions/attributes';
import { SENTRY_TRACE_LIFECYCLE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import {
Expand DownExpand Up@@ -92,7 +92,11 @@ sentryTest('starts a streamed navigation span on page navigation', async ({ brow
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ import {
SENTRY_SDK_NAME,
SENTRY_SDK_VERSION,
SENTRY_TRACE_LIFECYCLE,
URL_FULL,
URL_PATH,
} from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
Expand DownExpand Up@@ -83,7 +85,11 @@ sentryTest(
type: 'string',
value: expect.any(String),
},
'url.full': {
[URL_FULL]: {
type: 'string',
value: expect.any(String),
},
[URL_PATH]: {
type: 'string',
value: expect.any(String),
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ test('captures a pageload transaction', async ({ page }) => {
'sentry.origin': 'auto.pageload.browser',
'sentry.sample_rate': 1,
'sentry.source': 'url',
'url.full': 'http://localhost:3030/',
'url.path': '/',
}),
op: 'pageload',
origin: 'auto.pageload.browser',
Expand DownExpand Up@@ -83,6 +85,10 @@ test('captures a navigation transaction', async ({ page }) => {
trace: {
op: 'navigation',
origin: 'auto.navigation.browser',
data: expect.objectContaining({
'url.full': 'http://localhost:3030/#navigation-target',
'url.path': '/',
}),
},
},
transaction: '/',
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ test('Captures a pageload transaction', async ({ page }) => {
'performance.activationStart': expect.any(Number),
'lcp.renderTime': expect.any(Number),
'lcp.loadTime': expect.any(Number),
'url.full': 'http://localhost:3030/',
'url.path': '/',
},
op: 'pageload',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
1 change: 1 addition & 0 deletions packages/browser/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@
},
"dependencies": {
"@sentry/browser-utils": "10.64.0",
"@sentry/conventions": "^0.15.1",
"@sentry/feedback": "10.64.0",
"@sentry/replay": "10.64.0",
"@sentry/replay-canvas": "10.64.0",
Expand Down
41 changes: 29 additions & 12 deletions packages/browser/src/tracing/browserTracingIntegration.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ import {
GLOBAL_OBJ,
hasSpansEnabled,
hasSpanStreamingEnabled,
isURLObjectRelative,
parseStringToURLObject,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
Expand DownExpand Up@@ -51,6 +52,7 @@ import { WEB_VITALS_INTEGRATION_NAME, webVitalsIntegration } from '../integratio
import { registerBackgroundTabDetection } from './backgroundtab';
import { linkTraces } from './linkedTraces';
import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';

Expand DownExpand Up@@ -416,23 +418,32 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
let _pageloadSpan: Span | undefined;

/** Create routing idle transaction. */
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true): void {
function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions, makeActive = true, url?: string): void {
const isPageloadSpan = startSpanOptions.op === 'pageload';
Comment thread
sentry[bot] marked this conversation as resolved.

const initialSpanName = startSpanOptions.name;
const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
? beforeStartSpan(startSpanOptions)
: startSpanOptions;

const attributes = finalStartSpanOptions.attributes || {};
// For navigations, `url` is the destination URL, so we use it to reflect the post-navigation location.
// For pageloads (and manual navigation spans without a URL) we fall back to the current location.
const urlObject = parseStringToURLObject(url || getLocationHref());

const attributes = {
...(urlObject?.pathname && { [URL_PATH]: urlObject.pathname }),
...(urlObject && !isURLObjectRelative(urlObject) && { [URL_FULL]: urlObject.href }),
...finalStartSpanOptions.attributes,
};
Comment thread
Lms24 marked this conversation as resolved.

// If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
// it is because `beforeStartSpan` set a custom name. Therefore we set the source to 'custom'.
if (initialSpanName !== finalStartSpanOptions.name) {
attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
finalStartSpanOptions.attributes = attributes;
}

finalStartSpanOptions.attributes = attributes;

if (!makeActive) {
// We want to ensure this has 0s duration
const now = dateTimestampInSeconds();
Expand DownExpand Up@@ -563,6 +574,7 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
...startSpanOptions,
},
false,
navigationOptions.url,
);
return;
}
Expand DownExpand Up@@ -593,13 +605,18 @@ export const browserTracingIntegration = ((options: Partial<BrowserTracingOption
normalizedRequest: undefined,
});

_createRouteSpan(client, {
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
});
_createRouteSpan(
client,
{
op: 'navigation',
...startSpanOptions,
// Navigation starts a new trace and is NOT parented under any active interaction (e.g. ui.action.click)
parentSpan: null,
forceTransaction: true,
},
true,
navigationOptions?.url,
);
});

client.on('startPageLoadSpan', (startSpanOptions, traceOptions = {}) => {
Expand DownExpand Up@@ -779,8 +796,8 @@ export function startBrowserTracingNavigationSpan(
options?: { url?: string; isRedirect?: boolean },
): Span | undefined {
const { url, isRedirect } = options || {};
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect });
client.emit('startNavigationSpan', spanOptions, { isRedirect });
client.emit('beforeStartNavigationSpan', spanOptions, { isRedirect, url });
client.emit('startNavigationSpan', spanOptions, { isRedirect, url });

const scope = getCurrentScope();
scope.setTransactionName(spanOptions.name);
Expand Down
29 changes: 28 additions & 1 deletion packages/browser/test/tracing/browserTracingIntegration.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ import {
} from '../../src/tracing/browserTracingIntegration';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/linkedTraces';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';

const oldTextEncoder = global.window.TextEncoder;
const oldTextDecoder = global.window.TextDecoder;
Expand DownExpand Up@@ -65,11 +66,17 @@ describe('browserTracingIntegration', () => {
getCurrentScope().clear();
getIsolationScope().clear();
getCurrentScope().setClient(undefined);
document.head.innerHTML = '';

// Reset document and location to a fresh JSDOM for every test. `getLocationHref()` reads
// `WINDOW.document.location.href`, so leaving `document` bound to a shared instance leaks URL state
// (e.g. `/test`) from `pushState` in earlier tests into later ones. `history` must stay bound to the
// shared instance because the history instrumentation patches it once globally on `client.init()`.
const dom = new JSDOM(undefined, { url: 'https://example.com/' });
Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });

document.head.innerHTML = '';

// We want to suppress the "Multiple browserTracingIntegration instances are not supported." warnings
vi.spyOn(console, 'warn').mockImplementation(() => {});
});
Expand DownExpand Up@@ -174,6 +181,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -258,6 +267,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -286,6 +297,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span?.spanContext().traceId}-${span?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -325,6 +338,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test2',
[URL_PATH]: '/test2',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: `${span2?.spanContext().traceId}-${span2?.spanContext().spanId}-1`,
},
links: [
Expand DownExpand Up@@ -366,6 +381,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -394,6 +411,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation.redirect',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
[URL_FULL]: 'https://example.com/test',
[URL_PATH]: '/test',
},
description: '/test',
op: 'navigation.redirect',
Expand DownExpand Up@@ -456,6 +475,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand DownExpand Up@@ -492,6 +513,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand DownExpand Up@@ -733,6 +756,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE]: expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-1/),
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
},
links: [
{
Expand DownExpand Up@@ -785,6 +810,8 @@ describe('browserTracingIntegration', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
[URL_FULL]: 'https://example.com/',
[URL_PATH]: '/',
Comment thread
cursor[bot] marked this conversation as resolved.
testy: 'yes',
},
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/client.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -815,7 +815,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'beforeStartNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand All@@ -824,7 +824,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
*/
public on(
hook: 'startNavigationSpan',
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean }) => void,
callback: (options: StartSpanOptions, navigationOptions?: { isRedirect?: boolean; url?: string }) => void,
): () => void;

/**
Expand DownExpand Up@@ -1100,7 +1100,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'beforeStartNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand All@@ -1109,7 +1109,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
public emit(
hook: 'startNavigationSpan',
options: StartSpanOptions,
navigationOptions?: { isRedirect?: boolean },
navigationOptions?: { isRedirect?: boolean; url?: string },
): void;

/**
Expand Down
Loading