@elastic/synthetics 1.0.0-beta.2 → 1.0.0-beta.22

package/dist/plugins/tracing.d.ts

@@ -22,35 +22,20 @@
  * THE SOFTWARE.
  *
  */
-import { CDPSession } from 'playwright-chromium';
-import { FilmStrip } from '../common_types';
-/**
- * Trace Event Format
- * https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU
- */
-declare type TraceEvent = {
-    name: string;
-    cat: string;
-    pid: number;
-    tid: number;
-    ph?: string;
-    args?: {
-        snapshot: string;
-    };
-    /**
-     * Platform specific monotonic non decreasing clock time
-     * https://source.chromium.org/chromium/chromium/src/+/master:base/time/time.h;l=936;bpv=0;bpt=0
-     */
-    ts: number;
+import { Driver, PluginOutput } from '../common_types';
+export declare type TraceOptions = {
+    filmstrips?: boolean;
+    trace?: boolean;
 };
-export declare function filterFilmstrips(traceEvents: Array<TraceEvent>): Array<FilmStrip>;
 /**
- * Custom Tracer that only traces the filmstrips
+ * Custom Tracer that listenes for events from specified categories
  * https://chromedevtools.github.io/devtools-protocol/tot/Tracing/
  */
 export declare class Tracing {
-    start(client: CDPSession): Promise<void>;
-    stop(client: CDPSession): Promise<TraceEvent[]>;
+    private driver;
+    private options;
+    constructor(driver: Driver, options: TraceOptions);
+    start(): Promise<void>;
+    stop(): Promise<Partial<PluginOutput>>;
 }
-export {};
 //# sourceMappingURL=tracing.d.ts.map

package/dist/plugins/tracing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;GAGG;AACH,aAAK,UAAU,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,EAAE,MAAM,CAAC;IAEZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,GAC7B,KAAK,CAAC,SAAS,CAAC,CAelB;AAED;;;GAGG;AACH,qBAAa,OAAO;IACZ,KAAK,CAAC,MAAM,EAAE,UAAU;IAmBxB,IAAI,CAAC,MAAM,EAAE,UAAU;CAgB9B"}
+{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAIvD,oBAAY,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,qBAAa,OAAO;IACN,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,OAAO;gBAA/B,MAAM,EAAE,MAAM,EAAU,OAAO,EAAE,YAAY;IAE3D,KAAK;IAkCL,IAAI;CA0BX"}

package/dist/plugins/tracing.js

@@ -24,48 +24,53 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tracing = exports.filterFilmstrips = void 0;
-const helpers_1 = require("../helpers");
-function filterFilmstrips(traceEvents) {
-    const events = traceEvents.filter(event => {
-        const { args, cat, name } = event;
-        return (name === 'Screenshot' &&
-            cat === 'disabled-by-default-devtools.screenshot' &&
-            (args === null || args === void 0 ? void 0 : args.snapshot));
-    });
-    return events.map(event => ({
-        snapshot: event.args.snapshot,
-        ts: event.ts,
-        startTime: helpers_1.convertTraceTimestamp(event.ts),
-    }));
-}
-exports.filterFilmstrips = filterFilmstrips;
+exports.Tracing = void 0;
+const trace_metrics_1 = require("../sdk/trace-metrics");
+const trace_processor_1 = require("../sdk/trace-processor");
 /**
- * Custom Tracer that only traces the filmstrips
+ * Custom Tracer that listenes for events from specified categories
  * https://chromedevtools.github.io/devtools-protocol/tot/Tracing/
  */
 class Tracing {
-    async start(client) {
+    constructor(driver, options) {
+        this.driver = driver;
+        this.options = options;
+    }
+    async start() {
         const includedCategories = [
             // exclude all default categories
             '-*',
-            // capture screenshots
-            'disabled-by-default-devtools.screenshot',
         ];
-        await client.send('Tracing.start', {
+        if (this.options.filmstrips) {
+            // capture screenshots - up to 450 max for each trace (https://goo.gl/rBfhn4)
+            includedCategories.push('disabled-by-default-devtools.screenshot');
+        }
+        if (this.options.trace) {
+            includedCategories.push(
+            // Used instead of 'toplevel' in Chrome 71+
+            'disabled-by-default-lighthouse', 
+            // Cumulative Layout Shift metric
+            'loading', 
+            // UserTiming marks/measures
+            'blink.user_timing', 
+            // Most of the events we need are from these two categories
+            // Includes FCP, LCP, Main thread frames, process, etc.
+            'devtools.timeline', 'disabled-by-default-devtools.timeline');
+        }
+        await this.driver.client.send('Tracing.start', {
             /**
              * Using `ReportEvents` makes gathering trace events
              * much faster as opposed to using `ReturnAsStream` mode
              */
             transferMode: 'ReportEvents',
-            traceConfig: {
-                includedCategories,
-            },
+            categories: includedCategories.join(','),
+            options: 'sampling-frequency=10000', // 1000 is default
         });
     }
-    async stop(client) {
+    async stop() {
         const events = [];
         const collectListener = payload => events.push(...payload.value);
+        const { client } = this.driver;
         client.on('Tracing.dataCollected', collectListener);
         const [traceEvents] = await Promise.all([
             new Promise(resolve => client.once('Tracing.tracingComplete', () => {
@@ -74,7 +79,16 @@ class Tracing {
             })),
             client.send('Tracing.end'),
         ]);
-        return traceEvents;
+        const output = {};
+        if (this.options.filmstrips) {
+            output.filmstrips = trace_metrics_1.Filmstrips.compute(traceEvents);
+        }
+        if (this.options.trace) {
+            Object.assign(output, {
+                ...trace_processor_1.TraceProcessor.computeTrace(traceEvents),
+            });
+        }
+        return output;
     }
 }
 exports.Tracing = Tracing;

package/dist/plugins/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAIH,wCAAmD;AA0BnD,SAAgB,gBAAgB,CAC9B,WAA8B;IAE9B,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACxC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QAClC,OAAO,CACL,IAAI,KAAK,YAAY;YACrB,GAAG,KAAK,yCAAyC;aACjD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAA,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1B,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ;QAC7B,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,SAAS,EAAE,+BAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;KAC3C,CAAC,CAAC,CAAC;AACN,CAAC;AAjBD,4CAiBC;AAED;;;GAGG;AACH,MAAa,OAAO;IAClB,KAAK,CAAC,KAAK,CAAC,MAAkB;QAC5B,MAAM,kBAAkB,GAAG;YACzB,iCAAiC;YACjC,IAAI;YACJ,sBAAsB;YACtB,yCAAyC;SAC1C,CAAC;QACF,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;YACjC;;;eAGG;YACH,YAAY,EAAE,cAAc;YAC5B,WAAW,EAAE;gBACX,kBAAkB;aACnB;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkB;QAC3B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;QAEpD,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CACpB,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;gBAC1C,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;gBACrD,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CAAC,CACH;YACD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAC;QACH,OAAO,WAAgC,CAAC;IAC1C,CAAC;CACF;AApCD,0BAoCC"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAGH,wDAAkD;AAClD,4DAAoE;AAOpE;;;GAGG;AACH,MAAa,OAAO;IAClB,YAAoB,MAAc,EAAU,OAAqB;QAA7C,WAAM,GAAN,MAAM,CAAQ;QAAU,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAErE,KAAK,CAAC,KAAK;QACT,MAAM,kBAAkB,GAAG;YACzB,iCAAiC;YACjC,IAAI;SACL,CAAC;QACF,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,6EAA6E;YAC7E,kBAAkB,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;SACpE;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,kBAAkB,CAAC,IAAI;YACrB,2CAA2C;YAC3C,gCAAgC;YAChC,iCAAiC;YACjC,SAAS;YACT,4BAA4B;YAC5B,mBAAmB;YACnB,2DAA2D;YAC3D,uDAAuD;YACvD,mBAAmB,EACnB,uCAAuC,CACxC,CAAC;SACH;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;YAC7C;;;eAGG;YACH,YAAY,EAAE,cAAc;YAC5B,UAAU,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;YACxC,OAAO,EAAE,0BAA0B,EAAE,kBAAkB;SACxD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,CAAC,EAAE,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;QAEpD,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CACpB,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;gBAC1C,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;gBACrD,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC,CAAC,CACH;YACD,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC3B,MAAM,CAAC,UAAU,GAAG,0BAAU,CAAC,OAAO,CAAC,WAAgC,CAAC,CAAC;SAC1E;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;gBACpB,GAAG,gCAAc,CAAC,YAAY,CAAC,WAAgC,CAAC;aACjE,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA/DD,0BA+DC"}

package/dist/reporters/base.d.ts

@@ -30,7 +30,6 @@ export default class BaseReporter {
     stream: SonicBoom;
     fd: number;
     constructor(runner: Runner, options?: ReporterOptions);
-    close(): void;
     _registerListeners(): void;
     write(message: any): void;
 }

package/dist/reporters/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,MAAM,MAAM,gBAAgB,CAAC;AAQpC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyB7C,MAAM,CAAC,OAAO,OAAO,YAAY;IAIZ,MAAM,EAAE,MAAM;IAHjC,MAAM,EAAE,SAAS,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;gBAEQ,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB;IAOhE,KAAK;IAmBL,kBAAkB;IAsClB,KAAK,CAAC,OAAO,KAAA;CAMd"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,OAAO,MAAM,MAAM,gBAAgB,CAAC;AAQpC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyB7C,MAAM,CAAC,OAAO,OAAO,YAAY;IAIZ,MAAM,EAAE,MAAM;IAHjC,MAAM,EAAE,SAAS,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;gBAEQ,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,eAAoB;IAiBhE,kBAAkB;IAqDlB,KAAK,CAAC,OAAO,KAAA;CAMd"}

package/dist/reporters/base.js

@@ -32,21 +32,21 @@ const colors_1 = require("kleur/colors");
 const helpers_1 = require("../helpers");
 function renderError(error) {
     let output = '';
-    const outer = helpers_1.indent('');
-    const inner = helpers_1.indent(outer);
+    const outer = (0, helpers_1.indent)('');
+    const inner = (0, helpers_1.indent)(outer);
     const container = outer + '---\n';
     output += container;
     let stack = error.stack;
     if (stack) {
         output += inner + 'stack: |-\n';
-        stack = helpers_1.rewriteErrorStack(stack, helpers_1.findPWLogsIndexes(stack));
+        stack = (0, helpers_1.rewriteErrorStack)(stack, (0, helpers_1.findPWLogsIndexes)(stack));
         const lines = String(stack).split('\n');
         for (const line of lines) {
             output += inner + '  ' + line + '\n';
         }
     }
     output += container;
-    return colors_1.red(output);
+    return (0, colors_1.red)(output);
 }
 function renderDuration(durationMs) {
     return parseInt(durationMs);
@@ -55,28 +55,17 @@ class BaseReporter {
     constructor(runner, options = {}) {
         this.runner = runner;
         this.fd = options.fd || process.stdout.fd;
-        this.stream = new sonic_boom_1.default({ fd: this.fd, sync: true });
+        /**
+         * minLength is set to 1 byte to make sure we flush the
+         * content even if its the last byte on the stream buffer
+         * before destroying the pipe with underlying file descriptor
+         */
+        this.stream = new sonic_boom_1.default({ fd: this.fd, sync: true, minLength: 1 });
+        // flushSync is used here to make sure all the data from the underlying
+        // SonicBoom stream buffer is completely written to the fd before closing
+        // the process
+        this.runner.on('end', () => this.stream.flushSync());
         this._registerListeners();
-        this.runner.on('end', () => this.close());
-    }
-    close() {
-        if (this.fd <= 2) {
-            /**
-             * For stdout/stderr we destroy stream once data is written and run
-             * it as the last listener giving enough room for
-             * other reporters to write to stream
-             */
-            setImmediate(() => this.stream.end());
-        }
-        else {
-            /**
-             * If the user has passed a custom FD we don't close the FD, but we do flush it
-             * to give them more control. This is important because FDs should only be closed
-             * once, and the primary use case for custom FDs is being called by heartbeat, which
-             * closes the FD after the process exits
-             */
-            this.stream.flush();
-        }
     }
     _registerListeners() {
         const result = {
@@ -89,22 +78,35 @@ class BaseReporter {
         });
         this.runner.on('step:end', ({ step, start, end, error, status }) => {
             const message = `${helpers_1.symbols[status]}  Step: '${step.name}' ${status} (${renderDuration((end - start) * 1000)} ms)`;
-            this.write(helpers_1.indent(message));
+            this.write((0, helpers_1.indent)(message));
             error && this.write(renderError(error));
             result[status]++;
         });
+        this.runner.on('journey:end', ({ error }) => {
+            const { failed, succeeded, skipped } = result;
+            const total = failed + succeeded + skipped;
+            /**
+             * Render the error on the terminal only when no steps could
+             * be executed which means the error happened in one of the hooks
+             */
+            if (total === 0 && error) {
+                this.write(renderError(error));
+            }
+        });
         this.runner.on('end', () => {
             const { failed, succeeded, skipped } = result;
             const total = failed + succeeded + skipped;
+            let message = '\n';
             if (total === 0) {
-                this.write('No tests found!');
+                message = 'No tests found!';
+                message += ` (${renderDuration((0, helpers_1.now)())} ms) \n`;
+                this.write(message);
                 return;
             }
-            let message = '\n';
-            message += succeeded > 0 ? colors_1.green(` ${succeeded} passed`) : '';
-            message += failed > 0 ? colors_1.red(` ${failed} failed`) : '';
-            message += skipped > 0 ? colors_1.cyan(` ${skipped} skipped`) : '';
-            message += ` (${renderDuration(helpers_1.now())} ms) \n`;
+            message += succeeded > 0 ? (0, colors_1.green)(` ${succeeded} passed`) : '';
+            message += failed > 0 ? (0, colors_1.red)(` ${failed} failed`) : '';
+            message += skipped > 0 ? (0, colors_1.cyan)(` ${skipped} skipped`) : '';
+            message += ` (${renderDuration((0, helpers_1.now)())} ms) \n`;
             this.write(message);
         });
     }

package/dist/reporters/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;AAEH,4DAAmC;AACnC,yCAAgD;AAEhD,wCAMoB;AAGpB,SAAS,WAAW,CAAC,KAAK;IACxB,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,KAAK,GAAG,gBAAM,CAAC,EAAE,CAAC,CAAC;IACzB,MAAM,KAAK,GAAG,gBAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IAClC,MAAM,IAAI,SAAS,CAAC;IACpB,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IACxB,IAAI,KAAK,EAAE;QACT,MAAM,IAAI,KAAK,GAAG,aAAa,CAAC;QAChC,KAAK,GAAG,2BAAiB,CAAC,KAAK,EAAE,2BAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;SACtC;KACF;IACD,MAAM,IAAI,SAAS,CAAC;IACpB,OAAO,YAAG,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,cAAc,CAAC,UAAU;IAChC,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAED,MAAqB,YAAY;IAI/B,YAAmB,MAAc,EAAE,UAA2B,EAAE;QAA7C,WAAM,GAAN,MAAM,CAAQ;QAC/B,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE;YAChB;;;;eAIG;YACH,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;SACvC;aAAM;YACL;;;;;eAKG;YACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SACrB;IACH,CAAC;IAED,kBAAkB;QAChB,MAAM,MAAM,GAAG;YACb,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;SACX,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;YAC9C,IAAI,CAAC,KAAK,CAAC,cAAc,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;YACjE,MAAM,OAAO,GAAG,GAAG,iBAAO,CAAC,MAAM,CAAC,YAChC,IAAI,CAAC,IACP,KAAK,MAAM,KAAK,cAAc,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3D,IAAI,CAAC,KAAK,CAAC,gBAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACzB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YAC9C,MAAM,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;YAE3C,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAC9B,OAAO;aACR;YAED,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,OAAO,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,cAAK,CAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,OAAO,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAG,CAAC,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,aAAI,CAAC,IAAI,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,IAAI,KAAK,cAAc,CAAC,aAAG,EAAE,CAAC,SAAS,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;YAC9B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;CACF;AA1ED,+BA0EC"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":"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"}

package/dist/reporters/json.d.ts

@@ -22,36 +22,57 @@
  * THE SOFTWARE.
  *
  */
+/// <reference types="node" />
 import BaseReporter from './base';
 import { Journey, Step } from '../dsl';
-import { NetworkInfo, StatusValue } from '../common_types';
-import { Protocol } from 'playwright-chromium/types/protocol';
-import { Metrics } from '../plugins';
-declare type OutputType = 'synthetics/metadata' | 'journey/register' | 'journey/start' | 'step/screenshot' | 'step/end' | 'journey/network_info' | 'journey/filmstrips' | 'journey/browserconsole' | 'journey/end';
+import { NetworkInfo, NetworkConditions, TraceOutput, StatusValue, PerfMetrics, Params, Screenshot } from '../common_types';
+import { PageMetrics } from '../plugins';
+declare type OutputType = 'synthetics/metadata' | 'journey/register' | 'journey/start' | 'screenshot/block' | 'step/screenshot_ref' | 'step/screenshot' | 'step/metrics' | 'step/filmstrips' | 'step/end' | 'journey/network_info' | 'journey/browserconsole' | 'journey/end';
 declare type Payload = {
     source?: string;
     start?: number;
     end?: number;
     url?: string;
-    status?: StatusValue | number;
-    metrics?: Metrics;
-    params?: Record<string, unknown>;
+    status?: StatusValue;
+    pagemetrics?: PageMetrics;
+    params?: Params;
     type?: OutputType;
     text?: string;
     index?: number;
+    network_conditions?: NetworkConditions;
 };
 declare type OutputFields = {
     type: OutputType;
+    _id?: string;
     journey?: Journey;
     timestamp?: number;
     url?: string;
-    step?: Partial<Step>;
+    step?: Partial<Step> & {
+        duration?: {
+            us: number;
+        };
+    };
     error?: Error;
     root_fields?: Record<string, unknown>;
-    payload?: Payload | NetworkInfo;
+    payload?: Payload;
     blob?: string;
     blob_mime?: string;
 };
+declare type ScreenshotBlob = {
+    blob: string;
+    id: string;
+};
+declare type ScreenshotReference = {
+    width: number;
+    height: number;
+    blocks: Array<{
+        hash: string;
+        top: number;
+        left: number;
+        width: number;
+        height: number;
+    }>;
+};
 export declare function formatNetworkFields(network: NetworkInfo): {
     ecs: {
         url: string;
@@ -62,57 +83,10 @@ export declare function formatNetworkFields(network: NetworkInfo): {
         };
         http: {
             version: number;
-            request: {
-                body: {
-                    bytes: number;
-                    content: string;
-                };
-                referrer: string;
-                url: string;
-                urlFragment?: string;
-                method: string;
-                headers: Protocol.Network.Headers;
-                postData?: string;
-                hasPostData?: boolean;
-                postDataEntries?: Protocol.Network.PostDataEntry[];
-                mixedContentType?: Protocol.Security.MixedContentType;
-                initialPriority: Protocol.Network.ResourcePriority;
-                referrerPolicy: "unsafe-url" | "no-referrer-when-downgrade" | "no-referrer" | "origin" | "origin-when-cross-origin" | "same-origin" | "strict-origin" | "strict-origin-when-cross-origin";
-                isLinkPreload?: boolean;
-                trustTokenParams?: Protocol.Network.TrustTokenParams;
-            };
-            response: {
-                body: {
-                    bytes: number;
-                };
-                status_code: number;
-                url: string;
-                status: number;
-                statusText: string;
-                headers: Protocol.Network.Headers;
-                headersText?: string;
-                mimeType: string;
-                requestHeaders?: Protocol.Network.Headers;
-                requestHeadersText?: string;
-                connectionReused: boolean;
-                connectionId: number;
-                remoteIPAddress?: string;
-                remotePort?: number;
-                fromDiskCache?: boolean;
-                fromServiceWorker?: boolean;
-                fromPrefetchCache?: boolean;
-                encodedDataLength: number;
-                timing?: Protocol.Network.ResourceTiming;
-                serviceWorkerResponseSource?: Protocol.Network.ServiceWorkerResponseSource;
-                responseTime?: number;
-                cacheStorageCacheName?: string;
-                protocol?: string;
-                securityState: Protocol.Security.SecurityState;
-                securityDetails?: Protocol.Network.SecurityDetails;
-            };
+            request: import("../common_types").Request;
+            response: import("../common_types").Response;
         };
         tls: {
-            cipher: string;
             server: {
                 x509: {
                     issuer: {
@@ -131,9 +105,22 @@ export declare function formatNetworkFields(network: NetworkInfo): {
     };
     payload: Partial<NetworkInfo>;
 };
+export declare function getScreenshotBlocks(screenshot: Buffer): Promise<{
+    blocks: ScreenshotBlob[];
+    reference: ScreenshotReference;
+    blob_mime: string;
+}>;
+/**
+ * Get all the screenshots from the cached screenshot location
+ * at the end of each journey and construct equally sized blocks out
+ * of the individual screenshot image.
+ */
+export declare function gatherScreenshots(screenshotsPath: string, callback: (data: Screenshot) => Promise<void>): Promise<void>;
 export default class JSONReporter extends BaseReporter {
     _registerListeners(): void;
-    writeJSON({ journey, type, timestamp, step, root_fields, error, payload, blob, blob_mime, url, }: OutputFields): void;
+    writeScreenshotBlocks(journey: Journey, screenshot: Screenshot): Promise<void>;
+    writeMetrics(journey: Journey, step: Step, type: string, events: Array<TraceOutput> | PerfMetrics): void;
+    writeJSON({ _id, journey, type, timestamp, step, root_fields, error, payload, blob, blob_mime, url, }: OutputFields): void;
 }
 export {};
 //# sourceMappingURL=json.d.ts.map

package/dist/reporters/json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,YAAY,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,aAAK,UAAU,GACX,qBAAqB,GACrB,kBAAkB,GAClB,eAAe,GACf,iBAAiB,GACjB,UAAU,GACV,sBAAsB,GACtB,oBAAoB,GACpB,wBAAwB,GACxB,aAAa,CAAC;AAElB,aAAK,OAAO,GAAG;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,aAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAiFF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCvD;AAgCD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,YAAY;IACpD,kBAAkB;IA8IlB,SAAS,CAAC,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,WAAW,EACX,KAAK,EACL,OAAO,EACP,IAAI,EACJ,SAAS,EACT,GAAG,GACJ,EAAE,YAAY;CAehB"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}