slnodejs 6.1.217 → 6.1.225

package/browser-agent/dist/browser-agent-all.js

@@ -43063,11 +43063,30 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             this.slMappingLoader.loadSlMapping(this.configuration.buildSessionId);
         };
         BrowserAgentInstanceFpv6.prototype.stopFootprintsProcess = function () {
-            this.flushFootprintsWatchdog.stop();
-            this.footprintsProcess.stop(function () { });
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.flushFootprintsWatchdog.stop();
+                            return [4, this.footprintsProcess.stop()];
+                        case 1:
+                            _a.sent();
+                            return [2];
+                    }
+                });
+            });
         };
         BrowserAgentInstanceFpv6.prototype.submitFootprints = function () {
-            this.footprintsProcess.submitQueuedFootprints(this.stateTracker.currentExecution);
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4, this.footprintsProcess.submitQueuedFootprints(this.stateTracker.currentExecution)];
+                        case 1:
+                            _a.sent();
+                            return [2];
+                    }
+                });
+            });
         };
         BrowserAgentInstanceFpv6.prototype.submitFootprintsSync = function () {
             return __awaiter(this, void 0, void 0, function () {
@@ -46558,7 +46577,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
             var _this = this;
             var slEnvVars = {};
             Object.keys(process.env).forEach(function (key) {
-                if (key.indexOf(SEALIGHTS_ENV_VAR_PREFIX) === 0) {
+                if (key.indexOf(SEALIGHTS_ENV_VAR_PREFIX) === 0 || key === 'NODE_OPTIONS') {
                     slEnvVars[key] = sensitive_data_filter_1.isSensitive(key, process.env[key], _this.logger) ?
                         AgentInstanceInfoBuilder.SECRET_VALUE_PLACEHOLDER : process.env[key];
                 }
@@ -47014,7 +47033,8 @@ var __extends = (this && this.__extends) || (function () {
             return null;
         };
         AgentInstanceData.prototype.resolveAgentVersionForBrowserAgent = function () {
-            return (window && window[agent_instance_info_builder_1.AgentInstanceInfoBuilder.SEALIGHTS_WINDOW_OBJECT] && window[agent_instance_info_builder_1.AgentInstanceInfoBuilder.SEALIGHTS_WINDOW_OBJECT].agentVersion) || agent_instance_info_builder_1.AgentInstanceInfoBuilder.DEFAULT_BROWSER_AGENT_VERSION;
+            var windowVar = typeof window !== 'undefined' ? window : null;
+            return (windowVar && windowVar[agent_instance_info_builder_1.AgentInstanceInfoBuilder.SEALIGHTS_WINDOW_OBJECT] && windowVar[agent_instance_info_builder_1.AgentInstanceInfoBuilder.SEALIGHTS_WINDOW_OBJECT].agentVersion) || agent_instance_info_builder_1.AgentInstanceInfoBuilder.DEFAULT_BROWSER_AGENT_VERSION;
         };
         return AgentInstanceData;
     }());
@@ -47022,7 +47042,7 @@ var __extends = (this && this.__extends) || (function () {
 });
 
 }).call(this)}).call(this,"/tsOutputs/common")
-},{"./agent-events/agent-events-conracts":289,"./agent-events/agent-instance-info-builder":291,"./utils/files-utils":334,"fs":69,"uuid":507}],300:[function(require,module,exports){
+},{"./agent-events/agent-events-conracts":289,"./agent-events/agent-instance-info-builder":291,"./utils/files-utils":335,"fs":69,"uuid":507}],300:[function(require,module,exports){
 (function (process){(function (){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
@@ -47686,24 +47706,24 @@ var __extends = (this && this.__extends) || (function () {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../utils/parsing-utils"], factory);
+        define(["require", "exports", "../utils/env-var-parsing"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SlEnvVars = void 0;
-    var parsing_utils_1 = require("../utils/parsing-utils");
+    var env_var_parsing_1 = require("../utils/env-var-parsing");
     var SlEnvVars = (function () {
         function SlEnvVars() {
         }
         SlEnvVars.getHttpTimeout = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.HTTP_TIMEOUT);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.HTTP_TIMEOUT);
         };
         SlEnvVars.getHttpMaxAttempts = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.HTTP_MAX_ATTEMPTS);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.HTTP_MAX_ATTEMPTS);
         };
         SlEnvVars.getHttpAttemptInterval = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.HTTP_ATTEMPT_INTERVAL);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.HTTP_ATTEMPT_INTERVAL);
         };
         SlEnvVars.inProductionListenerMode = function () {
             return !!process.env[SlEnvVars.PRODUCTION_LISTENER];
@@ -47717,34 +47737,34 @@ var __extends = (this && this.__extends) || (function () {
         SlEnvVars.getBasePath = function () {
             return process.env[SlEnvVars.BASE_PATH];
         };
-        SlEnvVars.isUseNewUniqueId = function () { return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.NEW_UNIQUE_ID); };
-        SlEnvVars.isUseIstanbul = function () { return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.USE_ISTANBUL); };
+        SlEnvVars.isUseNewUniqueId = function () { return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.NEW_UNIQUE_ID); };
+        SlEnvVars.isUseIstanbul = function () { return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.USE_ISTANBUL); };
         SlEnvVars.enableFootprintsV6 = function () {
-            return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.ENABLE_FOOTPRINTS_V6);
+            return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.ENABLE_FOOTPRINTS_V6);
         };
         SlEnvVars.getFootprintsCollectIntervalSecs = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.FOOTPRINTS_COLLECTION_INTERVAL_SECS);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.FOOTPRINTS_COLLECTION_INTERVAL_SECS);
         };
         SlEnvVars.getFootprintsSendMaxIntervalSecs = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.FOOTPRINTS_SEND_MAX_INTERVAL_SECS);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.FOOTPRINTS_SEND_MAX_INTERVAL_SECS);
         };
         SlEnvVars.getFootprintsQueueSize = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.FOOTPRINTS_QUEUE_SIZE);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.FOOTPRINTS_QUEUE_SIZE);
         };
         SlEnvVars.getExecutionQueryIntervalSecs = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.EXECUTION_QUERY_INTERVAL_SEC);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.EXECUTION_QUERY_INTERVAL_SEC);
         };
         SlEnvVars.getFootprintsBufferThresholdMb = function () {
-            return parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.FOOTPRINTS_BUFFER_THRESHOLD_MB);
+            return env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.FOOTPRINTS_BUFFER_THRESHOLD_MB);
         };
         SlEnvVars.blockBrowserHttpTraffic = function () {
-            return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.BLOCK_BROWSER_HTTP_TRAFFIC);
+            return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.BLOCK_BROWSER_HTTP_TRAFFIC);
         };
         SlEnvVars.getDisableHookDependencyGuard = function () {
-            return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD);
+            return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.DISABLE_HOOK_DEPENDENCY_GUARD);
         };
         SlEnvVars.useSlMapping = function () {
-            return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.USE_SL_MAPPING);
+            return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.USE_SL_MAPPING);
         };
         var _a;
         SlEnvVars.HTTP_TIMEOUT = 'SL_httpTimeout';
