Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cherry-pick(#21839): chore: sort tracing actions by wall time

Browse source
This commit is contained in:
Pavel Feldman 2023-03-21 10:03:49 -07:00
parent 0646773e85
commit 39c3482980
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/dispatchers/dispatcher.ts
View file

@ -246,7 +246,7 @@ export class DispatcherConnection {
const sdkObject = dispatcher._object instanceof SdkObject ? dispatcher._object : undefined; const sdkObject = dispatcher._object instanceof SdkObject ? dispatcher._object : undefined;
const callMetadata: CallMetadata = { const callMetadata: CallMetadata = {
id: `call@${id}`, id: `call@${id}`,
wallTime: validMetadata.wallTime, wallTime: validMetadata.wallTime || Date.now(),
location: validMetadata.location, location: validMetadata.location,
apiName: validMetadata.apiName, apiName: validMetadata.apiName,
internal: validMetadata.internal, internal: validMetadata.internal,

1
packages/playwright-core/src/server/instrumentation.ts
View file

@ -108,6 +108,7 @@ export function serverSideCallMetadata(): CallMetadata {
id: '', id: '',
startTime: 0, startTime: 0,
endTime: 0, endTime: 0,
wallTime: Date.now(),
type: 'Internal', type: 'Internal',
method: '', method: '',
params: {}, params: {},

1
packages/playwright-core/src/server/recorder.ts
View file

@ -574,6 +574,7 @@ class ContextRecorder extends EventEmitter {
frameId: frame.guid, frameId: frame.guid,
startTime: monotonicTime(), startTime: monotonicTime(),
endTime: 0, endTime: 0,
wallTime: Date.now(),
type: 'Frame', type: 'Frame',
method: action, method: action,
params, params,

2
packages/playwright-core/src/server/trace/recorder/tracing.ts
View file

@ -489,7 +489,7 @@ function createBeforeActionTraceEvent(metadata: CallMetadata): trace.BeforeActio
class: metadata.type, class: metadata.type,
method: metadata.method, method: metadata.method,
params: metadata.params, params: metadata.params,
wallTime: metadata.wallTime || Date.now(), wallTime: metadata.wallTime,
pageId: metadata.pageId, pageId: metadata.pageId,
}; };
} }

1
packages/playwright-test/src/worker/testInfo.ts
View file

@ -249,7 +249,6 @@ export class TestInfoImpl implements TestInfo {
stepId, stepId,
...data, ...data,
location, location,
wallTime: Date.now(),
}; };
this._onStepBegin(payload); this._onStepBegin(payload);
return step; return step;

2
packages/protocol/src/callMetadata.ts
View file

@ -33,7 +33,7 @@ export type CallMetadata = {
// through the dispatcher, so is always excluded from inspector / tracing. // through the dispatcher, so is always excluded from inspector / tracing.
isServerSide?: boolean; isServerSide?: boolean;
// Client wall time. // Client wall time.
wallTime?: number; wallTime: number;
location?: { file: string, line?: number, column?: number }; location?: { file: string, line?: number, column?: number };
log: string[]; log: string[];
error?: SerializedError; error?: SerializedError;

7
packages/trace-viewer/src/ui/modelUtil.ts
View file

@ -66,9 +66,8 @@ export class MultiTraceModel {
this.events = ([] as EventTraceEvent[]).concat(...contexts.map(c => c.events)); this.events = ([] as EventTraceEvent[]).concat(...contexts.map(c => c.events));
this.hasSource = contexts.some(c => c.hasSource); this.hasSource = contexts.some(c => c.hasSource);
this.actions.sort((a1, a2) => (a1.startTime - a2.startTime) || (a1.endTime - a2.endTime));
this.events.sort((a1, a2) => a1.time - a2.time); this.events.sort((a1, a2) => a1.time - a2.time);
this.actions = dedupeActions(this.actions); this.actions = dedupeAndSortActions(this.actions);
this.sources = collectSources(this.actions); this.sources = collectSources(this.actions);
} }
} }
@ -85,7 +84,7 @@ function indexModel(context: ContextEntry) {
(event as any)[contextSymbol] = context; (event as any)[contextSymbol] = context;
} }
function dedupeActions(actions: ActionTraceEvent[]) { function dedupeAndSortActions(actions: ActionTraceEvent[]) {
const callActions = actions.filter(a => a.callId.startsWith('call@')); const callActions = actions.filter(a => a.callId.startsWith('call@'));
const expectActions = actions.filter(a => a.callId.startsWith('expect@')); const expectActions = actions.filter(a => a.callId.startsWith('expect@'));
@ -115,7 +114,7 @@ function dedupeActions(actions: ActionTraceEvent[]) {
result.push(expectAction); result.push(expectAction);
} }
result.sort((a1, a2) => a1.startTime - a2.startTime); result.sort((a1, a2) => (a1.wallTime - a2.wallTime));
for (let i = 1; i < result.length; ++i) for (let i = 1; i < result.length; ++i)
(result[i] as any)[prevInListSymbol] = result[i - 1]; (result[i] as any)[prevInListSymbol] = result[i - 1];
return result; return result;

2
packages/trace-viewer/src/ui/watchMode.tsx
View file

@ -413,7 +413,7 @@ const TestList: React.FC<{
render={treeItem => { render={treeItem => {
return <div className='hbox watch-mode-list-item'> return <div className='hbox watch-mode-list-item'>
<div className='watch-mode-list-item-title'>{treeItem.title}</div> <div className='watch-mode-list-item-title'>{treeItem.title}</div>
{!!treeItem.duration && <div className='watch-mode-list-item-time'>{msToString(treeItem.duration)}</div>} {!!treeItem.duration && treeItem.status !== 'skipped' && <div className='watch-mode-list-item-time'>{msToString(treeItem.duration)}</div>}
<Toolbar noMinHeight={true} noShadow={true}> <Toolbar noMinHeight={true} noShadow={true}>
<ToolbarButton icon='play' title='Run' onClick={() => runTreeItem(treeItem)} disabled={!!runningState}></ToolbarButton> <ToolbarButton icon='play' title='Run' onClick={() => runTreeItem(treeItem)} disabled={!!runningState}></ToolbarButton>
<ToolbarButton icon='go-to-file' title='Open in VS Code' onClick={() => sendMessageNoReply('open', { location: locationToOpen(treeItem) })}></ToolbarButton> <ToolbarButton icon='go-to-file' title='Open in VS Code' onClick={() => sendMessageNoReply('open', { location: locationToOpen(treeItem) })}></ToolbarButton>