slnodejs 6.1.225 → 6.1.246
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/browser-agent/dist/browser-agent-all.js +21 -3
- package/browser-agent/dist/browser-agent-all.min.js +21 -21
- package/browser-agent/package.json +1 -1
- package/package.json +2 -1
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js +78 -22
- package/tsOutputs/build-scanner/instrumentation/file-instrumenter.js.map +1 -1
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js +2 -2
- package/tsOutputs/build-scanner/instrumentation/instrumentation-utils.js.map +1 -1
- package/tsOutputs/cli-parse/child-process-wrapper.js +2 -2
- package/tsOutputs/cli-parse/child-process-wrapper.js.map +1 -1
- package/tsOutputs/cli-parse/executors/mocha-executor.js +6 -10
- package/tsOutputs/cli-parse/executors/mocha-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/run-executor.js +4 -7
- package/tsOutputs/cli-parse/executors/run-executor.js.map +1 -1
- package/tsOutputs/cli-parse/executors/test-listener-executor.js +13 -6
- package/tsOutputs/cli-parse/executors/test-listener-executor.js.map +1 -1
- package/tsOutputs/common/agent-events/agent-events-conracts.d.ts +2 -0
- package/tsOutputs/common/agent-events/agent-events-conracts.js +1 -0
- package/tsOutputs/common/agent-events/agent-events-conracts.js.map +1 -1
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js +1 -0
- package/tsOutputs/common/agent-events/nodejs-env-info-builder.js.map +1 -1
- package/tsOutputs/common/config-process/config-loader.d.ts +1 -0
- package/tsOutputs/common/config-process/config-loader.js +6 -1
- package/tsOutputs/common/config-process/config-loader.js.map +1 -1
- package/tsOutputs/common/config-process/config.d.ts +1 -0
- package/tsOutputs/common/config-process/config.js +1 -0
- package/tsOutputs/common/config-process/config.js.map +1 -1
- package/tsOutputs/common/constants/sl-env-vars.d.ts +4 -0
- package/tsOutputs/common/constants/sl-env-vars.js +11 -0
- package/tsOutputs/common/constants/sl-env-vars.js.map +1 -1
- package/tsOutputs/common/http/backend-proxy.js.map +1 -1
- package/tsOutputs/common/utils/process-utils.js +33 -0
- package/tsOutputs/common/utils/process-utils.js.map +1 -0
- package/tsOutputs/mocha-reporter/index.js +26 -1
- package/tsOutputs/mocha-reporter/index.js.map +1 -1
- package/tsOutputs/mocha-reporter/otel-agent.js +158 -0
- package/tsOutputs/mocha-reporter/otel-agent.js.map +1 -0
- package/tsOutputs/test-listener/agent-loader.js +15 -4
- package/tsOutputs/test-listener/agent-loader.js.map +1 -1
- package/tsOutputs/test-listener/otel-agent-loader.js +98 -0
- package/tsOutputs/test-listener/otel-agent-loader.js.map +1 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "slnodejs",
|
|
3
|
-
"version": "6.1.
|
|
3
|
+
"version": "6.1.246",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "tsOutputs/api.js",
|
|
6
6
|
"scripts": {
|
|
@@ -97,6 +97,7 @@
|
|
|
97
97
|
"eslint": "7.17.0",
|
|
98
98
|
"express": "4.17.1",
|
|
99
99
|
"fs-extra": "7.0.1",
|
|
100
|
+
"find-free-port": "^2.0.0",
|
|
100
101
|
"istanbul": "0.4.5",
|
|
101
102
|
"mocha": "6.2.3",
|
|
102
103
|
"mockdate": "2.0.2",
|
|
@@ -184,29 +184,35 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
184
184
|
return __awaiter(this, void 0, void 0, function () {
|
|
185
185
|
var syncInstrumenterFile, syncInstrumenterPath, config, defaultMaxBuffer, maxBuffer, childProcessArgs, instrumentationProcessResult, stdout, stderr;
|
|
186
186
|
return __generator(this, function (_a) {
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
187
|
+
switch (_a.label) {
|
|
188
|
+
case 0:
|
|
189
|
+
this.logger.debug("Instrumenting file '" + inputFile + "'. in a child process");
|
|
190
|
+
syncInstrumenterFile = 'sync-instrumenter.js';
|
|
191
|
+
syncInstrumenterPath = path.resolve(__dirname, syncInstrumenterFile);
|
|
192
|
+
config = {
|
|
193
|
+
coverageVariable: '$SealightsCoverage_' + this.opts.buildSessionId,
|
|
194
|
+
esModules: !!this.opts.esModules,
|
|
195
|
+
inputFile: inputFile,
|
|
196
|
+
fileKey: utils.toRelativePath(inputFile, this.opts.useRelativeSlMapping, this.opts.workspacepath)
|
|
197
|
+
};
|
|
198
|
+
defaultMaxBuffer = 256 * 1024 * 1024;
|
|
199
|
+
maxBuffer = sl_env_vars_1.SlEnvVars.CIA.getMaxBuffer() || defaultMaxBuffer;
|
|
200
|
+
this.notifyInputFileSize(inputFile, maxBuffer);
|
|
201
|
+
childProcessArgs = [syncInstrumenterPath, JSON.stringify(config)];
|
|
202
|
+
instrumentationProcessResult = childProcess.spawnSync(process.argv0, process.execArgv.concat(childProcessArgs), { maxBuffer: maxBuffer });
|
|
203
|
+
stdout = instrumentationProcessResult.stdout.toString();
|
|
204
|
+
stderr = instrumentationProcessResult.stderr.toString();
|
|
205
|
+
return [4 /*yield*/, this.handleSendingError({ inputFile: inputFile, instrumentationProcessResult: instrumentationProcessResult })];
|
|
206
|
+
case 1:
|
|
207
|
+
_a.sent();
|
|
208
|
+
if (stderr) {
|
|
209
|
+
this.resolveStderr(stderr, inputFile);
|
|
210
|
+
}
|
|
211
|
+
else if (instrumentationUtils.isFileInstrumentedSuccessfully(stdout, inputFile)) {
|
|
212
|
+
return [2 /*return*/, stdout];
|
|
213
|
+
}
|
|
214
|
+
return [2 /*return*/];
|
|
208
215
|
}
|
|
209
|
-
return [2 /*return*/];
|
|
210
216
|
});
|
|
211
217
|
});
|
|
212
218
|
};
|
|
@@ -228,6 +234,39 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
228
234
|
throw new Error(stderr);
|
|
229
235
|
}
|
|
230
236
|
};
|
|
237
|
+
FileInstrumenter.prototype.handleSendingError = function (_a) {
|
|
238
|
+
var _b, _c, _d, _e;
|
|
239
|
+
var instrumentationProcessResult = _a.instrumentationProcessResult, inputFile = _a.inputFile;
|
|
240
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
241
|
+
var stdout, stderr, inputFileSize, childProcessMessage;
|
|
242
|
+
return __generator(this, function (_f) {
|
|
243
|
+
switch (_f.label) {
|
|
244
|
+
case 0:
|
|
245
|
+
stdout = instrumentationProcessResult.stdout.toString();
|
|
246
|
+
stderr = instrumentationProcessResult.stderr.toString();
|
|
247
|
+
if (!((instrumentationProcessResult === null || instrumentationProcessResult === void 0 ? void 0 : instrumentationProcessResult.status) !== 0 || stderr || !((_b = stdout === null || stdout === void 0 ? void 0 : stdout.match) === null || _b === void 0 ? void 0 : _b.call(stdout, 'var cov_')))) return [3 /*break*/, 2];
|
|
248
|
+
return [4 /*yield*/, this.getFileInfo(inputFile)];
|
|
249
|
+
case 1:
|
|
250
|
+
inputFileSize = _f.sent();
|
|
251
|
+
childProcessMessage = JSON.stringify({
|
|
252
|
+
inputFileSize: {
|
|
253
|
+
size: (inputFileSize === null || inputFileSize === void 0 ? void 0 : inputFileSize.size) / (1024 * 1024),
|
|
254
|
+
dimension: 'Mb'
|
|
255
|
+
},
|
|
256
|
+
error: instrumentationProcessResult === null || instrumentationProcessResult === void 0 ? void 0 : instrumentationProcessResult.error,
|
|
257
|
+
status: instrumentationProcessResult === null || instrumentationProcessResult === void 0 ? void 0 : instrumentationProcessResult.status,
|
|
258
|
+
signal: instrumentationProcessResult === null || instrumentationProcessResult === void 0 ? void 0 : instrumentationProcessResult.signal,
|
|
259
|
+
stdout: (_c = stdout === null || stdout === void 0 ? void 0 : stdout.slice) === null || _c === void 0 ? void 0 : _c.call(stdout, 0, 1000),
|
|
260
|
+
stderr: (_d = stdout === null || stdout === void 0 ? void 0 : stdout.slice) === null || _d === void 0 ? void 0 : _d.call(stdout, 0, 1000),
|
|
261
|
+
output: (_e = instrumentationProcessResult === null || instrumentationProcessResult === void 0 ? void 0 : instrumentationProcessResult.output) === null || _e === void 0 ? void 0 : _e.toString().slice(0, 1000)
|
|
262
|
+
}, null, 2);
|
|
263
|
+
cockpit_notifier_1.CockpitNotifier.sendGenericMessage(childProcessMessage);
|
|
264
|
+
_f.label = 2;
|
|
265
|
+
case 2: return [2 /*return*/];
|
|
266
|
+
}
|
|
267
|
+
});
|
|
268
|
+
});
|
|
269
|
+
};
|
|
231
270
|
FileInstrumenter.prototype.isGotOutOfMemoryError = function (stdErr) {
|
|
232
271
|
stdErr = stdErr || '';
|
|
233
272
|
return stdErr.indexOf('out of memory') > -1;
|
|
@@ -280,6 +319,23 @@ var FileInstrumenter = /** @class */ (function () {
|
|
|
280
319
|
var folder = this.opts.outputPath;
|
|
281
320
|
return path.resolve(folder, this.name);
|
|
282
321
|
};
|
|
322
|
+
FileInstrumenter.prototype.getFileInfo = function (inputFile) {
|
|
323
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
324
|
+
var e_2;
|
|
325
|
+
return __generator(this, function (_a) {
|
|
326
|
+
switch (_a.label) {
|
|
327
|
+
case 0:
|
|
328
|
+
_a.trys.push([0, 2, , 3]);
|
|
329
|
+
return [4 /*yield*/, fs.promises.stat(inputFile)];
|
|
330
|
+
case 1: return [2 /*return*/, _a.sent()];
|
|
331
|
+
case 2:
|
|
332
|
+
e_2 = _a.sent();
|
|
333
|
+
return [2 /*return*/, null];
|
|
334
|
+
case 3: return [2 /*return*/];
|
|
335
|
+
}
|
|
336
|
+
});
|
|
337
|
+
});
|
|
338
|
+
};
|
|
283
339
|
FileInstrumenter.outOfMemoryDocumentationUrl = 'https://sealights.atlassian.net/wiki/spaces/SUP/pages/561905721/NodeJS+-+JavaScript+heap+out+of+memory';
|
|
284
340
|
return FileInstrumenter;
|
|
285
341
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/file-instrumenter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAoE;AACpE,2BAA6B;AAC7B,2BAA8B;AAC9B,iCAA8B;AAC9B,uBAAyB;AACzB,4CAA8C;AAC9C,iEAAoE;AACpE,6DAAgE;AAChE,8DAAiE;AACjE,+EAA2E;AAC3E,kEAA6D;AAI7D,gCAAmC;
|
|
1
|
+
{"version":3,"file":"file-instrumenter.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/file-instrumenter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,10 +46,10 @@ function replaceAt(string, index, replacement) {
|
|
|
46
46
|
function fixMissingSpaceAfterReturnStatement(input) {
|
|
47
47
|
return input.replace(/;return</g, ";return <");
|
|
48
48
|
}
|
|
49
|
-
function isFileInstrumentedSuccessfully(instrumentationContent,
|
|
49
|
+
function isFileInstrumentedSuccessfully(instrumentationContent, inputFile) {
|
|
50
50
|
instrumentationContent = instrumentationContent || "";
|
|
51
51
|
if (!instrumentationContent.match("var cov_")) {
|
|
52
|
-
throw new Error("Instrumented content for file '" +
|
|
52
|
+
throw new Error("Instrumented content for file '" + inputFile + "' is not as expected.");
|
|
53
53
|
}
|
|
54
54
|
return true;
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation-utils.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/instrumentation-utils.js"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,6FAA6F;AAC7F,wDAAwD;AACxD,EAAE;AACF,sCAAsC;AACtC,kDAAkD;AAClD,6DAA6D;AAC7D,SAAS,qBAAqB,CAAE,KAAK;IACjC,uEAAuE;IACvE,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,0BAA0B;IAC1B,OAAO;IACP,UAAU;IACV,UAAU;IACV,cAAc;IACd,EAAE;IACF,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAE5C,OAAO,IAAI,EAAE;QACT,uEAAuE;QACvE,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY;YACb,MAAM;QACV,IAAI,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC;QACpC,IAAI,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACzC,IAAI,UAAU,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE/C,+CAA+C;QAC/C,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACpD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAM;IAC5B,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC;AAED,SAAS,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7F,CAAC;AAID,6DAA6D;AAC7D,2HAA2H;AAC3H,EAAE;AACF,2EAA2E;AAC3E,mBAAmB;AACnB,6DAA6D;AAC7D,SAAS,mCAAmC,CAAG,KAAK;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,8BAA8B,CAAC,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"instrumentation-utils.js","sourceRoot":"","sources":["../../../build-scanner/instrumentation/instrumentation-utils.js"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,6FAA6F;AAC7F,wDAAwD;AACxD,EAAE;AACF,sCAAsC;AACtC,kDAAkD;AAClD,6DAA6D;AAC7D,SAAS,qBAAqB,CAAE,KAAK;IACjC,uEAAuE;IACvE,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,0BAA0B;IAC1B,OAAO;IACP,UAAU;IACV,UAAU;IACV,cAAc;IACd,EAAE;IACF,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAE5C,OAAO,IAAI,EAAE;QACT,uEAAuE;QACvE,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY;YACb,MAAM;QACV,IAAI,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC;QACpC,IAAI,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACzC,IAAI,UAAU,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE/C,+CAA+C;QAC/C,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACpD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAM;IAC5B,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC;AAED,SAAS,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7F,CAAC;AAID,6DAA6D;AAC7D,2HAA2H;AAC3H,EAAE;AACF,2EAA2E;AAC3E,mBAAmB;AACnB,6DAA6D;AAC7D,SAAS,mCAAmC,CAAG,KAAK;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,8BAA8B,CAAC,sBAAsB,EAAE,SAAS;IACrE,sBAAsB,GAAG,sBAAsB,IAAI,EAAE,CAAC;IACtD,IAAG,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAC;QACzC,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,SAAS,GAAG,uBAAuB,CAAC,CAAA;KAC3F;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;AAC7D,MAAM,CAAC,OAAO,CAAC,mCAAmC,GAAG,mCAAmC,CAAC;AACzF,MAAM,CAAC,OAAO,CAAC,8BAA8B,GAAG,8BAA8B,CAAC"}
|
|
@@ -53,9 +53,9 @@ var ChildProcessWrapper = /** @class */ (function () {
|
|
|
53
53
|
_this.logger.error("Error while trying to execute '" + command + "' with args '" + args + "'. error: " + err);
|
|
54
54
|
reject(err);
|
|
55
55
|
});
|
|
56
|
-
spawned.on('close', function () {
|
|
56
|
+
spawned.on('close', function (code) {
|
|
57
57
|
_this.logger.info("command '" + command + "' with args '" + args + "' finished successfully");
|
|
58
|
-
resolve();
|
|
58
|
+
resolve(code);
|
|
59
59
|
});
|
|
60
60
|
});
|
|
61
61
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-process-wrapper.js","sourceRoot":"","sources":["../../cli-parse/child-process-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoC;AACpC,2CAA+C;AAE/C;;GAEG;AACH;IAAA;IAiCA,CAAC;IAlBU,8BAAU,GAAjB,UAAkB,OAAe,EAAE,IAAc;QAAjD,iBAYC;QAXG,OAAO,IAAI,OAAO,CAAE,UAAC,OAAO,EAAE,MAAM;YAChC,IAAM,OAAO,GAAI,qBAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;YAChG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAA,GAAG;gBACnB,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAkC,OAAO,qBAAgB,IAAI,kBAAa,GAAK,CAAC,CAAC;gBACnG,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE;
|
|
1
|
+
{"version":3,"file":"child-process-wrapper.js","sourceRoot":"","sources":["../../cli-parse/child-process-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoC;AACpC,2CAA+C;AAE/C;;GAEG;AACH;IAAA;IAiCA,CAAC;IAlBU,8BAAU,GAAjB,UAAkB,OAAe,EAAE,IAAc;QAAjD,iBAYC;QAXG,OAAO,IAAI,OAAO,CAAE,UAAC,OAAO,EAAE,MAAM;YAChC,IAAM,OAAO,GAAI,qBAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;YAChG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAA,GAAG;gBACnB,KAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAkC,OAAO,qBAAgB,IAAI,kBAAa,GAAK,CAAC,CAAC;gBACnG,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,IAAI;gBACrB,KAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAY,OAAO,qBAAgB,IAAI,4BAAyB,CAAC,CAAC;gBACnF,OAAO,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEY,kCAAc,GAA3B,UAA4B,IAAc;;;;gBAChC,OAAO,GAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC/C,sBAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAC;;;KAC9C;IA/BsB,uBAAG,GAAG,KAAK,CAAC;IACZ,wBAAI,GAAG,MAAM,CAAC;IACd,wBAAI,GAAG,MAAM,CAAC;IACd,2BAAO,GAAG,SAAS,CAAC;IACpB,uBAAG,GAAG,KAAK,CAAC;IACZ,uBAAG,GAAG,KAAK,CAAC;IACZ,0BAAM,GAAG,GAAG,CAAC;IACb,gCAAY,GAAG,YAAY,CAAC;IAEpC,0BAAM,GAAG,sBAAa,CAAC,0BAA0B,EAAE,CAAC;IAuBvE,0BAAC;CAAA,AAjCD,IAiCC;AAjCY,kDAAmB"}
|
|
@@ -79,7 +79,9 @@ var MochaExecutor = /** @class */ (function (_super) {
|
|
|
79
79
|
mochaParams.push('-R');
|
|
80
80
|
mochaParams.push(this.mochaReporterPath);
|
|
81
81
|
mochaParams = mochaParams.concat(extraParams);
|
|
82
|
-
agent_loader_1.AgentLoader.run(mochaParams, this.useIstanbul, this.spawnRuntimeArgs, false
|
|
82
|
+
agent_loader_1.AgentLoader.run(mochaParams, this.useIstanbul, this.spawnRuntimeArgs, false, {
|
|
83
|
+
command: this.commandName
|
|
84
|
+
});
|
|
83
85
|
return [2 /*return*/];
|
|
84
86
|
}
|
|
85
87
|
});
|
|
@@ -102,15 +104,9 @@ var MochaExecutor = /** @class */ (function (_super) {
|
|
|
102
104
|
return __awaiter(this, void 0, void 0, function () {
|
|
103
105
|
var mochaPath, allArgs;
|
|
104
106
|
return __generator(this, function (_a) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
allArgs = this.extraArgs;
|
|
109
|
-
return [4 /*yield*/, child_process_wrapper_1.ChildProcessWrapper.runCommand(mochaPath, allArgs)];
|
|
110
|
-
case 1:
|
|
111
|
-
_a.sent();
|
|
112
|
-
return [2 /*return*/];
|
|
113
|
-
}
|
|
107
|
+
mochaPath = require.resolve(this.getMochaPath());
|
|
108
|
+
allArgs = this.extraArgs;
|
|
109
|
+
return [2 /*return*/, child_process_wrapper_1.ChildProcessWrapper.runCommand(mochaPath, allArgs)];
|
|
114
110
|
});
|
|
115
111
|
});
|
|
116
112
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mEAA8D;AAE9D,mGAA2F;AAC3F,kEAA6D;AAC7D,6BAA6B;AAC7B,iEAA6D;AAG7D;IAAmC,iCAAoB;IAAvD;QAAA,
|
|
1
|
+
{"version":3,"file":"mocha-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/mocha-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mEAA8D;AAE9D,mGAA2F;AAC3F,kEAA6D;AAC7D,6BAA6B;AAC7B,iEAA6D;AAG7D;IAAmC,iCAAoB;IAAvD;QAAA,qEAkCC;QAjCW,uBAAiB,GAAG,cAAO,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAA;QAClE,iBAAW,GAAG,OAAO,CAAC;;IAgCpC,CAAC;IA9BgB,oCAAY,GAAzB,UAA0B,IAAgB,EAAE,WAAqB;;;;;4BAC7D,qBAAM,iBAAM,YAAY,YAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;wBACtC,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClC,WAAW,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;wBAC/C,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;4BAC1B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBAC1B;wBAED,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;wBACtB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;wBACzC,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC9C,0BAAW,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE;4BACzE,OAAO,EAAE,IAAI,CAAC,WAAW;yBAC5B,CAAC,CAAC;;;;;KACN;IAEe,2CAAmB,GAAnC,UAAoC,YAA0B,EAAE,GAAe;;;;;;wBACrE,uBAAuB,GAAG,IAAI,0EAAiC,CAAC,YAAY,CAAC,CAAC;wBAC7E,qBAAM,uBAAuB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAA;4BAA/C,sBAAO,SAAwC,EAAC;;;;KACnD;IAEe,2CAAmB,GAAnC;;;;gBACU,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBACjD,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC/B,sBAAO,2CAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,EAAC;;;KAC7D;IAEO,oCAAY,GAApB;QACI,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC;IAC9E,CAAC;IACL,oBAAC;AAAD,CAAC,AAlCD,CAAmC,6CAAoB,GAkCtD;AAlCY,sCAAa"}
|
|
@@ -70,7 +70,9 @@ var RunExecutor = /** @class */ (function (_super) {
|
|
|
70
70
|
case 1:
|
|
71
71
|
_a.sent();
|
|
72
72
|
process.env['SL_useIstanbul'] = String(this.useIstanbul).toLowerCase();
|
|
73
|
-
agent_loader_1.AgentLoader.run(extraParams, this.useIstanbul, this.spawnRuntimeArgs
|
|
73
|
+
agent_loader_1.AgentLoader.run(extraParams, this.useIstanbul, this.spawnRuntimeArgs, true, {
|
|
74
|
+
command: this.commandName
|
|
75
|
+
});
|
|
74
76
|
return [2 /*return*/];
|
|
75
77
|
}
|
|
76
78
|
});
|
|
@@ -79,12 +81,7 @@ var RunExecutor = /** @class */ (function (_super) {
|
|
|
79
81
|
RunExecutor.prototype.runWithoutSealights = function () {
|
|
80
82
|
return __awaiter(this, void 0, void 0, function () {
|
|
81
83
|
return __generator(this, function (_a) {
|
|
82
|
-
|
|
83
|
-
case 0: return [4 /*yield*/, child_process_wrapper_1.ChildProcessWrapper.runNodeCommand(this.extraArgs)];
|
|
84
|
-
case 1:
|
|
85
|
-
_a.sent();
|
|
86
|
-
return [2 /*return*/];
|
|
87
|
-
}
|
|
84
|
+
return [2 /*return*/, child_process_wrapper_1.ChildProcessWrapper.runNodeCommand(this.extraArgs)];
|
|
88
85
|
});
|
|
89
86
|
});
|
|
90
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/run-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mEAA8D;AAC9D,kEAA6D;AAC7D,iEAA6D;AAE7D;IAAiC,+BAAoB;IAArD;QAAA,
|
|
1
|
+
{"version":3,"file":"run-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/run-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mEAA8D;AAC9D,kEAA6D;AAC7D,iEAA6D;AAE7D;IAAiC,+BAAoB;IAArD;QAAA,qEAeC;QAda,iBAAW,GAAG,KAAK,CAAC;;IAclC,CAAC;IAZgB,kCAAY,GAAzB,UAA0B,IAAc,EAAE,WAAqB;;;;;wBAC3D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;wBAC3B,qBAAM,iBAAM,YAAY,YAAC,IAAI,EAAE,WAAW,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;wBAC5C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;wBACvE,0BAAW,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE;4BACxE,OAAO,EAAE,IAAI,CAAC,WAAW;yBAC5B,CAAC,CAAC;;;;;KACN;IAEe,yCAAmB,GAAnC;;;gBACI,sBAAO,2CAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAC;;;KAC7D;IACL,kBAAC;AAAD,CAAC,AAfD,CAAiC,6CAAoB,GAepD;AAfY,kCAAW"}
|
|
@@ -78,19 +78,22 @@ var TestListenerExecutor = /** @class */ (function (_super) {
|
|
|
78
78
|
return __assign(__assign(__assign({}, args), this.baseData), { appname: this.baseData.appName, build: this.baseData.buildName, branch: this.baseData.branchName, labid: args.labid || this.baseData.buildSessionId, buildsessionid: this.baseData.buildSessionId });
|
|
79
79
|
};
|
|
80
80
|
TestListenerExecutor.prototype.innerExecute = function (args, extraArgs) {
|
|
81
|
+
var _a;
|
|
81
82
|
return __awaiter(this, void 0, void 0, function () {
|
|
82
|
-
var
|
|
83
|
-
return __generator(this, function (
|
|
84
|
-
switch (
|
|
83
|
+
var _b;
|
|
84
|
+
return __generator(this, function (_c) {
|
|
85
|
+
switch (_c.label) {
|
|
85
86
|
case 0:
|
|
86
87
|
this.isSLCommandRan = true;
|
|
87
|
-
|
|
88
|
+
_b = this;
|
|
88
89
|
return [4 /*yield*/, this.getRemoteConfigFromServer(this.mapArgs(args))];
|
|
89
90
|
case 1:
|
|
90
|
-
|
|
91
|
+
_b.remoteConfig = _c.sent();
|
|
91
92
|
this.saveConfigurationToProcessEnv(__assign(__assign({}, this.mapArgs(args)), this.remoteConfig));
|
|
92
93
|
process.env['SL_httpClientColoring'] = args.httpClientColoring.toString();
|
|
93
94
|
process.env['SL_httpServerColoring'] = args.httpServerColoring.toString();
|
|
95
|
+
if ((_a = this.remoteConfig) === null || _a === void 0 ? void 0 : _a.useOtel)
|
|
96
|
+
sl_env_vars_1.SlEnvVars.turnOtelOn();
|
|
94
97
|
return [2 /*return*/];
|
|
95
98
|
}
|
|
96
99
|
});
|
|
@@ -104,6 +107,7 @@ var TestListenerExecutor = /** @class */ (function (_super) {
|
|
|
104
107
|
*/
|
|
105
108
|
TestListenerExecutor.prototype.exitProcess = function (result, failbuild) {
|
|
106
109
|
return __awaiter(this, void 0, void 0, function () {
|
|
110
|
+
var code;
|
|
107
111
|
return __generator(this, function (_a) {
|
|
108
112
|
switch (_a.label) {
|
|
109
113
|
case 0:
|
|
@@ -111,7 +115,10 @@ var TestListenerExecutor = /** @class */ (function (_super) {
|
|
|
111
115
|
console.log('Sealights is disabled, running command without sealights');
|
|
112
116
|
return [4 /*yield*/, this.runWithoutSealights()];
|
|
113
117
|
case 1:
|
|
114
|
-
_a.sent();
|
|
118
|
+
code = _a.sent();
|
|
119
|
+
if (code !== 0) {
|
|
120
|
+
process.exit(code);
|
|
121
|
+
}
|
|
115
122
|
_a.label = 2;
|
|
116
123
|
case 2: return [2 /*return*/];
|
|
117
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-listener-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/test-listener-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA6C;AAE7C,kCAA2C;AAC3C,kEAA6D;AAE7D;IAAmD,wCAA0D;IAQzG;QAAA,YACI,iBAAO,SAGV;QAVS,oBAAc,GAAY,KAAK,CAAC;QAIlC,sBAAgB,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAI9C,KAAI,CAAC,gBAAgB,GAAG,KAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;QACtD,KAAI,CAAC,WAAW,GAAG,uBAAS,CAAC,aAAa,EAAE,CAAC;;IACjD,CAAC;IAEM,sCAAO,GAAd,UAAe,IAA0B;QACrC,sCACO,IAAI,GAAK,IAAI,CAAC,QAAQ,KACzB,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAC9B,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,EAC9B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAChC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EACjD,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,IAC9C;IACN,CAAC;IAEY,2CAAY,GAAzB,UAA0B,IAA2B,EAAE,SAAoB
|
|
1
|
+
{"version":3,"file":"test-listener-executor.js","sourceRoot":"","sources":["../../../cli-parse/executors/test-listener-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ export interface IMachineInfo {
|
|
|
30
30
|
}
|
|
31
31
|
export interface INodeJsEnvInfo {
|
|
32
32
|
nodeVersion: string;
|
|
33
|
+
execArgv: string[];
|
|
33
34
|
indexJsonDeps?: IMap;
|
|
34
35
|
}
|
|
35
36
|
export interface IBrowserEnvInfo {
|
|
@@ -104,6 +105,7 @@ export declare enum AgentEventCode {
|
|
|
104
105
|
UNSUPPORTED_RUNTIME = 4010,
|
|
105
106
|
THIRD_PARTY_PACKAGE_DETECTED = 4011,
|
|
106
107
|
THIRD_PARTY_FILE_DETECTED = 4012,
|
|
108
|
+
OTEL_ERROR = 4013,
|
|
107
109
|
FOOTPRINTS_LOSS = 4999,
|
|
108
110
|
LEAST_VERBOSE_LOG = 5001,
|
|
109
111
|
MOST_VERBOSE_LOG = 5999
|
|
@@ -44,6 +44,7 @@ var AgentEventCode;
|
|
|
44
44
|
AgentEventCode[AgentEventCode["UNSUPPORTED_RUNTIME"] = 4010] = "UNSUPPORTED_RUNTIME";
|
|
45
45
|
AgentEventCode[AgentEventCode["THIRD_PARTY_PACKAGE_DETECTED"] = 4011] = "THIRD_PARTY_PACKAGE_DETECTED";
|
|
46
46
|
AgentEventCode[AgentEventCode["THIRD_PARTY_FILE_DETECTED"] = 4012] = "THIRD_PARTY_FILE_DETECTED";
|
|
47
|
+
AgentEventCode[AgentEventCode["OTEL_ERROR"] = 4013] = "OTEL_ERROR";
|
|
47
48
|
AgentEventCode[AgentEventCode["FOOTPRINTS_LOSS"] = 4999] = "FOOTPRINTS_LOSS";
|
|
48
49
|
// Logs
|
|
49
50
|
AgentEventCode[AgentEventCode["LEAST_VERBOSE_LOG"] = 5001] = "LEAST_VERBOSE_LOG";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-events-conracts.js","sourceRoot":"","sources":["../../../common/agent-events/agent-events-conracts.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"agent-events-conracts.js","sourceRoot":"","sources":["../../../common/agent-events/agent-events-conracts.ts"],"names":[],"mappings":";;;AAyEA,IAAY,SAMX;AAND,WAAY,SAAS;IACjB,2CAA8B,CAAA;IAC9B,2CAA8B,CAAA;IAC9B,uDAA0C,CAAA;IAC1C,2CAA8B,CAAA;IAC9B,kCAAqB,CAAA;AACzB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAgBD,IAAY,cA0CX;AA1CD,WAAY,cAAc;IACtB,SAAS;IACT,oFAA0B,CAAA;IAC1B,wEAAoB,CAAA;IACpB,0EAAqB,CAAA;IACrB,kEAAiB,CAAA;IACjB,sFAA2B,CAAA;IAC3B,8HAA+C,CAAA;IAC/C,8FAA+B,CAAA;IAC/B,4FAA8B,CAAA;IAC9B,oEAAkB,CAAA;IAClB,wEAAoB,CAAA;IACpB,4FAA8B,CAAA;IAE9B,OAAO;IACP,4EAAsB,CAAA;IACtB,gGAAgC,CAAA;IAChC,WAAW;IACX,sDAAW,CAAA;IACX,0FAA6B,CAAA;IAC7B,gGAAgC,CAAA;IAEhC,SAAS;IACT,wEAAoB,CAAA;IACpB,8EAAuB,CAAA;IACvB,sGAAmC,CAAA;IACnC,wGAAoC,CAAA;IACpC,gGAAgC,CAAA;IAChC,kGAAiC,CAAA;IACjC,oGAAkC,CAAA;IAClC,sGAAmC,CAAA;IACnC,8HAA+C,CAAA;IAC/C,0EAAqB,CAAA;IACrB,oFAA0B,CAAA;IAC1B,sGAAmC,CAAA;IACnC,gGAAgC,CAAA;IAChC,kEAAkB,CAAA;IAClB,4EAAuB,CAAA;IAEvB,OAAO;IACP,gFAAwB,CAAA;IACxB,8EAAuB,CAAA;AAC3B,CAAC,EA1CW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QA0CzB;AAeD,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;AACvB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}
|
|
@@ -9,6 +9,7 @@ var NodejsEnvInfoBuilder = /** @class */ (function () {
|
|
|
9
9
|
NodejsEnvInfoBuilder.prototype.fillData = function () {
|
|
10
10
|
this.info.indexJsonDeps = this.dependencies;
|
|
11
11
|
this.info.nodeVersion = process.versions.node;
|
|
12
|
+
this.info.execArgv = process.execArgv;
|
|
12
13
|
};
|
|
13
14
|
NodejsEnvInfoBuilder.prototype.build = function () {
|
|
14
15
|
this.fillData();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodejs-env-info-builder.js","sourceRoot":"","sources":["../../../common/agent-events/nodejs-env-info-builder.ts"],"names":[],"mappings":";;;AAEA;IAII,8BAAY,YAAmB;QAFvB,SAAI,GAAoB,EAAE,CAAC;QAG/B,IAAI,CAAC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,uCAAQ,GAAR;QACI,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"nodejs-env-info-builder.js","sourceRoot":"","sources":["../../../common/agent-events/nodejs-env-info-builder.ts"],"names":[],"mappings":";;;AAEA;IAII,8BAAY,YAAmB;QAFvB,SAAI,GAAoB,EAAE,CAAC;QAG/B,IAAI,CAAC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAC3C,CAAC;IAED,uCAAQ,GAAR;QACI,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC1C,CAAC;IACM,oCAAK,GAAZ;QACI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACL,2BAAC;AAAD,CAAC,AAjBD,IAiBC;AAjBY,oDAAoB"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigLoader = void 0;
|
|
4
4
|
var config_system_1 = require("./config-system");
|
|
5
|
+
var config_1 = require("./config");
|
|
6
|
+
var sl_env_vars_1 = require("../constants/sl-env-vars");
|
|
5
7
|
var fs = require("fs");
|
|
6
8
|
var jwtDecode = require("jwt-decode");
|
|
7
|
-
var config_1 = require("./config");
|
|
8
9
|
var ConfigLoader = /** @class */ (function () {
|
|
9
10
|
function ConfigLoader(logger) {
|
|
10
11
|
this.logger = logger;
|
|
@@ -44,6 +45,7 @@ var ConfigLoader = /** @class */ (function () {
|
|
|
44
45
|
if (agentCfg.token.hasValue) {
|
|
45
46
|
this.loadConfigFromToken(agentCfg, agentCfg.token.value);
|
|
46
47
|
}
|
|
48
|
+
this.resolveUsingOtel(agentCfg);
|
|
47
49
|
this.printConfiguration(agentCfg);
|
|
48
50
|
//Rest of configuration will be overridden by server cfg (after agent is loaded)
|
|
49
51
|
return agentCfg;
|
|
@@ -56,6 +58,9 @@ var ConfigLoader = /** @class */ (function () {
|
|
|
56
58
|
this.logger.info('****************************************************');
|
|
57
59
|
this.logger.info(agentCfg.toJsonObject());
|
|
58
60
|
};
|
|
61
|
+
ConfigLoader.prototype.resolveUsingOtel = function (agentCfg) {
|
|
62
|
+
agentCfg.useOtel.value = sl_env_vars_1.SlEnvVars.shouldUseOtel();
|
|
63
|
+
};
|
|
59
64
|
ConfigLoader.prototype.loadConfigFromToken = function (agentCfg, token) {
|
|
60
65
|
if (!token)
|
|
61
66
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../common/config-process/config-loader.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../../common/config-process/config-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare class AgentConfig extends BaseConfiguration {
|
|
|
13
13
|
interval: NumberConfigKey;
|
|
14
14
|
testStatusCheckInterval: NumberConfigKey;
|
|
15
15
|
enabled: BooleanConfigKey;
|
|
16
|
+
useOtel: BooleanConfigKey;
|
|
16
17
|
sendFootprints: BooleanConfigKey;
|
|
17
18
|
sendEvents: BooleanConfigKey;
|
|
18
19
|
sendLogs: BooleanConfigKey;
|
|
@@ -32,6 +32,7 @@ var AgentConfig = /** @class */ (function (_super) {
|
|
|
32
32
|
_this.interval = new config_system_1.NumberConfigKey(false, 10000);
|
|
33
33
|
_this.testStatusCheckInterval = new config_system_1.NumberConfigKey(false, 30000);
|
|
34
34
|
_this.enabled = new config_system_1.BooleanConfigKey(false, true);
|
|
35
|
+
_this.useOtel = new config_system_1.BooleanConfigKey(false, false);
|
|
35
36
|
_this.sendFootprints = new config_system_1.BooleanConfigKey(false, true);
|
|
36
37
|
_this.sendEvents = new config_system_1.BooleanConfigKey(false, true);
|
|
37
38
|
_this.sendLogs = new config_system_1.BooleanConfigKey(false, false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../common/config-process/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAAsG;AAEtG;IAAiC,+BAAiB;IAAlD;QAAA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../common/config-process/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare class SlEnvVars {
|
|
|
15
15
|
static FOOTPRINTS_BUFFER_THRESHOLD_MB: string;
|
|
16
16
|
static BLOCK_BROWSER_HTTP_TRAFFIC: string;
|
|
17
17
|
static DISABLE_HOOK_DEPENDENCY_GUARD: string;
|
|
18
|
+
static USE_OTEL_AGENT: string;
|
|
18
19
|
static USE_SL_MAPPING: string;
|
|
19
20
|
static getHttpTimeout(): number | null;
|
|
20
21
|
static getHttpMaxAttempts(): number | null;
|
|
@@ -33,7 +34,10 @@ export declare class SlEnvVars {
|
|
|
33
34
|
static getFootprintsBufferThresholdMb(): number;
|
|
34
35
|
static blockBrowserHttpTraffic(): boolean;
|
|
35
36
|
static getDisableHookDependencyGuard(): boolean;
|
|
37
|
+
static shouldUseOtel(): boolean;
|
|
36
38
|
static useSlMapping(): boolean;
|
|
39
|
+
static turnOtelOn(): void;
|
|
40
|
+
static turnOtelOff(): void;
|
|
37
41
|
static CIA: {
|
|
38
42
|
new (): {};
|
|
39
43
|
FILE_EXTENSIONS: string;
|
|
@@ -52,9 +52,18 @@ var SlEnvVars = /** @class */ (function () {
|
|
|
52
52
|
SlEnvVars.getDisableHookDependencyGuard = function () {
|
|
53
53
|
return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD);
|
|
54
54
|
};
|
|
55
|
+
SlEnvVars.shouldUseOtel = function () {
|
|
56
|
+
return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.USE_OTEL_AGENT);
|
|
57
|
+
};
|
|
55
58
|
SlEnvVars.useSlMapping = function () {
|
|
56
59
|
return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.USE_SL_MAPPING);
|
|
57
60
|
};
|
|
61
|
+
SlEnvVars.turnOtelOn = function () {
|
|
62
|
+
process.env[SlEnvVars.USE_OTEL_AGENT] = 'true';
|
|
63
|
+
};
|
|
64
|
+
SlEnvVars.turnOtelOff = function () {
|
|
65
|
+
process.env[SlEnvVars.USE_OTEL_AGENT] = 'false';
|
|
66
|
+
};
|
|
58
67
|
var _a;
|
|
59
68
|
//Controls the http timeout for all of the HTTP requests which
|
|
60
69
|
//are being sent use the HttpClient.
|
|
@@ -81,6 +90,8 @@ var SlEnvVars = /** @class */ (function () {
|
|
|
81
90
|
SlEnvVars.BLOCK_BROWSER_HTTP_TRAFFIC = 'SL_blockBrowserHttpTraffic';
|
|
82
91
|
//Determines if it should add dummy test in case of hooks dependency (Boolean)
|
|
83
92
|
SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD = 'SL_disableHookDependencyGuard';
|
|
93
|
+
// Allow to use SL agent alongside with node agent in bootstrap
|
|
94
|
+
SlEnvVars.USE_OTEL_AGENT = 'SL_useOtelAgent';
|
|
84
95
|
SlEnvVars.USE_SL_MAPPING = 'SL_useSlMapping';
|
|
85
96
|
SlEnvVars.CIA = (_a = /** @class */ (function () {
|
|
86
97
|
function class_1() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sl-env-vars.js","sourceRoot":"","sources":["../../../common/constants/sl-env-vars.ts"],"names":[],"mappings":";;;AAAA,4DAAyD;AAEzD;IAAA;
|
|
1
|
+
{"version":3,"file":"sl-env-vars.js","sourceRoot":"","sources":["../../../common/constants/sl-env-vars.ts"],"names":[],"mappings":"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"}
|