@@ -47783,13 +47803,13 @@ var __extends = (this && this.__extends) || (function () {
                     return process.env[SlEnvVars.CIA.SL_MAPPING_URL];
                 };
                 class_1.reduceInstrumentedFileSize = function () {
-                    return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.CIA.REDUCE_INSTRUMENTED_FILE_SIZE);
+                    return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.CIA.REDUCE_INSTRUMENTED_FILE_SIZE);
                 };
-                class_1.minifyInstrumentedOutput = function () { return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.CIA.MINIFY_INSTRUMENTED_OUTPUT); };
-                class_1.inProcessInstrumentation = function () { return parsing_utils_1.ParsingUtils.parseBoolean(SlEnvVars.CIA.IN_PROCESS_INSTRUMENTATION); };
+                class_1.minifyInstrumentedOutput = function () { return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.CIA.MINIFY_INSTRUMENTED_OUTPUT); };
+                class_1.inProcessInstrumentation = function () { return env_var_parsing_1.EnvVarParsing.parseBoolean(SlEnvVars.CIA.IN_PROCESS_INSTRUMENTATION); };
                 class_1.getMaxBuffer = function () {
                     var oneMB = 1024 * 1024;
-                    var bufferInBytes = parsing_utils_1.ParsingUtils.parseNumber(SlEnvVars.CIA.MAX_BUFFER);
+                    var bufferInBytes = env_var_parsing_1.EnvVarParsing.parseNumber(SlEnvVars.CIA.MAX_BUFFER);
                     if (bufferInBytes !== null) {
                         return bufferInBytes * oneMB;
                     }
@@ -47813,7 +47833,7 @@ var __extends = (this && this.__extends) || (function () {
 });
 
 }).call(this)}).call(this,require('_process'))
