@elastic/synthetics 1.0.0-beta.3 → 1.0.0-beta.32

package/dist/reporters/json.d.ts

@@ -25,21 +25,20 @@
 /// <reference types="node" />
 import BaseReporter from './base';
 import { Journey, Step } from '../dsl';
-import { NetworkInfo, TraceOutput, StatusValue, PerfMetrics } from '../common_types';
-import { Protocol } from 'playwright-chromium/types/protocol';
-import { Metrics } from '../plugins';
-declare type OutputType = 'synthetics/metadata' | 'journey/register' | 'journey/start' | 'screenshot/block' | 'step/screenshot_ref' | 'step/screenshot' | 'step/end' | 'journey/network_info' | 'journey/filmstrips' | 'journey/browserconsole' | 'journey/metrics' | 'journey/end';
+import { NetworkInfo, NetworkConditions, TraceOutput, StatusValue, PerfMetrics, Params, Screenshot, StartEvent, JourneyStartResult, StepEndResult, JourneyEndResult, PageMetrics } from '../common_types';
+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;
@@ -54,7 +53,7 @@ declare type OutputFields = {
     };
     error?: Error;
     root_fields?: Record<string, unknown>;
-    payload?: Payload | NetworkInfo;
+    payload?: Payload;
     blob?: string;
     blob_mime?: string;
 };
@@ -73,12 +72,6 @@ declare type ScreenshotReference = {
         height: number;
     }>;
 };
