@elastic/synthetics 1.3.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/lib/index.js +432 -0
- package/dist/cli.js +23 -14
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +51 -40
- package/dist/common_types.d.ts.map +1 -1
- package/dist/config.d.ts +2 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +7 -1
- package/dist/config.js.map +1 -1
- package/dist/core/browser-service.js +2 -2
- package/dist/core/browser-service.js.map +1 -1
- package/dist/core/expect.d.ts +1 -152
- package/dist/core/expect.d.ts.map +1 -1
- package/dist/core/expect.js +14 -5
- package/dist/core/expect.js.map +1 -1
- package/dist/core/gatherer.d.ts +1 -1
- package/dist/core/gatherer.d.ts.map +1 -1
- package/dist/core/gatherer.js +5 -5
- package/dist/core/gatherer.js.map +1 -1
- package/dist/core/runner.d.ts +4 -4
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +8 -7
- package/dist/core/runner.js.map +1 -1
- package/dist/core/transform.d.ts +62 -2
- package/dist/core/transform.d.ts.map +1 -1
- package/dist/dsl/journey.d.ts +5 -5
- package/dist/dsl/journey.d.ts.map +1 -1
- package/dist/dsl/journey.js +0 -1
- package/dist/dsl/journey.js.map +1 -1
- package/dist/dsl/monitor.d.ts +8 -3
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +1 -0
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/formatter/javascript.d.ts +6 -6
- package/dist/formatter/javascript.d.ts.map +1 -1
- package/dist/generator/index.d.ts +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +1 -1
- package/dist/generator/index.js.map +1 -1
- package/dist/helpers.d.ts +1 -6
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +1 -24
- package/dist/helpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/locations/index.d.ts +13 -5
- package/dist/locations/index.d.ts.map +1 -1
- package/dist/locations/index.js +30 -14
- package/dist/locations/index.js.map +1 -1
- package/dist/options.d.ts +5 -2
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +20 -3
- package/dist/options.js.map +1 -1
- package/dist/plugins/browser-console.d.ts +3 -2
- package/dist/plugins/browser-console.d.ts.map +1 -1
- package/dist/plugins/browser-console.js +33 -7
- package/dist/plugins/browser-console.js.map +1 -1
- package/dist/plugins/network.d.ts +1 -0
- package/dist/plugins/network.d.ts.map +1 -1
- package/dist/plugins/network.js +15 -2
- package/dist/plugins/network.js.map +1 -1
- package/dist/plugins/plugin-manager.d.ts +3 -3
- package/dist/plugins/plugin-manager.d.ts.map +1 -1
- package/dist/plugins/tracing.d.ts +1 -1
- package/dist/plugins/tracing.d.ts.map +1 -1
- package/dist/push/index.d.ts +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +7 -6
- package/dist/push/index.js.map +1 -1
- package/dist/push/kibana_api.d.ts +5 -5
- package/dist/push/kibana_api.d.ts.map +1 -1
- package/dist/push/kibana_api.js +1 -1
- package/dist/push/kibana_api.js.map +1 -1
- package/dist/push/monitor.d.ts +3 -3
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +22 -9
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/request.d.ts +2 -2
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/utils.d.ts +3 -3
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/push/utils.js +1 -1
- package/dist/push/utils.js.map +1 -1
- package/dist/reporters/base.d.ts +3 -0
- package/dist/reporters/base.d.ts.map +1 -1
- package/dist/reporters/base.js +20 -22
- package/dist/reporters/base.js.map +1 -1
- package/dist/reporters/index.d.ts +4 -3
- package/dist/reporters/index.d.ts.map +1 -1
- package/dist/reporters/index.js.map +1 -1
- package/dist/reporters/json.d.ts +5 -5
- package/dist/reporters/json.d.ts.map +1 -1
- package/dist/reporters/json.js +29 -1
- package/dist/reporters/json.js.map +1 -1
- package/dist/reporters/junit.d.ts.map +1 -1
- package/dist/reporters/junit.js +4 -4
- package/dist/reporters/junit.js.map +1 -1
- package/dist/reporters/reporter-util.d.ts +35 -0
- package/dist/reporters/reporter-util.d.ts.map +1 -0
- package/dist/reporters/reporter-util.js +192 -0
- package/dist/reporters/reporter-util.js.map +1 -0
- package/dist/sdk/trace-processor.d.ts +4 -4
- package/dist/sdk/trace-processor.d.ts.map +1 -1
- package/package.json +20 -11
- package/src/cli.ts +23 -22
- package/src/common_types.ts +17 -3
- package/src/config.ts +12 -1
- package/src/core/browser-service.ts +1 -1
- package/src/core/expect.ts +13 -191
- package/src/core/gatherer.ts +1 -1
- package/src/core/runner.ts +15 -9
- package/src/dsl/journey.ts +1 -2
- package/src/dsl/monitor.ts +5 -0
- package/src/generator/index.ts +2 -1
- package/src/helpers.ts +0 -24
- package/src/index.ts +3 -1
- package/src/locations/index.ts +37 -12
- package/src/options.ts +28 -3
- package/src/plugins/browser-console.ts +39 -8
- package/src/plugins/network.ts +16 -3
- package/src/push/index.ts +9 -6
- package/src/push/kibana_api.ts +4 -3
- package/src/push/monitor.ts +26 -9
- package/src/push/utils.ts +3 -3
- package/src/reporters/base.ts +26 -33
- package/src/reporters/index.ts +5 -1
- package/src/reporters/json.ts +33 -3
- package/src/reporters/junit.ts +5 -5
- package/src/reporters/reporter-util.ts +217 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;AAMH,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EACL,WAAW,EAEX,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,gBAAgB,EAChB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAKzB,
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}
|
package/dist/reporters/json.js
CHANGED
|
@@ -33,6 +33,7 @@ const path_1 = require("path");
|
|
|
33
33
|
const sharp_1 = __importDefault(require("sharp"));
|
|
34
34
|
const crypto_1 = require("crypto");
|
|
35
35
|
const base_1 = __importDefault(require("./base"));
|
|
36
|
+
const reporter_util_1 = require("./reporter-util");
|
|
36
37
|
const helpers_1 = require("../helpers");
|
|
37
38
|
const snakecase_keys_1 = __importDefault(require("snakecase-keys"));
|
|
38
39
|
/* eslint-disable @typescript-eslint/no-var-requires */
|
|
@@ -104,6 +105,33 @@ function formatNetworkFields(network) {
|
|
|
104
105
|
return { ecs, payload };
|
|
105
106
|
}
|
|
106
107
|
exports.formatNetworkFields = formatNetworkFields;
|
|
108
|
+
/**
|
|
109
|
+
* formatJSONError formats the error in a structured format
|
|
110
|
+
* we restructure the error with code frame and stack trace for test errors
|
|
111
|
+
*/
|
|
112
|
+
function formatJSONError(error, type) {
|
|
113
|
+
if (error == null) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Do not process browser errors - console.error and unhandled exceptions
|
|
118
|
+
*/
|
|
119
|
+
if (type != null && type === 'journey/browserconsole') {
|
|
120
|
+
return {
|
|
121
|
+
name: error.name,
|
|
122
|
+
message: error.message,
|
|
123
|
+
stack: error.stack,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Do not highlight source for these errors and strip ANSI codes
|
|
128
|
+
*/
|
|
129
|
+
return {
|
|
130
|
+
name: error.name,
|
|
131
|
+
message: (0, reporter_util_1.stripAnsiCodes)(error.message.split('\n')[0]),
|
|
132
|
+
stack: (0, reporter_util_1.stripAnsiCodes)((0, reporter_util_1.renderError)((0, reporter_util_1.serializeError)(error, false))),
|
|
133
|
+
};
|
|
134
|
+
}
|
|
107
135
|
function journeyInfo(journey, type, status) {
|
|
108
136
|
if (!journey) {
|
|
109
137
|
return;
|
|
@@ -390,7 +418,7 @@ class JSONReporter extends base_1.default {
|
|
|
390
418
|
payload,
|
|
391
419
|
blob,
|
|
392
420
|
blob_mime,
|
|
393
|
-
error: (
|
|
421
|
+
error: formatJSONError(error, type),
|
|
394
422
|
url,
|
|
395
423
|
package_version: version,
|
|
396
424
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,2BAAkC;AAClC,+BAA4B;AAC5B,kDAA0B;AAC1B,mCAAoC;AACpC,kDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/reporters/json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junit.d.ts","sourceRoot":"","sources":["../../src/reporters/junit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,YAAY,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"junit.d.ts","sourceRoot":"","sources":["../../src/reporters/junit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,YAAY,MAAM,QAAQ,CAAC;AAmBlC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,YAAY;;IACrD,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAAK;IAGhB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,kBAAkB;IAiBvD,SAAS,CAChB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,IAAI,EACV,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,aAAa;IAuCrC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,gBAAgB;IAU7C,KAAK;CA0BrB"}
|
package/dist/reporters/junit.js
CHANGED
|
@@ -31,6 +31,7 @@ const promises_1 = require("fs/promises");
|
|
|
31
31
|
const path_1 = require("path");
|
|
32
32
|
const helpers_1 = require("../helpers");
|
|
33
33
|
const base_1 = __importDefault(require("./base"));
|
|
34
|
+
const reporter_util_1 = require("./reporter-util");
|
|
34
35
|
/**
|
|
35
36
|
* JUnit Reporting Format - https://llg.cubic.org/docs/junit/
|
|
36
37
|
*/
|
|
@@ -71,14 +72,13 @@ class JUnitReporter extends base_1.default {
|
|
|
71
72
|
};
|
|
72
73
|
entry.attributes.tests++;
|
|
73
74
|
if (status === 'failed') {
|
|
74
|
-
const { name, message, stack } = (0, helpers_1.formatError)(error);
|
|
75
75
|
caseEntry.children.push({
|
|
76
76
|
name: 'failure',
|
|
77
77
|
attributes: {
|
|
78
|
-
message,
|
|
79
|
-
type: name,
|
|
78
|
+
message: error.message,
|
|
79
|
+
type: error.name,
|
|
80
80
|
},
|
|
81
|
-
text: stack,
|
|
81
|
+
text: (0, reporter_util_1.stripAnsiCodes)((0, reporter_util_1.serializeError)(error).stack),
|
|
82
82
|
});
|
|
83
83
|
entry.attributes.failures++;
|
|
84
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../src/reporters/junit.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;AAEH,0CAA+C;AAC/C,+BAA+B;AAO/B,
|
|
1
|
+
{"version":3,"file":"junit.js","sourceRoot":"","sources":["../../src/reporters/junit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in
|
|
14
|
+
* all copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
22
|
+
* THE SOFTWARE.
|
|
23
|
+
*
|
|
24
|
+
*/
|
|
25
|
+
import { Location, TestError } from '../common_types';
|
|
26
|
+
export declare function prepareError(error: Error): {
|
|
27
|
+
message: string;
|
|
28
|
+
stack: string;
|
|
29
|
+
location: Location;
|
|
30
|
+
};
|
|
31
|
+
export declare function highLightSource(location: Location): string;
|
|
32
|
+
export declare function serializeError(error: Error | any, highlightCode?: boolean): TestError;
|
|
33
|
+
export declare function renderError(error: TestError): string;
|
|
34
|
+
export declare function stripAnsiCodes(msg?: string): string;
|
|
35
|
+
//# sourceMappingURL=reporter-util.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reporter-util.d.ts","sourceRoot":"","sources":["../../src/reporters/reporter-util.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EAAE,QAAQ,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AA2ElE,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK;;;;EAmCxC;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAgB1D;AAKD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,GAAG,GAAG,EAClB,aAAa,UAAO,GACnB,SAAS,CAgBX;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,UAkB3C;AAUD,wBAAgB,cAAc,CAAC,GAAG,SAAK,UAEtC"}
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* MIT License
|
|
4
|
+
*
|
|
5
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
6
|
+
*
|
|
7
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
8
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
9
|
+
* in the Software without restriction, including without limitation the rights
|
|
10
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
11
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
12
|
+
* furnished to do so, subject to the following conditions:
|
|
13
|
+
*
|
|
14
|
+
* The above copyright notice and this permission notice shall be included in
|
|
15
|
+
* all copies or substantial portions of the Software.
|
|
16
|
+
*
|
|
17
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
18
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
19
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
20
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
21
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
22
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
23
|
+
* THE SOFTWARE.
|
|
24
|
+
*
|
|
25
|
+
*/
|
|
26
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
27
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
28
|
+
};
|
|
29
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
|
+
exports.stripAnsiCodes = exports.renderError = exports.serializeError = exports.highLightSource = exports.prepareError = void 0;
|
|
31
|
+
const url_1 = require("url");
|
|
32
|
+
const path_1 = require("path");
|
|
33
|
+
const fs_1 = require("fs");
|
|
34
|
+
const util_1 = require("util");
|
|
35
|
+
const colors_1 = require("kleur/colors");
|
|
36
|
+
const code_frame_1 = require("@babel/code-frame");
|
|
37
|
+
const stack_utils_1 = __importDefault(require("stack-utils"));
|
|
38
|
+
const stackUtils = new stack_utils_1.default({ internals: stack_utils_1.default.nodeInternals() });
|
|
39
|
+
const SYNTHETICS_PATH = (0, path_1.resolve)(__dirname, '..', '..');
|
|
40
|
+
const PW_CORE_PATH = require.resolve('playwright-core');
|
|
41
|
+
function prepareStackFrame(line) {
|
|
42
|
+
const frame = stackUtils.parseLine(line);
|
|
43
|
+
if (!frame) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
// ignore node internals
|
|
47
|
+
if (frame.file?.startsWith('internal') || frame.file?.startsWith('node:')) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
// handle relative URLs
|
|
51
|
+
let file = frame.file?.startsWith('file://')
|
|
52
|
+
? (0, url_1.fileURLToPath)(frame.file)
|
|
53
|
+
: (0, path_1.resolve)(process.cwd(), frame.file);
|
|
54
|
+
// ignore node_modules
|
|
55
|
+
if (file.includes(`${path_1.sep}node_modules${path_1.sep}`)) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
// filter library and PW files
|
|
59
|
+
if (!filterLibInternals(file)) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
// When we bundle the journeys, we store the absolute path of the journey
|
|
63
|
+
// files and write the sourcemap relative to these files. When we try to
|
|
64
|
+
// extract the sourcemap file location, the stacktrace will be relatively
|
|
65
|
+
// resolved to these files which would be under `journeys` folder. So we strip
|
|
66
|
+
// these extra `journeys` from the path to get the correct file location.
|
|
67
|
+
if (frame.file?.includes('journeys/journeys')) {
|
|
68
|
+
file = file.replace('journeys/journeys', 'journeys');
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
file,
|
|
72
|
+
line: frame.line || 0,
|
|
73
|
+
column: frame.column || 0,
|
|
74
|
+
function: frame.function,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function filterLibInternals(file) {
|
|
78
|
+
// To ignore filtering the stack trace on tests
|
|
79
|
+
if (process.env.TEST_OVERRIDE) {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
if (file.startsWith(SYNTHETICS_PATH)) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
// should have been filtered by node_modules, but just in case
|
|
86
|
+
if (file.startsWith(PW_CORE_PATH)) {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
function constructStackFromFrames(frames) {
|
|
91
|
+
const stackLines = [];
|
|
92
|
+
for (const frame of frames) {
|
|
93
|
+
stackLines.push(` at ${frame.function ? frame.function + ' ' : ''}(${frame.file}:${frame.line}:${frame.column})`);
|
|
94
|
+
}
|
|
95
|
+
return stackLines;
|
|
96
|
+
}
|
|
97
|
+
function prepareError(error) {
|
|
98
|
+
const stack = error.stack;
|
|
99
|
+
const lines = stack.split('\n');
|
|
100
|
+
let startAt = lines.findIndex(line => line.startsWith(' at '));
|
|
101
|
+
if (startAt === -1) {
|
|
102
|
+
startAt = lines.length;
|
|
103
|
+
}
|
|
104
|
+
const message = lines.slice(0, startAt).join('\n');
|
|
105
|
+
const stackLines = lines.slice(startAt);
|
|
106
|
+
// figure out the location of the journey/step that throws the error and
|
|
107
|
+
// correct stack line corresponding to that error
|
|
108
|
+
const stackFrames = [];
|
|
109
|
+
for (const line of stackLines) {
|
|
110
|
+
const frame = prepareStackFrame(line);
|
|
111
|
+
if (!frame || !frame.file) {
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
stackFrames.push(frame);
|
|
115
|
+
}
|
|
116
|
+
let location;
|
|
117
|
+
if (stackFrames.length) {
|
|
118
|
+
const frame = stackFrames[0];
|
|
119
|
+
location = {
|
|
120
|
+
file: frame.file,
|
|
121
|
+
column: frame.column || 0,
|
|
122
|
+
line: frame.line || 0,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
return {
|
|
126
|
+
message,
|
|
127
|
+
stack: constructStackFromFrames(stackFrames).join('\n'),
|
|
128
|
+
location,
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
exports.prepareError = prepareError;
|
|
132
|
+
function highLightSource(location) {
|
|
133
|
+
if (!location) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
try {
|
|
137
|
+
const source = (0, fs_1.readFileSync)(location.file, 'utf-8');
|
|
138
|
+
const code = (0, code_frame_1.codeFrameColumns)(source, { start: location }, { highlightCode: true });
|
|
139
|
+
return code;
|
|
140
|
+
}
|
|
141
|
+
catch (_) {
|
|
142
|
+
// ignore error
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
exports.highLightSource = highLightSource;
|
|
146
|
+
// serializeError prefers receiving proper Errors, but since at runtime
|
|
147
|
+
// non Error exceptions can be thrown, it tolerates though. The
|
|
148
|
+
// redundant type Error | any expresses that.
|
|
149
|
+
function serializeError(error, highlightCode = true) {
|
|
150
|
+
if (!(error instanceof Error) || !error.stack) {
|
|
151
|
+
return { message: `thrown: ${(0, util_1.inspect)(error)}` };
|
|
152
|
+
}
|
|
153
|
+
const testErr = { message: error.message };
|
|
154
|
+
const { message, stack, location } = prepareError(error);
|
|
155
|
+
testErr.message = message;
|
|
156
|
+
if (stack) {
|
|
157
|
+
testErr.stack = stack;
|
|
158
|
+
}
|
|
159
|
+
if (location && highlightCode) {
|
|
160
|
+
testErr.location = location;
|
|
161
|
+
testErr.source = highLightSource(testErr.location);
|
|
162
|
+
}
|
|
163
|
+
return testErr;
|
|
164
|
+
}
|
|
165
|
+
exports.serializeError = serializeError;
|
|
166
|
+
function renderError(error) {
|
|
167
|
+
const summary = [];
|
|
168
|
+
// push empty string to add a new line before rendering error
|
|
169
|
+
summary.push('');
|
|
170
|
+
summary.push(error.message);
|
|
171
|
+
if (error.source) {
|
|
172
|
+
summary.push('');
|
|
173
|
+
summary.push(error.source);
|
|
174
|
+
}
|
|
175
|
+
if (error.stack) {
|
|
176
|
+
summary.push('');
|
|
177
|
+
summary.push((0, colors_1.gray)(error.stack));
|
|
178
|
+
}
|
|
179
|
+
summary.join('');
|
|
180
|
+
return summary.join('\n');
|
|
181
|
+
}
|
|
182
|
+
exports.renderError = renderError;
|
|
183
|
+
// strip color codes and ansi escape codes
|
|
184
|
+
const ansiRegex = new RegExp([
|
|
185
|
+
'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
|
|
186
|
+
'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))',
|
|
187
|
+
].join('|'), 'g');
|
|
188
|
+
function stripAnsiCodes(msg = '') {
|
|
189
|
+
return msg.replace(ansiRegex, '');
|
|
190
|
+
}
|
|
191
|
+
exports.stripAnsiCodes = stripAnsiCodes;
|
|
192
|
+
//# sourceMappingURL=reporter-util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reporter-util.js","sourceRoot":"","sources":["../../src/reporters/reporter-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ import { PerfMetrics } from '../common_types';
|
|
|
28
28
|
* Trace Event Format
|
|
29
29
|
* https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU
|
|
30
30
|
*/
|
|
31
|
-
export
|
|
31
|
+
export type TraceEvent = {
|
|
32
32
|
name: string;
|
|
33
33
|
cat: string;
|
|
34
34
|
pid: number;
|
|
@@ -56,7 +56,7 @@ export declare type TraceEvent = {
|
|
|
56
56
|
/**
|
|
57
57
|
* Exported data from Lighthouse trace processor
|
|
58
58
|
*/
|
|
59
|
-
|
|
59
|
+
type LHTraceTime = {
|
|
60
60
|
timeOrigin: number;
|
|
61
61
|
firstPaint: number;
|
|
62
62
|
firstContentfulPaint: number;
|
|
@@ -66,7 +66,7 @@ declare type LHTraceTime = {
|
|
|
66
66
|
load: number;
|
|
67
67
|
traceEnd: number;
|
|
68
68
|
};
|
|
69
|
-
export
|
|
69
|
+
export type LHProcessedNavigation = {
|
|
70
70
|
domContentLoadedEvt: TraceEvent;
|
|
71
71
|
firstContentfulPaintEvt: TraceEvent;
|
|
72
72
|
largestContentfulPaintEvt: TraceEvent;
|
|
@@ -75,7 +75,7 @@ export declare type LHProcessedNavigation = {
|
|
|
75
75
|
timings: LHTraceTime;
|
|
76
76
|
lcpInvalidated: boolean;
|
|
77
77
|
};
|
|
78
|
-
export
|
|
78
|
+
export type LHProcessedTrace = {
|
|
79
79
|
processEvents: Array<TraceEvent>;
|
|
80
80
|
frameEvents: Array<TraceEvent>;
|
|
81
81
|
mainThreadEvents: Array<TraceEvent>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace-processor.d.ts","sourceRoot":"","sources":["../../src/sdk/trace-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,wBAAwB,MAAM,sBAAsB,CAAC;AAM5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAK9C;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"trace-processor.d.ts","sourceRoot":"","sources":["../../src/sdk/trace-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,wBAAwB,MAAM,sBAAsB,CAAC;AAM5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAK9C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,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,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE;YACJ,gBAAgB,EAAE,OAAO,CAAC;YAC1B,aAAa,EAAE,OAAO,CAAC;YACvB,gBAAgB,EAAE,MAAM,CAAC;YACzB,KAAK,EAAE,MAAM,CAAC;YACd,oBAAoB,EAAE,MAAM,CAAC;SAC9B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC7B,CAAC;IACF;;;;;OAKG;IACH,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B,EAAE,MAAM,CAAC;IACxC,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,mBAAmB,EAAE,UAAU,CAAC;IAChC,uBAAuB,EAAE,UAAU,CAAC;IACpC,yBAAyB,EAAE,UAAU,CAAC;IACtC,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC/B,gBAAgB,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,cAAe,SAAQ,wBAAwB;WAC1C,4BAA4B,CAAC,KAAK,KAAA;IASlD,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC;;;;;;;CAwBnD"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elastic/synthetics",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"description": "Elastic synthetic monitoring agent",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"clean": "rimraf dist",
|
|
9
9
|
"prepublish": "npm run clean && npm run build",
|
|
10
|
-
"build": "tsc",
|
|
10
|
+
"build:lib": "tsc",
|
|
11
11
|
"build:locations": "sh utils/update_locations.sh",
|
|
12
|
+
"build": "node utils/build.js",
|
|
12
13
|
"watch": "tsc -w",
|
|
13
14
|
"lint": "eslint . --rulesdir utils/eslint-rules",
|
|
14
15
|
"lint:fix": "npm run lint -- --fix",
|
|
@@ -40,43 +41,51 @@
|
|
|
40
41
|
"author": "",
|
|
41
42
|
"license": "MIT",
|
|
42
43
|
"dependencies": {
|
|
44
|
+
"@babel/code-frame": "^7.22.13",
|
|
43
45
|
"archiver": "^5.3.1",
|
|
44
46
|
"commander": "^10.0.1",
|
|
45
47
|
"deepmerge": "^4.3.1",
|
|
46
48
|
"enquirer": "^2.3.6",
|
|
47
|
-
"esbuild": "^0.
|
|
48
|
-
"expect": "^28.1.3",
|
|
49
|
+
"esbuild": "^0.18.11",
|
|
49
50
|
"http-proxy": "^1.18.1",
|
|
50
51
|
"kleur": "^4.1.5",
|
|
51
52
|
"micromatch": "^4.0.5",
|
|
52
53
|
"pirates": "^4.0.5",
|
|
53
|
-
"playwright
|
|
54
|
-
"playwright-
|
|
54
|
+
"playwright": "=1.38.0",
|
|
55
|
+
"playwright-chromium": "=1.38.1",
|
|
56
|
+
"playwright-core": "=1.38.1",
|
|
55
57
|
"semver": "^7.5.2",
|
|
56
|
-
"sharp": "^0.32.
|
|
58
|
+
"sharp": "^0.32.6",
|
|
57
59
|
"snakecase-keys": "^4.0.1",
|
|
58
60
|
"sonic-boom": "^3.3.0",
|
|
59
61
|
"source-map-support": "^0.5.21",
|
|
60
|
-
"
|
|
62
|
+
"stack-utils": "^2.0.6",
|
|
61
63
|
"undici": "^5.21.2",
|
|
62
64
|
"yaml": "^2.2.2"
|
|
63
65
|
},
|
|
64
66
|
"devDependencies": {
|
|
67
|
+
"@commitlint/cli": "^17.7.1",
|
|
68
|
+
"@commitlint/config-conventional": "^17.7.0",
|
|
69
|
+
"@semantic-release/exec": "^6.0.3",
|
|
70
|
+
"@types/babel__code-frame": "^7.0.3",
|
|
65
71
|
"@types/jest": "^28.1.8",
|
|
66
72
|
"@types/micromatch": "^4.0.2",
|
|
67
73
|
"@types/node": "^16.11.59",
|
|
68
|
-
"@types/
|
|
74
|
+
"@types/semver": "^7",
|
|
75
|
+
"@types/stack-utils": "^2.0.1",
|
|
69
76
|
"@typescript-eslint/eslint-plugin": "^5.38.0",
|
|
70
77
|
"@typescript-eslint/parser": "^5.38.0",
|
|
71
78
|
"eslint": "^8.23.1",
|
|
72
79
|
"husky": "^4.3.6",
|
|
73
80
|
"is-positive": "3.1.0",
|
|
74
|
-
"jest": "^
|
|
81
|
+
"jest": "^29.6.1",
|
|
75
82
|
"jest-junit": "^15.0.0",
|
|
76
83
|
"lint-staged": "^10.5.3",
|
|
77
84
|
"prettier": "^2.7.1",
|
|
78
85
|
"rimraf": "^3.0.2",
|
|
79
|
-
"
|
|
86
|
+
"semantic-release": "^21.1.1",
|
|
87
|
+
"ts-jest": "^29.1.1",
|
|
88
|
+
"typescript": "^5.1.6",
|
|
80
89
|
"unzipper": "^0.10.11"
|
|
81
90
|
},
|
|
82
91
|
"engines": {
|
package/src/cli.ts
CHANGED
|
@@ -51,11 +51,13 @@ import { error } from './helpers';
|
|
|
51
51
|
import { LocationsMap } from './locations/public-locations';
|
|
52
52
|
import { createLightweightMonitors } from './push/monitor';
|
|
53
53
|
import { getVersion } from './push/kibana_api';
|
|
54
|
+
import { installTransform } from './core/transform';
|
|
54
55
|
|
|
55
56
|
/* eslint-disable-next-line @typescript-eslint/no-var-requires */
|
|
56
57
|
const { name, version } = require('../package.json');
|
|
57
58
|
|
|
58
|
-
const { params, pattern, playwrightOpts } =
|
|
59
|
+
const { params, pattern, playwrightOpts, auth, authMandatory } =
|
|
60
|
+
getCommonCommandOpts();
|
|
59
61
|
|
|
60
62
|
program
|
|
61
63
|
.name(`npx ${name}`)
|
|
@@ -78,8 +80,9 @@ program
|
|
|
78
80
|
)
|
|
79
81
|
.option('--inline', 'Run inline journeys from heartbeat')
|
|
80
82
|
.option('-r, --require <modules...>', 'module(s) to preload')
|
|
81
|
-
.option('--sandbox', 'enable chromium
|
|
83
|
+
.option('--sandbox', 'enable chromium sand-boxing')
|
|
82
84
|
.option('--rich-events', 'Mimics a heartbeat run')
|
|
85
|
+
.option('--no-headless', 'run browser in head-full mode')
|
|
83
86
|
.option(
|
|
84
87
|
'--capability <features...>',
|
|
85
88
|
'Enable capabilities through feature flags'
|
|
@@ -131,7 +134,7 @@ program
|
|
|
131
134
|
.action(async (cliArgs: CliArgs) => {
|
|
132
135
|
const tearDown = await globalSetup(cliArgs, program.args);
|
|
133
136
|
try {
|
|
134
|
-
const options = normalizeOptions(cliArgs, 'run');
|
|
137
|
+
const options = await normalizeOptions(cliArgs, 'run');
|
|
135
138
|
const results = await run(options);
|
|
136
139
|
/**
|
|
137
140
|
* Exit with error status if any journey fails
|
|
@@ -157,14 +160,6 @@ program
|
|
|
157
160
|
.description(
|
|
158
161
|
'Push all journeys in the current directory to create monitors within the Kibana monitor management UI'
|
|
159
162
|
)
|
|
160
|
-
.addOption(
|
|
161
|
-
new Option(
|
|
162
|
-
'--auth <auth>',
|
|
163
|
-
'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).'
|
|
164
|
-
)
|
|
165
|
-
.env('SYNTHETICS_API_KEY')
|
|
166
|
-
.makeOptionMandatory(true)
|
|
167
|
-
)
|
|
168
163
|
.option(
|
|
169
164
|
'--schedule <time-in-minutes>',
|
|
170
165
|
"schedule in minutes for the pushed monitors. Setting `10`, for example, configures monitors which don't have an interval defined to run every 10 minutes.",
|
|
@@ -190,6 +185,7 @@ program
|
|
|
190
185
|
'the target Kibana spaces for the pushed monitors — spaces help you organise pushed monitors.'
|
|
191
186
|
)
|
|
192
187
|
.option('-y, --yes', 'skip all questions and run non-interactively')
|
|
188
|
+
.addOption(authMandatory)
|
|
193
189
|
.addOption(pattern)
|
|
194
190
|
.addOption(params)
|
|
195
191
|
.addOption(playwrightOpts)
|
|
@@ -200,14 +196,14 @@ program
|
|
|
200
196
|
]);
|
|
201
197
|
try {
|
|
202
198
|
const settings = await loadSettings();
|
|
203
|
-
const options = normalizeOptions(
|
|
199
|
+
const options = (await normalizeOptions(
|
|
204
200
|
{
|
|
205
201
|
...program.opts(),
|
|
206
202
|
...settings,
|
|
207
203
|
...cmdOpts,
|
|
208
204
|
},
|
|
209
205
|
'push'
|
|
210
|
-
) as PushOptions;
|
|
206
|
+
)) as PushOptions;
|
|
211
207
|
await validatePush(options, settings);
|
|
212
208
|
const monitors = runner.buildMonitors(options);
|
|
213
209
|
if ((options as CliArgs).throttling == null) {
|
|
@@ -245,21 +241,26 @@ program
|
|
|
245
241
|
`List all locations to run the synthetics monitors. Pass optional '--url' and '--auth' to list private locations.`
|
|
246
242
|
)
|
|
247
243
|
.option('--url <url>', 'Kibana URL to fetch all public and private locations')
|
|
248
|
-
.
|
|
249
|
-
'--auth <auth>',
|
|
250
|
-
'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).'
|
|
251
|
-
)
|
|
244
|
+
.addOption(auth)
|
|
252
245
|
.action(async (cmdOpts: LocationCmdOptions) => {
|
|
246
|
+
const revert = installTransform();
|
|
247
|
+
const url = cmdOpts.url ?? (await loadSettings(true))?.url;
|
|
248
|
+
|
|
253
249
|
try {
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
250
|
+
if (url && cmdOpts.auth) {
|
|
251
|
+
const allLocations = await getLocations({
|
|
252
|
+
url,
|
|
253
|
+
auth: cmdOpts.auth,
|
|
254
|
+
});
|
|
255
|
+
renderLocations(formatLocations(allLocations));
|
|
256
|
+
} else {
|
|
257
|
+
renderLocations({ publicLocations: Object.keys(LocationsMap) });
|
|
258
258
|
}
|
|
259
|
-
renderLocations(locations);
|
|
260
259
|
} catch (e) {
|
|
261
260
|
e && error(e);
|
|
262
261
|
process.exit(1);
|
|
262
|
+
} finally {
|
|
263
|
+
revert();
|
|
263
264
|
}
|
|
264
265
|
});
|
|
265
266
|
|