-},{"../utils/parsing-utils":335,"_process":179}],306:[function(require,module,exports){
+},{"../utils/env-var-parsing":334,"_process":179}],306:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -48147,7 +48167,7 @@ var __extends = (this && this.__extends) || (function () {
     }
 });
 
-},{"../system-date":333,"../utils/files-utils":334,"./istanbul-unique-id-converter":308,"path":171}],310:[function(require,module,exports){
+},{"../system-date":333,"../utils/files-utils":335,"./istanbul-unique-id-converter":308,"path":171}],310:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -48339,7 +48359,7 @@ var __extends = (this && this.__extends) || (function () {
     exports.OriginalModuleLoader = OriginalModuleLoader;
 });
 
-},{"../source-maps-utils":330,"../utils/files-utils":334,"../utils/validation-utils":337}],311:[function(require,module,exports){
+},{"../source-maps-utils":330,"../utils/files-utils":335,"../utils/validation-utils":337}],311:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -49005,7 +49025,7 @@ var __extends = (this && this.__extends) || (function () {
     exports.BaseBrowserHitsConverter = BaseBrowserHitsConverter;
 });
 
-},{"../../common/footprints-process-v6/hits-converter":319,"../utils/files-utils":334,"./location-formatter":321}],316:[function(require,module,exports){
+},{"../../common/footprints-process-v6/hits-converter":319,"../utils/files-utils":335,"./location-formatter":321}],316:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -49684,22 +49704,53 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             });
         };
         FootprintsProcess.prototype.updateConfig = function (updatedCfg) {
-            this.cfg = updatedCfg;
-            if (updatedCfg.sendFootprints.value === false || updatedCfg.enabled.value === false) {
-                cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_conracts_1.AgentEventCode.AGENT_MUTED);
-                this.footprintsBuffer.resetState();
-                this.stop(function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.cfg = updatedCfg;
+                            return [4, this.stopIfNeededAfterConfigChanged(updatedCfg)];
+                        case 1:
+                            _a.sent();
+                            this.sendToServerWatchdog.setInterval(this.cfg.footprintsSendIntervalSecs.value);
+                            this.footprintsBuffer.agentConfig = updatedCfg;
+                            return [2];
+                    }
                 });