-declare type ScreenshotOutput = {
-    step: Step;
-    blob_mime: string;
-    blocks: Array<ScreenshotBlob>;
-    reference: ScreenshotReference;
-};
 export declare function formatNetworkFields(network: NetworkInfo): {
     ecs: {
         url: string;
@@ -88,58 +81,10 @@ export declare function formatNetworkFields(network: NetworkInfo): {
             original: string;
         };
         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: {
@@ -168,10 +113,16 @@ export declare function getScreenshotBlocks(screenshot: Buffer): Promise<{
  * at the end of each journey and construct equally sized blocks out
  * of the individual screenshot image.
  */
-export declare function gatherScreenshots(screenshotsPath: string, callback: (step: Step, data: string) => Promise<void>): Promise<ScreenshotOutput[]>;
+export declare function gatherScreenshots(screenshotsPath: string, callback: (data: Screenshot) => Promise<void>): Promise<void>;
 export default class JSONReporter extends BaseReporter {
-    _registerListeners(): void;
-    writeMetrics(journey: Journey, type: string, events: Array<TraceOutput> | PerfMetrics): void;
+    onStart(params: StartEvent): void;
+    onJourneyRegister(journey: Journey): void;
+    onJourneyStart(journey: Journey, { timestamp, params }: JourneyStartResult): void;
+    onStepEnd(journey: Journey, step: Step, { start, end, error, url, status, pagemetrics, traces, metrics, filmstrips, }: StepEndResult): void;
+    onJourneyEnd(journey: Journey, { timestamp, start, end, networkinfo, browserconsole, status, error, options, }: JourneyEndResult): Promise<void>;
+    onEnd(): 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 {};

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

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}

package/dist/reporters/json.js

@@ -48,55 +48,12 @@ function getMetadata() {
         },
     };
 }
-function formatVersion(protocol) {
-    if (!protocol) {
-        return;
-    }
-    if (protocol === 'h2') {
-        return 2;
-    }
-    else if (protocol === 'http/1.1') {
-        return 1.1;
-    }
-    else if (protocol === 'http/1.0') {
-        return 1.0;
-    }
-    else if (protocol.startsWith('h3')) {
-        return 3;
-    }
-}
-function formatRequest(request) {
-    var _a;
-    const postData = request.postData ? request.postData : '';
-    return {
-        ...request,
-        body: {
-            bytes: postData.length,
-            content: postData,
-        },
-        referrer: (_a = request.headers) === null || _a === void 0 ? void 0 : _a.Referer,
-    };
-}
-function formatResponse(response) {
-    if (!response) {
-        return;
-    }
-    return {
-        ...response,
-        body: {
-            bytes: response.encodedDataLength,
-        },
-        status_code: response.status,
-    };
-}
 function formatTLS(tls) {
-    if (!tls) {
+    if (!tls || !tls.protocol) {
         return;
     }
-    const cipher = `${tls.keyExchange ? tls.keyExchange + '_' : ''}${tls.cipher}_${tls.keyExchangeGroup}`;
     const [name, version] = tls.protocol.toLowerCase().split(' ');
     return {
-        cipher,
         server: {
             x509: {
                 issuer: {
@@ -110,11 +67,10 @@ function formatTLS(tls) {
             },
         },
         version_protocol: name,
-        version: version,
+        version,
     };
 }
 function formatNetworkFields(network) {
-    var _a;
     const { request, response, url, browser } = network;
     const ecs = {
         // URL would be parsed and mapped by heartbeat
@@ -122,19 +78,16 @@ function formatNetworkFields(network) {
         user_agent: {
             name: browser.name,
             version: browser.version,
-            original: (_a = request.headers) === null || _a === void 0 ? void 0 : _a['User-Agent'],
+            original: request.headers?.['User-Agent'],
         },
         http: {
-            version: formatVersion(response === null || response === void 0 ? void 0 : response.protocol),
-            request: formatRequest(request),
-            response: formatResponse(response),
+            request,
+            response,
         },
-        tls: formatTLS(response === null || response === void 0 ? void 0 : response.securityDetails),
+        tls: formatTLS(response?.securityDetails),
     };
     const pickItems = [
         'browser',
-        'status',
-        'method',
         'type',
         'isNavigationRequest',
         'requestSentTime',
@@ -174,7 +127,7 @@ function stepInfo(step, type, status) {
     };
 }
 async function getScreenshotBlocks(screenshot) {
-    const img = sharp_1.default(screenshot, { sequentialRead: true });
+    const img = (0, sharp_1.default)(screenshot, { sequentialRead: true });
     const { width, height } = await img.metadata();
     /**
      * Chop the screenshot image (1280*720) which is the default
@@ -185,8 +138,8 @@ async function getScreenshotBlocks(screenshot) {
      * optimal for caching in the ES and proved out to be bad, so we stick to 8
      */
     const divisions = 8;
-    const blockWidth = width / divisions;
-    const blockHeight = height / divisions;
+    const blockWidth = Math.floor(width / divisions);
+    const blockHeight = Math.floor(height / divisions);
     const reference = {
         width,
         height,
@@ -201,7 +154,7 @@ async function getScreenshotBlocks(screenshot) {
                 .extract({ top, left, width: blockWidth, height: blockHeight })
                 .jpeg()
                 .toBuffer();
-            const hash = crypto_1.createHash('sha1').update(buf).digest('hex');
+            const hash = (0, crypto_1.createHash)('sha1').update(buf).digest('hex');
             blocks.push({
                 blob: buf.toString('base64'),
                 id: hash,
@@ -230,95 +183,107 @@ exports.getScreenshotBlocks = getScreenshotBlocks;
  * of the individual screenshot image.
  */
 async function gatherScreenshots(screenshotsPath, callback) {
-    const screenshots = [];
-    if (helpers_1.isDirectory(screenshotsPath)) {
-        await helpers_1.totalist(screenshotsPath, async (_, absPath) => {
+    if ((0, helpers_1.isDirectory)(screenshotsPath)) {
+        await (0, helpers_1.totalist)(screenshotsPath, async (_, absPath) => {
             try {
-                const content = fs_1.readFileSync(absPath, 'utf8');
-                const { step, data } = JSON.parse(content);
-                await callback(step, data);
+                const content = (0, fs_1.readFileSync)(absPath, 'utf8');
+                const screenshot = JSON.parse(content);
+                await callback(screenshot);
             }
             catch (_) {
                 // TODO: capture progarammatic synthetic errors under different type
             }
         });
     }
-    return screenshots;
 }
 exports.gatherScreenshots = gatherScreenshots;
 class JSONReporter extends base_1.default {
-    _registerListeners() {
+    onStart(params) {
         /**
          * report the number of journeys that exists on a suite which
          * could be used for better sharding
          */
-        this.runner.on('start', ({ numJourneys }) => {
-            this.writeJSON({
-                type: 'synthetics/metadata',
-                root_fields: {
-                    num_journeys: numJourneys,
-                },
-            });
+        this.writeJSON({
+            type: 'synthetics/metadata',
+            root_fields: {
+                num_journeys: params.numJourneys,
+            },
+            payload: params.networkConditions
+                ? {
+                    network_conditions: params.networkConditions,
+                }
+                : undefined,
         });
-        this.runner.on('journey:register', ({ journey }) => {
-            this.writeJSON({
-                type: 'journey/register',
-                journey,
-            });
+    }
+    onJourneyRegister(journey) {
+        this.writeJSON({
+            type: 'journey/register',
+            journey,
         });
-        this.runner.on('journey:start', ({ journey, timestamp, params }) => {
-            this.writeJSON({
-                type: 'journey/start',
-                journey,
-                timestamp,
-                payload: { params, source: journey.callback.toString() },
-            });
+    }
+    onJourneyStart(journey, { timestamp, params }) {
+        this.writeJSON({
+            type: 'journey/start',
+            journey,
+            timestamp,
+            payload: { params, source: journey.callback.toString() },
         });
-        this.runner.on('step:end', ({ journey, step, start, end, error, url, status, metrics }) => {
-            this.writeJSON({
-                type: 'step/end',
-                journey,
-                step: {
-                    ...step,
-                    duration: {
-                        us: helpers_1.getDurationInUs(end - start),
+    }
+    onStepEnd(journey, step, { start, end, error, url, status, pagemetrics, traces, metrics, filmstrips, }) {
+        this.writeMetrics(journey, step, 'relative_trace', traces);
+        this.writeMetrics(journey, step, 'experience', metrics);
+        if (filmstrips) {
+            // Write each filmstrip separately so that we don't get documents that are too large
+            filmstrips.forEach((strip, index) => {
+                this.writeJSON({
+                    type: 'step/filmstrips',
+                    journey,
+                    step,
+                    payload: { index },
+                    root_fields: {
+                        browser: { relative_trace: { start: strip.start } },
                     },
+                    blob: strip.blob,
+                    blob_mime: strip.mime,
+                });
+            });
+        }
+        this.writeJSON({
+            type: 'step/end',
+            journey,
+            step: {
+                ...step,
+                duration: {
+                    us: (0, helpers_1.getDurationInUs)(end - start),
                 },
+            },
+            url,
+            error,
+            payload: {
+                source: step.callback.toString(),
                 url,
-                error,
-                payload: {
-                    source: step.callback.toString(),
-                    url,
-                    status,
-                    metrics,
-                },
-            });
+                status,
+                pagemetrics,
+            },
         });
-        this.runner.on('journey:end', async ({ journey, start, end, filmstrips, networkinfo, browserconsole, traces, metrics, status, error, ssblocks, }) => {
-            await gatherScreenshots(path_1.join(helpers_1.CACHE_PATH, 'screenshots'), async (step, data) => {
+    }
+    async onJourneyEnd(journey, { timestamp, start, end, networkinfo, browserconsole, status, error, options, }) {
+        const { ssblocks, screenshots } = options;
+        const writeScreenshots = screenshots === 'on' ||
+            (screenshots === 'only-on-failure' && status === 'failed');
+        if (writeScreenshots) {
+            await gatherScreenshots((0, path_1.join)(helpers_1.CACHE_PATH, 'screenshots'), async (screenshot) => {
+                const { data, timestamp, step } = screenshot;
+                if (!data) {
+                    return;
+                }
                 if (ssblocks) {
-                    const { blob_mime, blocks, reference } = await getScreenshotBlocks(Buffer.from(data, 'base64'));
-                    for (let i = 0; i < blocks.length; i++) {
-                        const block = blocks[i];
-                        this.writeJSON({
-                            type: 'screenshot/block',
-                            _id: block.id,
-                            blob: block.blob,
-                            blob_mime,
-                        });
-                    }
-                    this.writeJSON({
-                        type: 'step/screenshot_ref',
-                        journey,
-                        step,
-                        root_fields: {
-                            screenshot_ref: reference,
-                        },
-                    });
+                    await this.writeScreenshotBlocks(journey, screenshot);
                 }
                 else {
                     this.writeJSON({
                         type: 'step/screenshot',
+                        timestamp,
                         journey,
                         step,
                         blob: data,
@@ -326,67 +291,80 @@ class JSONReporter extends base_1.default {
                     });
                 }
             });
-            if (networkinfo) {
-                networkinfo.forEach(ni => {
-                    const { ecs, payload } = formatNetworkFields(ni);
-                    this.writeJSON({
-                        type: 'journey/network_info',
-                        journey,
-                        timestamp: ni.timestamp,
-                        root_fields: snakecase_keys_1.default(ecs),
-                        step: ni.step,
-                        payload: snakecase_keys_1.default(payload),
-                    });
-                });
-            }
-            if (filmstrips) {
-                // Write each filmstrip separately so that we don't get documents that are too large
-                filmstrips.forEach((strip, index) => {
-                    this.writeJSON({
-                        type: 'journey/filmstrips',
-                        journey,
-                        payload: { index },
-                        root_fields: {
-                            browser: { relative_trace: { start: strip.start } },
-                        },
-                        blob: strip.blob,
-                        blob_mime: strip.mime,
-                    });
+        }
+        if (networkinfo) {
+            networkinfo.forEach(ni => {
+                const { ecs, payload } = formatNetworkFields(ni);
+                this.writeJSON({
+                    type: 'journey/network_info',
+                    journey,
+                    timestamp: ni.timestamp,
+                    root_fields: (0, snakecase_keys_1.default)(ecs),
+                    step: ni.step,
+                    payload: (0, snakecase_keys_1.default)(payload),
                 });
-            }
-            if (browserconsole) {
-                browserconsole.forEach(({ timestamp, text, type, step }) => {
-                    this.writeJSON({
-                        type: 'journey/browserconsole',
-                        journey,
-                        timestamp,
-                        step,
-                        payload: { text, type },
-                    });
+            });
+        }
+        if (browserconsole) {
+            browserconsole.forEach(({ timestamp, text, type, step, error }) => {
+                this.writeJSON({
+                    type: 'journey/browserconsole',
+                    journey,
+                    timestamp,
+                    step,
+                    error,
+                    payload: {
+                        text,
+                        type,
+                    },
                 });
-            }
-            this.writeMetrics(journey, 'relative_trace', traces);
-            this.writeMetrics(journey, 'experience', metrics);
+            });
+        }
+        this.writeJSON({
+            type: 'journey/end',
+            journey,
+            timestamp,
+            error,
+            payload: {
+                start,
+                end,
+                status,
+            },
+        });
+    }
+    onEnd() {
+        this.stream.flushSync();
+    }
+    async writeScreenshotBlocks(journey, screenshot) {
+        const { blob_mime, blocks, reference } = await getScreenshotBlocks(Buffer.from(screenshot.data, 'base64'));
+        for (let i = 0; i < blocks.length; i++) {
+            const block = blocks[i];
             this.writeJSON({
-                type: 'journey/end',
-                journey,
-                error,
-                payload: {
-                    start,
-                    end,
-                    status,
-                },
+                type: 'screenshot/block',
+                timestamp: screenshot.timestamp,
+                _id: block.id,
+                blob: block.blob,
+                blob_mime,
             });
-            this.runner.emit('journey:end:reported', {});
+        }
+        this.writeJSON({
+            type: 'step/screenshot_ref',
+            timestamp: screenshot.timestamp,
+            journey,
+            step: screenshot.step,
+            root_fields: {
+                screenshot_ref: reference,
+            },
         });
     }
-    writeMetrics(journey, type, events) {
+    writeMetrics(journey, step, type, events) {
         const metrics = Array.isArray(events) ? events : [events];
         metrics.forEach(event => {
             event &&
                 this.writeJSON({
-                    type: 'journey/metrics',
+                    type: 'step/metrics',
                     journey,
+                    step,
                     root_fields: {
                         browser: {
                             [type]: event,
@@ -395,7 +373,7 @@ class JSONReporter extends base_1.default {
                 });
         });
     }
-    // Writes a structered synthetics event
+    // Writes a structured synthetics event
     // Note that blob is ultimately stored in ES as a base64 encoded string. You must base 64 encode
     // it before passing it into this function!
     // The payload field is an un-indexed field with no ES mapping, so users can put arbitary structured
@@ -404,14 +382,14 @@ class JSONReporter extends base_1.default {
         this.write({
             type,
             _id,
-            '@timestamp': timestamp || helpers_1.getTimestamp(),
-            journey: journeyInfo(journey, type, payload === null || payload === void 0 ? void 0 : payload.status),
-            step: stepInfo(step, type, payload === null || payload === void 0 ? void 0 : payload.status),
+            '@timestamp': timestamp || (0, helpers_1.getTimestamp)(),
+            journey: journeyInfo(journey, type, payload?.status),
+            step: stepInfo(step, type, payload?.status),
             root_fields: { ...(root_fields || {}), ...getMetadata() },
             payload,
             blob,
             blob_mime,
-            error: helpers_1.formatError(error),
+            error: (0, helpers_1.formatError)(error),
             url,
             package_version: version,
         });