Skip to content

ref(replay): Refactor extractDomNodes stepper strategy into extractDomNodes.tsx #80810

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.

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
Nov 15, 2024
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 number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Timeline from 'sentry/components/timeline';
import {Tooltip} from 'sentry/components/tooltip';
import {t} from 'sentry/locale';
import {space} from 'sentry/styles/space';
import type {Extraction} from 'sentry/utils/replays/extractHtml';
import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
import {getReplayDiffOffsetsFromFrame} from 'sentry/utils/replays/getDiffTimestamps';
import getFrameDetails from 'sentry/utils/replays/getFrameDetails';
import type ReplayReader from 'sentry/utils/replays/replayReader';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type {Mirror} from '@sentry-internal/rrweb-snapshot';

import type {ReplayFrame} from 'sentry/utils/replays/types';
import {getNodeIds} from 'sentry/utils/replays/types';
import constructSelector from 'sentry/views/replays/deadRageClick/constructSelector';

export type Extraction = {
Expand All @@ -10,7 +11,27 @@ export type Extraction = {
timestamp: number;
};

export default function extractHtmlAndSelector(
const extractDomNodes = {
shouldVisitFrame: frame => {
const nodeIds = getNodeIds(frame);
return nodeIds.filter(nodeId => nodeId !== -1).length > 0;
},
onVisitFrame: (frame, collection, replayer) => {
const mirror = replayer.getMirror();
const nodeIds = getNodeIds(frame);
const {html, selectors} = extractHtmlAndSelector((nodeIds ?? []) as number[], mirror);
collection.set(frame as ReplayFrame, {
frame,
html,
selectors,
timestamp: frame.timestampMs,
});
},
};

export default extractDomNodes;

function extractHtmlAndSelector(
nodeIds: number[],
mirror: Mirror
): {html: string[]; selectors: Map<number, string>} {
Expand Down
6 changes: 2 additions & 4 deletions static/app/utils/replays/hooks/useExtractDomNodes.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useQuery, type UseQueryResult} from 'sentry/utils/queryClient';
import type {Extraction} from 'sentry/utils/replays/extractHtml';
import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
import type ReplayReader from 'sentry/utils/replays/replayReader';
import type {ReplayFrame} from 'sentry/utils/replays/types';

Expand All @@ -10,9 +10,7 @@ export default function useExtractDomNodes({
}): UseQueryResult<Map<ReplayFrame, Extraction>> {
return useQuery({
queryKey: ['getDomNodes', replay],
queryFn: () => {
return replay?.getExtractDomNodes();
},
queryFn: () => replay?.getExtractDomNodes(),
enabled: Boolean(replay),
gcTime: Infinity,
});
Expand Down
22 changes: 1 addition & 21 deletions static/app/utils/replays/replayReader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {defined} from 'sentry/utils';
import domId from 'sentry/utils/domId';
import localStorageWrapper from 'sentry/utils/localStorage';
import clamp from 'sentry/utils/number/clamp';
import extractHtmlandSelector from 'sentry/utils/replays/extractHtml';
import extractDomNodes from 'sentry/utils/replays/extractDomNodes';
import hydrateBreadcrumbs, {
replayInitBreadcrumb,
} from 'sentry/utils/replays/hydrateBreadcrumbs';
Expand All @@ -28,7 +28,6 @@ import type {
MemoryFrame,
OptionFrame,
RecordingFrame,
ReplayFrame,
serializedNodeWithId,
SlowClickFrame,
SpanFrame,
Expand All @@ -38,7 +37,6 @@ import type {
import {
BreadcrumbCategories,
EventType,
getNodeIds,
IncrementalSource,
isCLSFrame,
isConsoleFrame,
Expand Down Expand Up @@ -149,24 +147,6 @@ function removeDuplicateNavCrumbs(
return otherBreadcrumbFrames.concat(uniqueNavCrumbs);
}

const extractDomNodes = {
shouldVisitFrame: frame => {
const nodeIds = getNodeIds(frame);
return nodeIds.filter(nodeId => nodeId !== -1).length > 0;
},
onVisitFrame: (frame, collection, replayer) => {
const mirror = replayer.getMirror();
const nodeIds = getNodeIds(frame);
const {html, selectors} = extractHtmlandSelector((nodeIds ?? []) as number[], mirror);
collection.set(frame as ReplayFrame, {
frame,
html,
selectors,
timestamp: frame.timestampMs,
});
},
};

export default class ReplayReader {
static factory({
attachments,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import classNames from 'classnames';

import BreadcrumbItem from 'sentry/components/replays/breadcrumbs/breadcrumbItem';
import {useReplayContext} from 'sentry/components/replays/replayContext';
import type {Extraction} from 'sentry/utils/replays/extractHtml';
import type {Extraction} from 'sentry/utils/replays/extractDomNodes';
import useCrumbHandlers from 'sentry/utils/replays/hooks/useCrumbHandlers';
import useCurrentHoverTime from 'sentry/utils/replays/playback/providers/useCurrentHoverTime';
import type {ReplayFrame} from 'sentry/utils/replays/types';
Expand Down
Loading