Skip to content

Commit 2a577a5

Browse files
authored
cherry-pick(#27095): fix(tracing): support old traces with consoleMessage.args (#27124)
Fixes #27072.
1 parent ed919f3 commit 2a577a5

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,9 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
384384
onEvent(sdkObject: SdkObject, event: trace.EventTraceEvent) {
385385
if (!sdkObject.attribution.context)
386386
return;
387-
if (event.method === 'console' || (event.method === '__create__' && event.class === 'ConsoleMessage')) {
387+
if (event.method === 'console' ||
388+
(event.method === '__create__' && event.class === 'ConsoleMessage') ||
389+
(event.method === '__create__' && event.class === 'JSHandle')) {
388390
// Console messages are handled separately.
389391
return;
390392
}

packages/trace-viewer/src/traceModel.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export class TraceModel {
3838
private _backend!: TraceModelBackend;
3939
private _attachments = new Map<string, trace.AfterActionTraceEventAttachment>();
4040
private _resourceToContentType = new Map<string, string>();
41+
private _jsHandles = new Map<string, { preview: string }>();
4142

4243
constructor() {
4344
}
@@ -112,6 +113,7 @@ export class TraceModel {
112113
}
113114

114115
this._snapshotStorage!.finalize();
116+
this._jsHandles.clear();
115117
}
116118

117119
async hasEntry(filename: string): Promise<boolean> {
@@ -297,12 +299,23 @@ export class TraceModel {
297299
return null;
298300

299301
if (event.type === 'event') {
302+
if (metadata.method === '__create__' && metadata.type === 'JSHandle')
303+
this._jsHandles.set(metadata.params.guid, metadata.params.initializer);
300304
if (metadata.method === '__create__' && metadata.type === 'ConsoleMessage') {
301305
return {
302306
type: 'object',
303307
class: metadata.type,
304308
guid: metadata.params.guid,
305-
initializer: metadata.params.initializer,
309+
initializer: {
310+
...metadata.params.initializer,
311+
args: metadata.params.initializer.args?.map((arg: any) => {
312+
if (arg.guid) {
313+
const handle = this._jsHandles.get(arg.guid);
314+
return { preview: handle?.preview || '', value: '' };
315+
}
316+
return { preview: '', value: '' };
317+
})
318+
},
306319
};
307320
}
308321
return {

0 commit comments

Comments
 (0)