Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 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 number Diff line number Diff line change
@@ -0,0 +1,9 @@
import * as Sentry from '@sentry/browser';
import { viewHierarchyIntegration } from '@sentry/browser';

window.Sentry = Sentry;

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
integrations: [viewHierarchyIntegration()],
});
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
throw new Error('Some error');
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<title></title>
</head>
<body>
<h1>Some title</h1>
<p>Some text</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { expect } from '@playwright/test';
import type { ViewHierarchyData } from '@sentry/core';
import { sentryTest } from '../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, envelopeParser } from '../../../utils/helpers';

sentryTest('Captures view hierarchy as attachment', async ({ getLocalTestUrl, page }) => {
const url = await getLocalTestUrl({ testDir: __dirname });

const [, events] = await Promise.all([
page.goto(url),
getMultipleSentryEnvelopeRequests<ViewHierarchyData>(
page,
1,
{},
req => envelopeParser(req)?.[4] as ViewHierarchyData,
),
]);
Comment thread
timfish marked this conversation as resolved.

expect(events).toHaveLength(1);
const event: ViewHierarchyData = events[0];

expect(event.rendering_system).toBe('DOM');
expect(event.positioning).toBe('absolute');
expect(event.windows).toHaveLength(2);
expect(event.windows[0].type).toBe('h1');
expect(event.windows[0].visible).toBe(true);
expect(event.windows[0].alpha).toBe(1);
expect(event.windows[0].children).toHaveLength(0);

expect(event.windows[1].type).toBe('p');
expect(event.windows[1].visible).toBe(true);
expect(event.windows[1].alpha).toBe(1);
expect(event.windows[1].children).toHaveLength(0);
});
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ interface Env {
}

const myWorker = {
async fetch(request: Request) {
async fetch(_: Request) {
return new Response('Hello from another worker!');
},
};
Expand Down
1 change: 1 addition & 0 deletions packages/browser/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export { reportingObserverIntegration } from './integrations/reportingobserver';
export { httpClientIntegration } from './integrations/httpclient';
export { contextLinesIntegration } from './integrations/contextlines';
export { graphqlClientIntegration } from './integrations/graphqlClient';
export { viewHierarchyIntegration } from './integrations/view-hierarchy';

export {
captureConsoleIntegration,
Expand Down
132 changes: 132 additions & 0 deletions packages/browser/src/integrations/view-hierarchy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
import type { Attachment, Event, EventHint, ViewHierarchyData, ViewHierarchyWindow } from '@sentry/core';
import { defineIntegration, getComponentName } from '@sentry/core';
import { WINDOW } from '../helpers';

interface OnElementArgs {
/**
* The element being processed.
*/
element: HTMLElement;
/**
* Lowercase tag name of the element.
*/
tagName: string;
/**
* The component name of the element.
*/
componentName?: string;
}

interface Options {
/**
* Whether to attach the view hierarchy to the event.
*
* Default: Always attach.
*/
shouldAttach?: (event: Event, hint: EventHint) => boolean;

/**
* A function that returns the root element to start walking the DOM from.
*
* Default: `window.document.body`
*/
rootElement?: () => HTMLElement | undefined;

/**
* Called for each HTMLElement as we walk the DOM.
*
* Return an object to include the element with any additional properties.
* Return `skip` to exclude the element and its children.
* Return `children` to skip the element but include its children.
*/
onElement?: (prop: OnElementArgs) => Record<string, string | number | boolean> | 'skip' | 'children';
}

/**
* An integration to include a view hierarchy attachment which contains the DOM.
*/
export const viewHierarchyIntegration = defineIntegration((options: Options = {}) => {
const skipHtmlTags = ['script'];

/** Walk an element */
function walk(element: HTMLElement, windows: ViewHierarchyWindow[]): void {
// With Web Components, we need to walk into shadow DOMs
const children = 'shadowRoot' in element && element.shadowRoot ? element.shadowRoot.children : element.children;

for (const child of children) {
if (!(child instanceof HTMLElement)) {
continue;
}

const componentName = getComponentName(child) || undefined;
Comment thread
sentry[bot] marked this conversation as resolved.
Outdated
const tagName = child.tagName.toLowerCase();

if (skipHtmlTags.includes(tagName)) {
continue;
}

const result = options.onElement?.({ element: child, componentName, tagName }) || {};

if (result === 'skip') {
continue;
}

// Skip this element but include its children
if (result === 'children') {
walk(child, windows);
continue;
}

const { x, y, width, height } = child.getBoundingClientRect();

const window: ViewHierarchyWindow = {
identifier: (child.id || undefined) as string,
type: componentName || tagName,
visible: true,
alpha: 1,
height,
width,
x,
y,
...result,
};

const children: ViewHierarchyWindow[] = [];
window.children = children;
Comment thread
timfish marked this conversation as resolved.

// Recursively walk the children
walk(child, window.children);

windows.push(window);
}
}

return {
name: 'ViewHierarchy',
processEvent: (event, hint) => {
if (options.shouldAttach?.(event, hint) === false) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: Let's only run this event processor for error events. I checked and view hierarchy is only shown on issue detail pages. Mobile SDKs also only add view hierarchy attachments to errors.

return event;
}
Comment thread
cursor[bot] marked this conversation as resolved.

const root: ViewHierarchyData = {
rendering_system: 'DOM',
positioning: 'absolute',
windows: [],
};

walk(options.rootElement?.() || WINDOW.document.body, root.windows);
Comment thread
sentry[bot] marked this conversation as resolved.
Comment thread
cursor[bot] marked this conversation as resolved.

const attachment: Attachment = {
filename: 'view-hierarchy.json',
attachmentType: 'event.view_hierarchy',
contentType: 'application/json',
data: JSON.stringify(root),
};

hint.attachments = hint.attachments || [];
hint.attachments.push(attachment);

return event;
},
};
});
1 change: 1 addition & 0 deletions packages/core/src/types-hoist/view-hierarchy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export type ViewHierarchyWindow = {

export type ViewHierarchyData = {
rendering_system: string;
positioning?: 'absolute' | 'relative';
windows: ViewHierarchyWindow[];
};
Loading