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

chore: fix trace modernizer (#21286)

Browse source
This commit is contained in:
Pavel Feldman 2023-02-28 16:49:14 -08:00 committed by GitHub
parent b607c92651
commit 933332ad97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/trace-viewer/src/traceModel.ts
View file

@ -139,6 +139,7 @@ export class TraceModel {
return; return;
switch (event.type) { switch (event.type) {
case 'context-options': { case 'context-options': {
this._version = event.version;
contextEntry.browserName = event.browserName; contextEntry.browserName = event.browserName;
contextEntry.title = event.title; contextEntry.title = event.title;
contextEntry.platform = event.platform; contextEntry.platform = event.platform;
@ -189,7 +190,8 @@ export class TraceModel {
private _modernize(event: any): trace.TraceEvent { private _modernize(event: any): trace.TraceEvent {
if (this._version === undefined) if (this._version === undefined)
return event; return event;
for (let version = this._version; version < 3; ++version) const lastVersion: trace.VERSION = 4;
for (let version = this._version; version < lastVersion; ++version)
event = (this as any)[`_modernize_${version}_to_${version + 1}`].call(this, event); event = (this as any)[`_modernize_${version}_to_${version + 1}`].call(this, event);
return event; return event;
} }
@ -237,7 +239,7 @@ export class TraceModel {
} }
_modernize_3_to_4(event: traceV3.TraceEvent): trace.TraceEvent | null { _modernize_3_to_4(event: traceV3.TraceEvent): trace.TraceEvent | null {
if (event.type !== 'action') { if (event.type !== 'action' && event.type !== 'event') {
return event as traceV3.ContextCreatedTraceEvent | return event as traceV3.ContextCreatedTraceEvent |
traceV3.ScreencastFrameTraceEvent | traceV3.ScreencastFrameTraceEvent |
traceV3.ResourceSnapshotTraceEvent | traceV3.ResourceSnapshotTraceEvent |
@ -247,7 +249,8 @@ export class TraceModel {
const metadata = event.metadata; const metadata = event.metadata;
if (metadata.internal || metadata.method.startsWith('tracing')) if (metadata.internal || metadata.method.startsWith('tracing'))
return null; return null;
if (metadata.id.startsWith('event@')) {
if (event.type === 'event') {
if (metadata.method === '__create__' && metadata.type === 'ConsoleMessage') { if (metadata.method === '__create__' && metadata.type === 'ConsoleMessage') {
return { return {
type: 'object', type: 'object',
@ -265,6 +268,7 @@ export class TraceModel {
pageId: metadata.pageId, pageId: metadata.pageId,
}; };
} }
return { return {
type: 'action', type: 'action',
callId: metadata.id, callId: metadata.id,