-            }
-            this.sendToServerWatchdog.setInterval(this.cfg.footprintsSendIntervalSecs.value);
-            this.footprintsBuffer.agentConfig = updatedCfg;
+            });
+        };
+        FootprintsProcess.prototype.stopIfNeededAfterConfigChanged = function (updatedCfg) {
+            return __awaiter(this, void 0, void 0, function () {
+                var e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!(updatedCfg.sendFootprints.value === false || updatedCfg.enabled.value === false)) return [3, 4];
+                            cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_conracts_1.AgentEventCode.AGENT_MUTED);
+                            this.footprintsBuffer.resetState();
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            return [4, this.stop()];
+                        case 2:
+                            _a.sent();
+                            return [3, 4];
+                        case 3:
+                            e_1 = _a.sent();
+                            this.logger.error("Error stopping footprints process " + e_1.message);
+                            this.logger.debug(e_1.stackTrace);
+                            return [3, 4];
+                        case 4: return [2];
+                    }
+                });
+            });
         };
         FootprintsProcess.prototype.ensureKeepaliveThreadRunning = function () {
             this.keepaliveWatchdog.start();
         };
         FootprintsProcess.prototype.submitQueuedFootprints = function (execution) {
             return __awaiter(this, void 0, void 0, function () {
-                var packet, e_1;
+                var packet, e_2;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -49718,8 +49769,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                             this.logger.info("Footprints packet submitted successfully. packet contains " + packet.methods.length + " methods, " + packet.branches.length + " branches in " + packet.executions.length + " executions");
                             return [3, 5];
                         case 3:
-                            e_1 = _a.sent();
-                            this.logger.error("Error while submitting footprints '" + e_1 + "'");
+                            e_2 = _a.sent();
+                            this.logger.error("Error while submitting footprints '" + e_2 + "'");
                             cockpit_notifier_1.CockpitNotifier.sendEvent(agent_events_conracts_1.AgentEventCode.FOOTPRINTS_LOSS);
                             return [3, 5];
                         case 4:
@@ -49756,26 +49807,43 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 this.ensureKeepaliveThreadRunning();
             }
         };
-        FootprintsProcess.prototype.stop = function (callback) {
-            var _this = this;
-            this.sendToServerWatchdog.stop();
-            if (!this.shouldSubmitFootprints()) {
-                this.isRunning = false;
-                return callback();
-            }
-            this.isRunning = false;
-            this.flushCurrentFootprints(true);
-            var packet = this.footprintsBuffer.createPacket();
-            if (!packet) {
-                this.logger.info('No hits collected, nothing to submit');
-                return callback();
-            }
-            this.logger.debug('Start submitting footprints, triggered by stop event.');
-            this.backendProxy.submitFootprintsV6(packet, this.currentExecutionBsid, this.stateTracker.getTestStage(), this.cfg.buildSessionId.value)
-                .then(callback)
-                .catch(function (err) {
-                _this.logger.error(err);
-                return callback();
+        FootprintsProcess.prototype.stop = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var packet, e_3;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.sendToServerWatchdog.stop();
+                            if (!this.shouldSubmitFootprints()) {
+                                this.isRunning = false;
+                                return [2];
+                            }
+                            return [4, this.flushCurrentFootprints(true)];
+                        case 1:
+                            _a.sent();
+                            packet = this.footprintsBuffer.createPacket();
+                            this.isRunning = false;
+                            if (!packet) {
+                                this.logger.info('No hits collected, nothing to submit');
+                                return [2];
+                            }
+                            this.logger.info('Start submitting footprints, triggered by stop event.');
+                            _a.label = 2;
+                        case 2:
+                            _a.trys.push([2, 4, , 5]);
+                            return [4, this.backendProxy.submitFootprintsV6(packet, this.currentExecutionBsid, this.stateTracker.getTestStage(), this.cfg.buildSessionId.value)];
+                        case 3:
+                            _a.sent();
+                            this.logger.info('Final footprints submitted successfully');
+                            return [3, 5];
+                        case 4:
+                            e_3 = _a.sent();
+                            this.logger.error("Failed to submit final footprints, error: " + e_3.message);
+                            this.logger.debug(e_3);
+                            return [2];
+                        case 5: return [2];
+                    }
+                });
             });
         };
         FootprintsProcess.prototype.handleTestIdChanged = function (newTestIdentifier, previousTestIdentifier) {
@@ -49840,20 +49908,34 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         };
         FootprintsProcess.prototype.flushCurrentFootprints = function (isFinalFootprints) {
             if (isFinalFootprints === void 0) { isFinalFootprints = false; }
-            var currentTestIdentifier = this.stateTracker.getCurrentTestIdentifier();
-            if (currentTestIdentifier) {
-                var testIdentifierParts = state_tracker_1.StateTracker.splitTestIdToExecutionAndTestName(currentTestIdentifier);
-                this.logger.debug('Enqueue footprints interval - start enqueuing process. currentTestIdentifier: \'%s\'', currentTestIdentifier);
-                this.enqueueCurrentFootprints(this.stateTracker.currentExecution, testIdentifierParts.testName, isFinalFootprints);
-            }
-            else if (this.stateTracker.shouldCollectHits()) {
-                this.logger.debug('Enqueue footprints interval - start enqueuing process. anonymous footprints');
-                this.enqueueCurrentFootprints(this.stateTracker.currentExecution, null, isFinalFootprints);
-            }
-            else {
-                this.logger.info('Enqueue footprints interval - no active execution. skip enqueuing process.');
-                this.handleNoExecutionFound();
-            }
+            return __awaiter(this, void 0, void 0, function () {
+                var currentTestIdentifier, testIdentifierParts;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            currentTestIdentifier = this.stateTracker.getCurrentTestIdentifier();
+                            if (!currentTestIdentifier) return [3, 2];
+                            testIdentifierParts = state_tracker_1.StateTracker.splitTestIdToExecutionAndTestName(currentTestIdentifier);
+                            this.logger.debug('Enqueue footprints interval - start enqueuing process. currentTestIdentifier: \'%s\'', currentTestIdentifier);
+                            return [4, this.enqueueCurrentFootprints(this.stateTracker.currentExecution, testIdentifierParts.testName, isFinalFootprints)];
+                        case 1:
+                            _a.sent();
+                            return [3, 5];
+                        case 2:
+                            if (!this.stateTracker.shouldCollectHits()) return [3, 4];
+                            this.logger.debug('Enqueue footprints interval - start enqueuing process. anonymous footprints');
+                            return [4, this.enqueueCurrentFootprints(this.stateTracker.currentExecution, null, isFinalFootprints)];
+                        case 3:
+                            _a.sent();
+                            return [3, 5];
+                        case 4:
+                            this.logger.info('Enqueue footprints interval - no active execution. skip enqueuing process.');
+                            this.handleNoExecutionFound();
+                            _a.label = 5;
+                        case 5: return [2];
+                    }
+                });
+            });
         };
         FootprintsProcess.prototype.handleNoExecutionFound = function () {
             if (this.stateTracker.openExecutionFoundOnce) {
@@ -50641,7 +50723,7 @@ var __extends = (this && this.__extends) || (function () {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./contracts", "request", "zlib", "uuid/v1", "../constants/sl-env-vars", "./http-verb", "../utils/validation-utils"], factory);
+        define(["require", "exports", "./contracts", "request", "zlib", "../constants/sl-env-vars", "./http-verb", "../utils/validation-utils"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -50650,7 +50732,6 @@ var __extends = (this && this.__extends) || (function () {
     var contracts_1 = require("./contracts");
     var request = require("request");
     var zlib = require("zlib");
-    var uuid = require("uuid/v1");
     var sl_env_vars_1 = require("../constants/sl-env-vars");
     var http_verb_1 = require("./http-verb");
     var validation_utils_1 = require("../utils/validation-utils");
@@ -50683,9 +50764,11 @@ var __extends = (this && this.__extends) || (function () {
             var reportFile = requestData.reportFile;
             try {
                 var opts = this.createDefaultOptions(urlPath);
-                var id = uuid();
-                var onRequestCallback = this.createOnRequestCallback(http_verb_1.HttpVerb.POST, id, callback);
-                this.logger.info("Sending " + http_verb_1.HttpVerb.POST + " request. Url: '" + opts.url + "', requestId: '" + id + "'");
+                var onRequestCallback = this.createOnRequestCallback({
+                    httpVerb: http_verb_1.HttpVerb.POST,
+                    callback: callback,
+                });
+                this.logger.info("Sending " + http_verb_1.HttpVerb.POST + " request. Url: '" + opts.url + "'");
                 var req = request.post(opts, onRequestCallback);
                 var form = req.form();
                 form.append('file', JSON.stringify(agentData), {
@@ -50735,9 +50818,12 @@ var __extends = (this && this.__extends) || (function () {
                         opts.headers[header] = additionalHeaders[header];
                     }
                 }
-                var id = uuid();
-                var onRequestCallback = this.createOnRequestCallback(httpVerb, id, callback, isNotFoundAcceptable);
-                this.logger.info("Sending " + httpVerb + " request. Url: '" + opts.url + "', requestId: '" + id + "'");
+                var onRequestCallback = this.createOnRequestCallback({
+                    httpVerb: httpVerb,
+                    callback: callback,
+                    isNotFoundAcceptable: isNotFoundAcceptable,
+                });
+                this.logger.info("Sending " + httpVerb + " request. Url: '" + opts.url + "'");
                 if (httpVerb === http_verb_1.HttpVerb.GET) {
                     opts.json = true;
                     request.get(opts, onRequestCallback);
@@ -50765,16 +50851,16 @@ var __extends = (this && this.__extends) || (function () {
                 return callback(err, null, null);
             }
         };
-        HttpClient.prototype.createOnRequestCallback = function (httpVerb, requestId, callback, isNotFoundAcceptable) {
+        HttpClient.prototype.createOnRequestCallback = function (_a) {
             var _this = this;
-            if (isNotFoundAcceptable === void 0) { isNotFoundAcceptable = true; }
+            var httpVerb = _a.httpVerb, callback = _a.callback, isNotFoundAcceptable = _a.isNotFoundAcceptable;
             var handler = function (err, requestResponse, body) {
                 var txId = requestResponse && requestResponse.headers && requestResponse.headers['x-sl-txid'];
                 if (err || ((requestResponse != null) && (requestResponse.statusCode < 200 || requestResponse.statusCode >= 400))) {
                     var statusCode = -1;
                     if (requestResponse != null) {
                         statusCode = requestResponse.statusCode;
-                        _this.logger.warn("Got " + statusCode + " in '" + httpVerb + "' request. Request id:'" + requestId + "', Transaction ID:'" + txId + "'.");
+                        _this.logger.warn("Got " + statusCode + " in '" + httpVerb + "' request. Transaction ID:'" + txId + "'.");
                     }
                     if (err) {
                         err = new Error("HttpClient failed. Error: " + err.message + ", StatusCode: " + statusCode + ", Stack: " + err.stack);
@@ -50792,13 +50878,13 @@ var __extends = (this && this.__extends) || (function () {
                                 }).join('');
                         }
                         catch (e) {
-                            errorMessage += " Parsing of server response failed, body: " + body + ", request id:'" + requestId + "',error: " + e;
+                            errorMessage += "Parsing of server response failed, body: " + body + ", transaction ID:'" + txId + "', error: " + e;
                         }
                         err = new Error(errorMessage);
                     }
                     return callback(err, body, statusCode);
                 }
-                _this.logger.debug("'" + httpVerb + "' request was completed successfully. Request id:'" + requestId + "'. statusCode: " + requestResponse.statusCode + " body: " + body + ", Transaction ID: " + txId);
+                _this.logger.debug("'" + httpVerb + "' request was completed successfully. statusCode: " + requestResponse.statusCode + " body: " + body + ", Transaction ID: " + txId);
                 if (body && body.length > 0 && typeof body == 'string') {
                     try {
                         body = JSON.parse(body);
@@ -50846,7 +50932,7 @@ var __extends = (this && this.__extends) || (function () {
 });
 
 }).call(this)}).call(this,require('_process'),require("buffer").Buffer)
-},{"../constants/sl-env-vars":305,"../utils/validation-utils":337,"./contracts":325,"./http-verb":328,"_process":179,"buffer":71,"request":454,"uuid/v1":510,"zlib":68}],328:[function(require,module,exports){
+},{"../constants/sl-env-vars":305,"../utils/validation-utils":337,"./contracts":325,"./http-verb":328,"_process":179,"buffer":71,"request":454,"zlib":68}],328:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -51400,18 +51486,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 this.isRunning = true;
             }
         };
-        StateTracker.prototype.stop = function (callback) {
+        StateTracker.prototype.stop = function () {
             try {
                 if (!this.isRunning) {
-                    return callback();
+                    return;
                 }
                 this.checkTestStatusWatchdog.stop();
                 this.isRunning = false;
-                callback();
             }
             catch (err) {
                 this.logger.error("Error while stopping StateTracker. '" + err + "'");
-                return callback();
+                return;
             }
         };
         StateTracker.prototype.getTestStage = function () {
@@ -51538,6 +51623,49 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 });
 
 },{}],334:[function(require,module,exports){
+(function (process){(function (){
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.EnvVarParsing = void 0;
+    var EnvVarParsing = (function () {
+        function EnvVarParsing() {
+        }
+        EnvVarParsing.parseNumber = function (key) {
+            var valueFromEnv = process.env[key];
+            if (valueFromEnv != null) {
+                var valueAsNumber = Number.parseFloat(valueFromEnv);
+                if (!isNaN(valueAsNumber)) {
+                    valueFromEnv = valueAsNumber;
+                }
+                else {
+                    valueFromEnv = null;
+                }
+            }
+            return valueFromEnv;
+        };
+        EnvVarParsing.parseBoolean = function (key) {
+            var valueFromEnv = process.env[key];
+            if (valueFromEnv != null && typeof (valueFromEnv) == 'string') {
+                valueFromEnv = valueFromEnv.toLowerCase();
+            }
+            return valueFromEnv == 'true';
+        };
+        return EnvVarParsing;
+    }());
+    exports.EnvVarParsing = EnvVarParsing;
+});
+
+}).call(this)}).call(this,require('_process'))
+},{"_process":179}],335:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);
@@ -51594,50 +51722,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     exports.FilesUtils = FilesUtils;
 });
 
-},{"fs":69,"path":171}],335:[function(require,module,exports){
-(function (process){(function (){
-(function (factory) {
-    if (typeof module === "object" && typeof module.exports === "object") {
-        var v = factory(require, exports);
-        if (v !== undefined) module.exports = v;
-    }
-    else if (typeof define === "function" && define.amd) {
-        define(["require", "exports"], factory);
-    }
-})(function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.ParsingUtils = void 0;
-    var ParsingUtils = (function () {
-        function ParsingUtils() {
-        }
-        ParsingUtils.parseNumber = function (key) {
-            var valueFromEnv = process.env[key];
-            if (valueFromEnv != null) {
-                var valueAsNumber = Number.parseFloat(valueFromEnv);
-                if (!isNaN(valueAsNumber)) {
-                    valueFromEnv = valueAsNumber;
-                }
-                else {
-                    valueFromEnv = null;
-                }
-            }
-            return valueFromEnv;
-        };
-        ParsingUtils.parseBoolean = function (key) {
-            var valueFromEnv = process.env[key];
-            if (valueFromEnv != null && typeof (valueFromEnv) == 'string') {
-                valueFromEnv = valueFromEnv.toLowerCase();
-            }
-            return valueFromEnv == 'true';
-        };
-        return ParsingUtils;
-    }());
-    exports.ParsingUtils = ParsingUtils;
-});
-
-}).call(this)}).call(this,require('_process'))
-},{"_process":179}],336:[function(require,module,exports){
+},{"fs":69,"path":171}],336:[function(require,module,exports){
 (function (factory) {
     if (typeof module === "object" && typeof module.exports === "object") {
         var v = factory(require, exports);