Skip to content

Commit

Permalink
fix(tracing): error handling (#6888)
Browse files Browse the repository at this point in the history
- Reject when ZipFile signals an error.
- Make sure snapshotter does not save trace events after stop().
- Await pending blob writes on stop().
  • Loading branch information
dgozman committed Jun 4, 2021
1 parent b5ac393 commit a836466
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/server/snapshot/snapshotter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export class Snapshotter {
const snapshots = page.frames().map(async frame => {
const data = await frame.nonStallingRawEvaluateInExistingMainContext(expression).catch(e => debugLogger.log('error', e)) as SnapshotData;
// Something went wrong -> bail out, our snapshots are best-efforty.
if (!data)
if (!data || !this._started)
return;

const snapshot: FrameSnapshot = {
Expand Down
1 change: 1 addition & 0 deletions src/server/trace/recorder/traceSnapshotter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export class TraceSnapshotter extends EventEmitter implements SnapshotterDelegat

async stop(): Promise<void> {
await this._snapshotter.stop();
await this._writeArtifactChain;
}

async dispose() {
Expand Down
40 changes: 23 additions & 17 deletions src/server/trace/recorder/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import fs from 'fs';
import path from 'path';
import yazl from 'yazl';
import { EventEmitter } from 'events';
import { calculateSha1, createGuid, mkdirIfNeeded, monotonicTime } from '../../../utils/utils';
import { Artifact } from '../../artifact';
import { BrowserContext } from '../../browserContext';
Expand All @@ -43,7 +44,7 @@ export class Tracing implements InstrumentationListener {
private _resourcesDir: string;
private _sha1s: string[] = [];
private _started = false;
private _tracesDir: string | undefined;
private _tracesDir: string;

constructor(context: BrowserContext) {
this._context = context;
Expand All @@ -54,8 +55,6 @@ export class Tracing implements InstrumentationListener {

async start(options: TracerOptions): Promise<void> {
// context + page must be the first events added, this method can't have awaits before them.
if (!this._tracesDir)
throw new Error('Tracing directory is not specified when launching the browser');
if (this._started)
throw new Error('Tracing has already been started');
this._started = true;
Expand Down Expand Up @@ -86,13 +85,13 @@ export class Tracing implements InstrumentationListener {
if (!this._started)
return;
this._started = false;
await this._snapshotter.stop();
this._context.instrumentation.removeListener(this);
helper.removeEventListeners(this._eventListeners);
for (const { sdkObject, metadata } of this._pendingCalls.values())
await this.onAfterCall(sdkObject, metadata);
for (const page of this._context.pages())
page.setScreencastOptions(null);
await this._snapshotter.stop();

// Ensure all writes are finished.
await this._appendEventChain;
Expand All @@ -103,21 +102,25 @@ export class Tracing implements InstrumentationListener {
}

async export(): Promise<Artifact> {
if (!this._traceFile)
throw new Error('Tracing directory is not specified when launching the browser');
if (!this._traceFile || this._started)
throw new Error('Must start and stop tracing before exporting');
const zipFile = new yazl.ZipFile();
zipFile.addFile(this._traceFile, 'trace.trace');
const zipFileName = this._traceFile + '.zip';
this._traceFile = undefined;
for (const sha1 of this._sha1s)
zipFile.addFile(path.join(this._resourcesDir!, sha1), path.join('resources', sha1));
zipFile.end();
await new Promise(f => {
zipFile.outputStream.pipe(fs.createWriteStream(zipFileName)).on('close', f);
const failedPromise = new Promise<Artifact>((_, reject) => (zipFile as any as EventEmitter).on('error', reject));

const succeededPromise = new Promise<Artifact>(async fulfill => {
zipFile.addFile(this._traceFile!, 'trace.trace');
const zipFileName = this._traceFile! + '.zip';
for (const sha1 of this._sha1s)
zipFile.addFile(path.join(this._resourcesDir!, sha1), path.join('resources', sha1));
zipFile.end();
await new Promise(f => {
zipFile.outputStream.pipe(fs.createWriteStream(zipFileName)).on('close', f);
});
const artifact = new Artifact(this._context, zipFileName);
artifact.reportFinished();
fulfill(artifact);
});
const artifact = new Artifact(this._context, zipFileName);
artifact.reportFinished();
return artifact;
return Promise.race([failedPromise, succeededPromise]);
}

async _captureSnapshot(name: 'before' | 'after' | 'action' | 'event', sdkObject: SdkObject, metadata: CallMetadata, element?: ElementHandle) {
Expand Down Expand Up @@ -181,6 +184,9 @@ export class Tracing implements InstrumentationListener {
}

private _appendTraceEvent(event: any) {
if (!this._started)
return;

const visit = (object: any) => {
if (Array.isArray(object)) {
object.forEach(visit);
Expand Down
2 changes: 1 addition & 1 deletion tests/tracing.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test('should collect trace', async ({ context, page, server, browserName }, test
expect(events.some(e => e.type === 'screencast-frame')).toBeTruthy();
});

test('should collect trace', async ({ context, page, server }, testInfo) => {
test('should not collect snapshots by default', async ({ context, page, server }, testInfo) => {
await context.tracing.start();
await page.goto(server.EMPTY_PAGE);
await page.setContent('<button>Click</button>');
Expand Down

0 comments on commit a836466

Please sign in to comment.