Skip to content

ref(tracing): support browser.request span for reparenting #77176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2024
Merged

ref(tracing): support browser.request span for reparenting #77176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44b5cef
ref(tracing): support browser.request span for reparenting
JonasBa Sep 9, 2024
d560ab1
ref: use op instead of description
JonasBa Sep 10, 2024
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
77 changes: 40 additions & 37 deletions static/app/views/performance/newTraceDetails/traceModels/traceTree.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2857,47 +2857,50 @@ describe('TraceTree', () => {
expect(serverHandlerTransaction.parent).toBe(pageloadTransaction);
});
describe('expanded', () => {
it('server handler transaction becomes a child of browser request span if present', async () => {
const tree: TraceTree = TraceTree.FromTrace(
makeTrace({
transactions: [
makeTransaction({
transaction: 'SSR',
event_id: 'ssr',
project_slug: 'js',
['transaction.op']: 'http.server',
children: [
makeTransaction({
transaction: 'pageload',
['transaction.op']: 'pageload',
}),
],
}),
],
}),
null,
null
);
it.each([['browser'], ['browser.request']])(
'server handler transaction becomes a child of %s span if present',
async span_op => {
const tree: TraceTree = TraceTree.FromTrace(
makeTrace({
transactions: [
makeTransaction({
transaction: 'SSR',
event_id: 'ssr',
project_slug: 'js',
['transaction.op']: 'http.server',
children: [
makeTransaction({
transaction: 'pageload',
['transaction.op']: 'pageload',
}),
],
}),
],
}),
null,
null
);

MockApiClient.addMockResponse({
url: '/organizations/org-slug/events/js:ssr/?averageColumn=span.self_time&averageColumn=span.duration',
method: 'GET',
body: makeEvent({}, [makeSpan({description: 'request', op: 'browser'})]),
});
MockApiClient.addMockResponse({
url: '/organizations/org-slug/events/js:ssr/?averageColumn=span.self_time&averageColumn=span.duration',
method: 'GET',
body: makeEvent({}, [makeSpan({description: 'request', op: span_op})]),
});

tree.zoomIn(tree.list[1], true, {
api: new MockApiClient(),
organization: OrganizationFixture(),
});
tree.zoomIn(tree.list[1], true, {
api: new MockApiClient(),
organization: OrganizationFixture(),
});

await waitFor(() => tree.list.length === 4);
const browserRequestSpan = tree.list[1].children[0];
const ssrTransaction = browserRequestSpan.children[0];
await waitFor(() => tree.list.length === 4);
const browserRequestSpan = tree.list[1].children[0];
const ssrTransaction = browserRequestSpan.children[0];

assertSpanNode(browserRequestSpan);
assertTransactionNode(ssrTransaction);
expect(ssrTransaction.value.transaction).toBe('SSR');
});
assertSpanNode(browserRequestSpan);
assertTransactionNode(ssrTransaction);
expect(ssrTransaction.value.transaction).toBe('SSR');
}
);
it('server handler transaction becomes a direct child if there is no matching browser request span', async () => {
const tree: TraceTree = TraceTree.FromTrace(
makeTrace({
Expand Down
6 changes: 5 additions & 1 deletion static/app/views/performance/newTraceDetails/traceModels/traceTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,11 @@ function isServerRequestHandlerTransactionNode(
}

function isBrowserRequestSpan(value: TraceTree.Span): boolean {
return value.op === 'browser' && value.description === 'request';
return (
// Adjust for SDK changes in https://github.com/getsentry/sentry-javascript/pull/13527
value.op === 'browser.request' ||
(value.op === 'browser' && value.description === 'request')
);
}

function getPageloadTransactionChildCount(
Expand Down
Loading