@nsshunt/stsobservability 1.0.30 → 1.0.32

package/dist/stsobservability.umd.js

@@ -2,29 +2,16 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("lodash.clonedeep"), require("detect-node"), require("@nsshunt/stsutils"), require("tiny-emitter"), require("vue"), require("node:https"), require("axios"), require("socket.io-client")) : typeof define === "function" && define.amd ? define(["exports", "lodash.clonedeep", "detect-node", "@nsshunt/stsutils", "tiny-emitter", "vue", "node:https", "axios", "socket.io-client"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["@nsshunt/stsobservability"] = {}, global2.lodash, global2["detect-node"], global2.stsutils, global2["tiny-emitter"], global2.vue, global2.https, global2.axios, global2.socket["io-client"]));
 })(this, function(exports2, _cloneDeep, isNode, stsutils, tinyEmitter, vue, https, axios, socket_ioClient) {
   "use strict";var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
+var __typeError = (msg) => {
+  throw TypeError(msg);
 };
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
+var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var __privateWrapper = (obj, member, setter, getter) => ({
   set _(value) {
     __privateSet(obj, member, value, setter);
@@ -33,12 +20,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     return __privateGet(obj, member, getter);
   }
 });
-var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
-};
 
-  var _label, _options, _data, _a, _interval, _timeoutComputeVelocity, _lastVelocity, _delta, _maxVelocity, _timerInterval, _copy, _velocity, _velocityVal, _valStack, _averageValStack, _maxAverageValStack, _maxAverageIterations, _valStackMaxLength, _valStackAverage, _timeStamp, _maxTimeDiff, _vaTimeDiff, _velocityTimeDiff, _autoComputeVelocity, _autoComputeVelocityTimeout, _countDiff, _timeDiff, _deltaCountDiff, _deltaTimeDif, _minTimeForReporting, _averageVelocity, _ComputeVelocityByTimeDiff, ComputeVelocityByTimeDiff_fn, _ComputeVelocity, ComputeVelocity_fn, _SetupAutoComputeVelocity, SetupAutoComputeVelocity_fn, _GetVelocityStackAverage, GetVelocityStackAverage_fn, _GetVal, GetVal_fn, _SetVal, SetVal_fn, _GetVelocity, GetVelocity_fn, _GetMaxVelocity, GetMaxVelocity_fn, _GetDelta, GetDelta_fn, _GetTimeStamp, GetTimeStamp_fn, _GetCountDiff, GetCountDiff_fn, _GetTimeDiff, GetTimeDiff_fn, _GetDeltaCountDiff, GetDeltaCountDiff_fn, _GetDeltaTimeDif, GetDeltaTimeDif_fn, _GetAverageVelocity, GetAverageVelocity_fn, _histogramData, _val, _copy2, _GetVal2, GetVal_fn2, _SetVal2, SetVal_fn2, _GetHistogramData, GetHistogramData_fn, _SetHistogramData, SetHistogramData_fn, _messages, _readPos, _maxSize, _copy3, _useLatestMessages, _consoleLogging, _instrumentLogging, _winstonLogging, _stsLogger, _DumpToConsole, DumpToConsole_fn, _GetVal3, GetVal_fn3, _SetVal3, SetVal_fn3, _start, _copy4, _pauseVal, _GetVal4, GetVal_fn4, _SetVal4, SetVal_fn4, _convertMS, convertMS_fn, _val2, _maxval, _lastObservedValue, _timeSeriesList, _maxSampleSize, _timerInterval2, _observer, _min, _max, _observations, _total, _copy5, _GetVal5, GetVal_fn5, _SetVal5, SetVal_fn5, _GetMin, GetMin_fn, _GetMax, GetMax_fn, _GetAverage, GetAverage_fn, _GetAndResetMaxVal, GetAndResetMaxVal_fn, _NumberCompare, NumberCompare_fn, _GetPercentileData, GetPercentileData_fn, _val3, _copy6, _GetVal6, GetVal_fn6, _SetVal6, SetVal_fn6, _tinyEmitter, _RequestCompleted, _instruments, _inPublish, _observer2, _publishState, _GetInstrument, GetInstrument_fn, _ProcessTelemetryCommand, ProcessTelemetryCommand_fn, _CreateInstrument, CreateInstrument_fn, _CreateInstruments, CreateInstruments_fn, _GetPayloadData, GetPayloadData_fn, _PublishTimeoutLoop, PublishTimeoutLoop_fn, _UpdateState, UpdateState_fn, _httpsAgent, _kafkaLog, _maxLogLength, _socketSubscribeKeepAlive, _options2, _LogDebugMessage, LogDebugMessage_fn, _LogErrorMessage, LogErrorMessage_fn, _InvokeRESTAPI, InvokeRESTAPI_fn, _GetData, _SetupTimeout, SetupTimeout_fn, _AddKeepAlive, AddKeepAlive_fn, _RemoveKeepAlive, RemoveKeepAlive_fn, _messageWithAckPayloadRecords, _socket, _maxReties, _timeoutValue, _options3, _LogDebugMessage2, LogDebugMessage_fn2, _GetSubscribeKeepAliveAckEventName, GetSubscribeKeepAliveAckEventName_fn, _socketSubscribeKeepAlive2, _socket2, _options4, _socketIoMessageSender, _LogDebugMessage3, LogDebugMessage_fn3, _LogErrorMessage2, LogErrorMessage_fn2, _AddKeepAlive2, AddKeepAlive_fn2, _RemoveKeepAlive2, RemoveKeepAlive_fn2, _observabilitySocketIOSubscriber, _subscriptions, _kafkaHelper, _serviceModel, _agentModel, _lambdaModel, _options5, _LogDebugMessage4, LogDebugMessage_fn4, _LogErrorMessage3, LogErrorMessage_fn3, _options6, _sockets, _httpsAgent2, _LogDebugMessage5, LogDebugMessage_fn5, _LogErrorMessage4, LogErrorMessage_fn4, _EstablishSocketConnect, EstablishSocketConnect_fn;
+  var _a, _label, _options, _data, _interval, _timeoutComputeVelocity, _lastVelocity, _delta, _maxVelocity, _timerInterval, _copy, _velocity, _velocityVal, _valStack, _averageValStack, _maxAverageValStack, _maxAverageIterations, _valStackMaxLength, _valStackAverage, _timeStamp, _maxTimeDiff, _vaTimeDiff, _velocityTimeDiff, _autoComputeVelocity, _autoComputeVelocityTimeout, _countDiff, _timeDiff, _deltaCountDiff, _deltaTimeDif, _minTimeForReporting, _averageVelocity, _InstrumentVelocity_instances, ComputeVelocityByTimeDiff_fn, ComputeVelocity_fn, SetupAutoComputeVelocity_fn, GetVelocityStackAverage_fn, GetVal_fn, SetVal_fn, GetVelocity_fn, GetMaxVelocity_fn, GetDelta_fn, GetTimeStamp_fn, GetCountDiff_fn, GetTimeDiff_fn, GetDeltaCountDiff_fn, GetDeltaTimeDif_fn, GetAverageVelocity_fn, _histogramData, _val, _copy2, _InstrumentHistogram_instances, GetVal_fn2, SetVal_fn2, GetHistogramData_fn, SetHistogramData_fn, _messages, _readPos, _maxSize, _copy3, _useLatestMessages, _consoleLogging, _instrumentLogging, _winstonLogging, _stsLogger, _InstrumentLog_instances, DumpToConsole_fn, GetVal_fn3, SetVal_fn3, _start, _copy4, _pauseVal, _InstrumentTimerGauge_instances, GetVal_fn4, SetVal_fn4, convertMS_fn, _val2, _maxval, _lastObservedValue, _timeSeriesList, _maxSampleSize, _timerInterval2, _observer, _min, _max, _observations, _total, _copy5, _InstrumentGauge_instances, GetVal_fn5, SetVal_fn5, GetMin_fn, GetMax_fn, GetAverage_fn, GetAndResetMaxVal_fn, NumberCompare_fn, GetPercentileData_fn, _val3, _copy6, _InstrumentObject_instances, GetVal_fn6, SetVal_fn6, _tinyEmitter, _RequestCompleted, _instruments, _inPublish, _observer2, _publishState, _PublishInstrumentController_instances, GetInstrument_fn, ProcessTelemetryCommand_fn, CreateInstrument_fn, CreateInstruments_fn, GetPayloadData_fn, PublishTimeoutLoop_fn, UpdateState_fn, _httpsAgent, _kafkaLog, _maxLogLength, _socketSubscribeKeepAlive, _options2, _ObservabilityRESTAPISubscriber_instances, LogDebugMessage_fn, LogErrorMessage_fn, InvokeRESTAPI_fn, _GetData, SetupTimeout_fn, AddKeepAlive_fn, RemoveKeepAlive_fn, _messageWithAckPayloadRecords, _socket, _maxReties, _timeoutValue, _options3, _SocketIoMessageSender_instances, LogDebugMessage_fn2, GetSubscribeKeepAliveAckEventName_fn, _socketSubscribeKeepAlive2, _socket2, _options4, _socketIoMessageSender, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3, LogErrorMessage_fn2, AddKeepAlive_fn2, RemoveKeepAlive_fn2, _observabilitySocketIOSubscriber, _subscriptions, _kafkaHelper, _serviceModel, _agentModel, _lambdaModel, _options5, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4, LogErrorMessage_fn3, _options6, _sockets, _httpsAgent2, _SocketIoClientHelper_instances, LogDebugMessage_fn5, LogErrorMessage_fn4, EstablishSocketConnect_fn;
   var Gauge = /* @__PURE__ */ ((Gauge2) => {
     Gauge2["ACTIVE_REQUEST_GAUGE"] = "a";
     Gauge2["AUTHENTICATION_COUNT_GAUGE"] = "b";
@@ -89,6 +72,7 @@ var __privateMethod = (obj, member, method) => {
   }
   class InstrumentBaseTelemetry {
   }
+  _a = GaugeTypes.GAUGE_TYPE;
   class InstrumentBase {
     // Use for copy objects only.
     //protected _data: Record<string, any> = { };
@@ -177,7 +161,6 @@ var __privateMethod = (obj, member, method) => {
     }
     */
   }
-  _a = GaugeTypes.GAUGE_TYPE;
   _label = new WeakMap();
   _options = new WeakMap();
   _data = new WeakMap();
@@ -208,21 +191,7 @@ var __privateMethod = (obj, member, method) => {
     // window may be "spikey" depending on the volatility of the data being recorded.
     constructor(options = {}) {
       super(options);
-      __privateAdd(this, _ComputeVelocityByTimeDiff);
-      __privateAdd(this, _ComputeVelocity);
-      __privateAdd(this, _SetupAutoComputeVelocity);
-      __privateAdd(this, _GetVelocityStackAverage);
-      __privateAdd(this, _GetVal);
-      __privateAdd(this, _SetVal);
-      __privateAdd(this, _GetVelocity);
-      __privateAdd(this, _GetMaxVelocity);
-      __privateAdd(this, _GetDelta);
-      __privateAdd(this, _GetTimeStamp);
-      __privateAdd(this, _GetCountDiff);
-      __privateAdd(this, _GetTimeDiff);
-      __privateAdd(this, _GetDeltaCountDiff);
-      __privateAdd(this, _GetDeltaTimeDif);
-      __privateAdd(this, _GetAverageVelocity);
+      __privateAdd(this, _InstrumentVelocity_instances);
       //#val = 0;
       __privateAdd(this, _interval, null);
       __privateAdd(this, _timeoutComputeVelocity, null);
@@ -336,50 +305,50 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVal, GetVal_fn).call(this),
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetVal_fn).call(this),
           set: (value) => {
-            __privateMethod(this, _SetVal, SetVal_fn).call(this, value);
+            __privateMethod(this, _InstrumentVelocity_instances, SetVal_fn).call(this, value);
           }
         });
         Object.defineProperty(this, "maxVelocity", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetMaxVelocity, GetMaxVelocity_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetMaxVelocity_fn).call(this)
         });
         Object.defineProperty(this, "delta", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetDelta, GetDelta_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetDelta_fn).call(this)
         });
         Object.defineProperty(this, "velocity", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVelocity, GetVelocity_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetVelocity_fn).call(this)
         });
         Object.defineProperty(this, "va", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVelocityStackAverage, GetVelocityStackAverage_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetVelocityStackAverage_fn).call(this)
         });
         Object.defineProperty(this, "timeStamp", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetTimeStamp, GetTimeStamp_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetTimeStamp_fn).call(this)
         });
         Object.defineProperty(this, "countDiff", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetCountDiff, GetCountDiff_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetCountDiff_fn).call(this)
         });
         Object.defineProperty(this, "timeDiff", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetTimeDiff, GetTimeDiff_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetTimeDiff_fn).call(this)
         });
         Object.defineProperty(this, "deltaCountDiff", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetDeltaCountDiff, GetDeltaCountDiff_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetDeltaCountDiff_fn).call(this)
         });
         Object.defineProperty(this, "deltaTimeDif", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetDeltaTimeDif, GetDeltaTimeDif_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetDeltaTimeDif_fn).call(this)
         });
         Object.defineProperty(this, "averageVelocity", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetAverageVelocity, GetAverageVelocity_fn).call(this)
+          get: () => __privateMethod(this, _InstrumentVelocity_instances, GetAverageVelocity_fn).call(this)
         });
         if (__privateGet(this, _timerInterval) > 0 && __privateGet(this, _autoComputeVelocity) === false) {
           this._StartTimer();
@@ -410,7 +379,7 @@ var __privateMethod = (obj, member, method) => {
     }
     _StartTimer() {
       __privateSet(this, _interval, setInterval(() => {
-        __privateMethod(this, _ComputeVelocity, ComputeVelocity_fn).call(this);
+        __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocity_fn).call(this);
         let pushVal = __privateGet(this, _velocity);
         for (let i = 0; i < __privateGet(this, _maxAverageIterations); i++) {
           if (!__privateGet(this, _averageValStack)[i]) {
@@ -431,9 +400,9 @@ var __privateMethod = (obj, member, method) => {
     Inc(incVal = 1) {
       __privateSet(this, _velocityVal, __privateGet(this, _velocityVal) + incVal);
       if (__privateGet(this, _autoComputeVelocity)) {
-        __privateMethod(this, _ComputeVelocity, ComputeVelocity_fn).call(this);
+        __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocity_fn).call(this);
       } else {
-        __privateMethod(this, _SetupAutoComputeVelocity, SetupAutoComputeVelocity_fn).call(this);
+        __privateMethod(this, _InstrumentVelocity_instances, SetupAutoComputeVelocity_fn).call(this);
       }
     }
     StopTimer() {
@@ -478,7 +447,7 @@ var __privateMethod = (obj, member, method) => {
   _deltaTimeDif = new WeakMap();
   _minTimeForReporting = new WeakMap();
   _averageVelocity = new WeakMap();
-  _ComputeVelocityByTimeDiff = new WeakSet();
+  _InstrumentVelocity_instances = new WeakSet();
   ComputeVelocityByTimeDiff_fn = function(checkTimeDiff, checkDeltaTimeDiff) {
     let val = 0;
     let deltaVal = 0;
@@ -544,7 +513,6 @@ var __privateMethod = (obj, member, method) => {
       deltaTimeDiff
     };
   };
-  _ComputeVelocity = new WeakSet();
   ComputeVelocity_fn = function() {
     const dp = {
       timeStamp: performance.now(),
@@ -555,9 +523,9 @@ var __privateMethod = (obj, member, method) => {
     while (__privateGet(this, _valStack).length > 0 && __privateGet(this, _timeStamp) - __privateGet(this, _valStack)[0].timeStamp > __privateGet(this, _maxTimeDiff)) {
       __privateGet(this, _valStack).shift();
     }
-    const valStackAverageDataPoint = __privateMethod(this, _ComputeVelocityByTimeDiff, ComputeVelocityByTimeDiff_fn).call(this, __privateGet(this, _vaTimeDiff), 0);
+    const valStackAverageDataPoint = __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocityByTimeDiff_fn).call(this, __privateGet(this, _vaTimeDiff), 0);
     __privateSet(this, _valStackAverage, valStackAverageDataPoint.val);
-    const velocityDataPoint = __privateMethod(this, _ComputeVelocityByTimeDiff, ComputeVelocityByTimeDiff_fn).call(this, __privateGet(this, _velocityTimeDiff), __privateGet(this, _velocityTimeDiff) * 2);
+    const velocityDataPoint = __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocityByTimeDiff_fn).call(this, __privateGet(this, _velocityTimeDiff), __privateGet(this, _velocityTimeDiff) * 2);
     __privateSet(this, _velocity, velocityDataPoint.val);
     __privateSet(this, _delta, velocityDataPoint.val - velocityDataPoint.deltaVal);
     __privateSet(this, _countDiff, velocityDataPoint.countDiff);
@@ -569,65 +537,52 @@ var __privateMethod = (obj, member, method) => {
       __privateSet(this, _maxVelocity, __privateGet(this, _velocity));
     }
   };
-  _SetupAutoComputeVelocity = new WeakSet();
   SetupAutoComputeVelocity_fn = function() {
     if (__privateGet(this, _timeoutComputeVelocity)) {
       clearTimeout(__privateGet(this, _timeoutComputeVelocity));
     }
     __privateSet(this, _timeoutComputeVelocity, setTimeout(() => {
-      __privateMethod(this, _ComputeVelocity, ComputeVelocity_fn).call(this);
+      __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocity_fn).call(this);
     }, __privateGet(this, _autoComputeVelocityTimeout)));
   };
-  _GetVelocityStackAverage = new WeakSet();
   GetVelocityStackAverage_fn = function() {
     return this.GetNumber(__privateGet(this, _valStackAverage));
   };
-  _GetVal = new WeakSet();
   GetVal_fn = function() {
     return this.GetNumber(__privateGet(this, _velocityVal));
   };
-  _SetVal = new WeakSet();
   SetVal_fn = function(updatedValue) {
     __privateSet(this, _velocityVal, updatedValue);
     if (__privateGet(this, _autoComputeVelocity)) {
-      __privateMethod(this, _ComputeVelocity, ComputeVelocity_fn).call(this);
+      __privateMethod(this, _InstrumentVelocity_instances, ComputeVelocity_fn).call(this);
     } else {
-      __privateMethod(this, _SetupAutoComputeVelocity, SetupAutoComputeVelocity_fn).call(this);
+      __privateMethod(this, _InstrumentVelocity_instances, SetupAutoComputeVelocity_fn).call(this);
     }
   };
-  _GetVelocity = new WeakSet();
   GetVelocity_fn = function() {
     return this.GetNumber(__privateGet(this, _velocity));
   };
-  _GetMaxVelocity = new WeakSet();
   GetMaxVelocity_fn = function() {
     return this.GetNumber(__privateGet(this, _maxVelocity));
   };
-  _GetDelta = new WeakSet();
   GetDelta_fn = function() {
     return this.GetNumber(__privateGet(this, _delta));
   };
-  _GetTimeStamp = new WeakSet();
   GetTimeStamp_fn = function() {
     return this.GetNumber(__privateGet(this, _timeStamp));
   };
-  _GetCountDiff = new WeakSet();
   GetCountDiff_fn = function() {
     return this.GetNumber(__privateGet(this, _countDiff));
   };
-  _GetTimeDiff = new WeakSet();
   GetTimeDiff_fn = function() {
     return this.GetNumber(__privateGet(this, _timeDiff));
   };
-  _GetDeltaCountDiff = new WeakSet();
   GetDeltaCountDiff_fn = function() {
     return this.GetNumber(__privateGet(this, _deltaCountDiff));
   };
-  _GetDeltaTimeDif = new WeakSet();
   GetDeltaTimeDif_fn = function() {
     return this.GetNumber(__privateGet(this, _deltaTimeDif));
   };
-  _GetAverageVelocity = new WeakSet();
   GetAverageVelocity_fn = function() {
     return __privateGet(this, _averageVelocity);
   };
@@ -654,10 +609,7 @@ var __privateMethod = (obj, member, method) => {
   class InstrumentHistogram extends InstrumentBase {
     constructor(options = {}) {
       super(options);
-      __privateAdd(this, _GetVal2);
-      __privateAdd(this, _SetVal2);
-      __privateAdd(this, _GetHistogramData);
-      __privateAdd(this, _SetHistogramData);
+      __privateAdd(this, _InstrumentHistogram_instances);
       __privateAdd(this, _histogramData, []);
       __privateAdd(this, _val, 0);
       __privateAdd(this, _copy2, false);
@@ -710,16 +662,16 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVal2, GetVal_fn2).call(this),
+          get: () => __privateMethod(this, _InstrumentHistogram_instances, GetVal_fn2).call(this),
           set: (value) => {
-            __privateMethod(this, _SetVal2, SetVal_fn2).call(this, value);
+            __privateMethod(this, _InstrumentHistogram_instances, SetVal_fn2).call(this, value);
           }
         });
         Object.defineProperty(this, "hist", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetHistogramData, GetHistogramData_fn).call(this),
+          get: () => __privateMethod(this, _InstrumentHistogram_instances, GetHistogramData_fn).call(this),
           set: (value) => {
-            __privateMethod(this, _SetHistogramData, SetHistogramData_fn).call(this, value);
+            __privateMethod(this, _InstrumentHistogram_instances, SetHistogramData_fn).call(this, value);
           }
         });
       }
@@ -865,20 +817,17 @@ var __privateMethod = (obj, member, method) => {
   _histogramData = new WeakMap();
   _val = new WeakMap();
   _copy2 = new WeakMap();
-  _GetVal2 = new WeakSet();
+  _InstrumentHistogram_instances = new WeakSet();
   GetVal_fn2 = function() {
     return this.GetNumber(__privateGet(this, _val));
   };
-  _SetVal2 = new WeakSet();
   SetVal_fn2 = function(value) {
     __privateSet(this, _val, value);
     this.AddObservation(value);
   };
-  _GetHistogramData = new WeakSet();
   GetHistogramData_fn = function() {
     return __privateGet(this, _histogramData);
   };
-  _SetHistogramData = new WeakSet();
   SetHistogramData_fn = function(value) {
     __privateSet(this, _histogramData, value);
   };
@@ -907,9 +856,7 @@ var __privateMethod = (obj, member, method) => {
   class InstrumentLog extends InstrumentBase {
     constructor(options = {}) {
       super(options);
-      __privateAdd(this, _DumpToConsole);
-      __privateAdd(this, _GetVal3);
-      __privateAdd(this, _SetVal3);
+      __privateAdd(this, _InstrumentLog_instances);
       __privateAdd(this, _messages, []);
       __privateAdd(this, _readPos, 0);
       __privateAdd(this, _maxSize, 200);
@@ -919,7 +866,7 @@ var __privateMethod = (obj, member, method) => {
       __privateAdd(this, _consoleLogging, false);
       __privateAdd(this, _instrumentLogging, true);
       __privateAdd(this, _winstonLogging, false);
-      __privateAdd(this, _stsLogger, void 0);
+      __privateAdd(this, _stsLogger);
       __publicField(this, "val", []);
       if (typeof options.label === "undefined") {
         this.label = "InstrumentLog";
@@ -967,9 +914,9 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => _cloneDeep(__privateMethod(this, _GetVal3, GetVal_fn3).call(this)),
+          get: () => _cloneDeep(__privateMethod(this, _InstrumentLog_instances, GetVal_fn3).call(this)),
           set: (value) => {
-            __privateMethod(this, _SetVal3, SetVal_fn3).call(this, value);
+            __privateMethod(this, _InstrumentLog_instances, SetVal_fn3).call(this, value);
           }
         });
       }
@@ -1009,7 +956,7 @@ var __privateMethod = (obj, member, method) => {
     set consoleLogging(value) {
       __privateSet(this, _consoleLogging, value);
       if (value === true) {
-        __privateMethod(this, _DumpToConsole, DumpToConsole_fn).call(this);
+        __privateMethod(this, _InstrumentLog_instances, DumpToConsole_fn).call(this);
       }
     }
     get instrumentLogging() {
@@ -1024,32 +971,25 @@ var __privateMethod = (obj, member, method) => {
       }
     }
     error(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).error(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).error(message);
     }
     warn(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).warn(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).warn(message);
     }
     info(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).info(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).info(message);
     }
     http(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).http(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).http(message);
     }
     verbose(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).verbose(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).verbose(message);
     }
     debug(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).debug(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).debug(message);
     }
     silly(message) {
-      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger))
-        __privateGet(this, _stsLogger).silly(message);
+      if (__privateGet(this, _winstonLogging) && __privateGet(this, _stsLogger)) __privateGet(this, _stsLogger).silly(message);
     }
     LogMessage(message) {
       if (__privateGet(this, _copy3)) {
@@ -1104,14 +1044,13 @@ var __privateMethod = (obj, member, method) => {
   _instrumentLogging = new WeakMap();
   _winstonLogging = new WeakMap();
   _stsLogger = new WeakMap();
-  _DumpToConsole = new WeakSet();
+  _InstrumentLog_instances = new WeakSet();
   DumpToConsole_fn = function() {
     const logReport = this.GetMessagesSinceLastRead();
     for (let i = 0; i < logReport.length; i++) {
       console.log(logReport[i]);
     }
   };
-  _GetVal3 = new WeakSet();
   GetVal_fn3 = function() {
     if (__privateGet(this, _useLatestMessages)) {
       return this.GetMessagesSinceLastRead();
@@ -1119,7 +1058,6 @@ var __privateMethod = (obj, member, method) => {
       return __privateGet(this, _messages);
     }
   };
-  _SetVal3 = new WeakSet();
   SetVal_fn3 = function(updatedValue) {
     __privateSet(this, _messages, updatedValue);
     __privateSet(this, _readPos, 0);
@@ -1143,9 +1081,7 @@ var __privateMethod = (obj, member, method) => {
   class InstrumentTimerGauge extends InstrumentBase {
     constructor(options = {}) {
       super(options);
-      __privateAdd(this, _GetVal4);
-      __privateAdd(this, _SetVal4);
-      __privateAdd(this, _convertMS);
+      __privateAdd(this, _InstrumentTimerGauge_instances);
       __privateAdd(this, _start, 0);
       __privateAdd(this, _copy4, false);
       __privateAdd(this, _pauseVal, 0);
@@ -1171,9 +1107,9 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVal4, GetVal_fn4).call(this),
+          get: () => __privateMethod(this, _InstrumentTimerGauge_instances, GetVal_fn4).call(this),
           set: (value) => {
-            __privateMethod(this, _SetVal4, SetVal_fn4).call(this, value);
+            __privateMethod(this, _InstrumentTimerGauge_instances, SetVal_fn4).call(this, value);
           }
         });
       }
@@ -1221,7 +1157,7 @@ var __privateMethod = (obj, member, method) => {
   _start = new WeakMap();
   _copy4 = new WeakMap();
   _pauseVal = new WeakMap();
-  _GetVal4 = new WeakSet();
+  _InstrumentTimerGauge_instances = new WeakSet();
   GetVal_fn4 = function() {
     if (__privateGet(this, _pauseVal) !== 0) {
       return this.GetNumber(__privateGet(this, _pauseVal));
@@ -1232,7 +1168,6 @@ var __privateMethod = (obj, member, method) => {
       return this.GetNumber(performance.now() - __privateGet(this, _start));
     }
   };
-  _SetVal4 = new WeakSet();
   SetVal_fn4 = function(updatedValue) {
     if (isNode) {
       __privateSet(this, _start, performance.now() - updatedValue);
@@ -1240,7 +1175,6 @@ var __privateMethod = (obj, member, method) => {
       __privateSet(this, _start, performance.now() - updatedValue);
     }
   };
-  _convertMS = new WeakSet();
   convertMS_fn = function(ms) {
     let s = Math.floor(ms / 1e3);
     let m = Math.floor(s / 60);
@@ -1893,8 +1827,7 @@ var __privateMethod = (obj, member, method) => {
     }, []);
   }
   function getPsValue(p, list) {
-    if (p === 0)
-      return list[0];
+    if (p === 0) return list[0];
     var kIndex = Math.ceil(list.length * (p / 100)) - 1;
     return list[kIndex];
   }
@@ -1911,10 +1844,8 @@ var __privateMethod = (obj, member, method) => {
       }
       a = Number.isNaN(a) ? Number.NEGATIVE_INFINITY : a;
       b = Number.isNaN(b) ? Number.NEGATIVE_INFINITY : b;
-      if (a > b)
-        return 1;
-      if (a < b)
-        return -1;
+      if (a > b) return 1;
+      if (a < b) return -1;
       return 0;
     });
     if (ps.length === 1) {
@@ -1946,18 +1877,7 @@ var __privateMethod = (obj, member, method) => {
   class InstrumentGauge extends InstrumentBase {
     constructor(options = {}) {
       super(options);
-      /**
-      * If the gauge is being monitored as part of a time series, get the most recent recorded value (max value) from within the time interval
-      * otherwise, just return the current instant value.
-      */
-      __privateAdd(this, _GetVal5);
-      __privateAdd(this, _SetVal5);
-      __privateAdd(this, _GetMin);
-      __privateAdd(this, _GetMax);
-      __privateAdd(this, _GetAverage);
-      __privateAdd(this, _GetAndResetMaxVal);
-      __privateAdd(this, _NumberCompare);
-      __privateAdd(this, _GetPercentileData);
+      __privateAdd(this, _InstrumentGauge_instances);
       __privateAdd(this, _val2, 0);
       __privateAdd(this, _maxval, null);
       __privateAdd(this, _lastObservedValue, 0);
@@ -2011,15 +1931,15 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVal5, GetVal_fn5).call(this),
+          get: () => __privateMethod(this, _InstrumentGauge_instances, GetVal_fn5).call(this),
           set: (value) => {
-            __privateMethod(this, _SetVal5, SetVal_fn5).call(this, value);
+            __privateMethod(this, _InstrumentGauge_instances, SetVal_fn5).call(this, value);
           }
         });
         if (__privateGet(this, _timerInterval2) > 0) {
           Object.defineProperty(this, "percentile", {
             enumerable: true,
-            get: () => __privateMethod(this, _GetPercentileData, GetPercentileData_fn).call(this)
+            get: () => __privateMethod(this, _InstrumentGauge_instances, GetPercentileData_fn).call(this)
           });
           this._StartTimer();
         }
@@ -2051,21 +1971,21 @@ var __privateMethod = (obj, member, method) => {
     WithMin() {
       Object.defineProperty(this, "min", {
         enumerable: true,
-        get: () => __privateMethod(this, _GetMin, GetMin_fn).call(this)
+        get: () => __privateMethod(this, _InstrumentGauge_instances, GetMin_fn).call(this)
       });
       return this;
     }
     WithMax() {
       Object.defineProperty(this, "max", {
         enumerable: true,
-        get: () => __privateMethod(this, _GetMax, GetMax_fn).call(this)
+        get: () => __privateMethod(this, _InstrumentGauge_instances, GetMax_fn).call(this)
       });
       return this;
     }
     WithAverage() {
       Object.defineProperty(this, "avg", {
         enumerable: true,
-        get: () => __privateMethod(this, _GetAverage, GetAverage_fn).call(this)
+        get: () => __privateMethod(this, _InstrumentGauge_instances, GetAverage_fn).call(this)
       });
       return this;
     }
@@ -2076,7 +1996,7 @@ var __privateMethod = (obj, member, method) => {
           if (__privateGet(this, _timeSeriesList).length > __privateGet(this, _maxSampleSize)) {
             __privateGet(this, _timeSeriesList).shift();
           }
-          const maxval = __privateMethod(this, _GetAndResetMaxVal, GetAndResetMaxVal_fn).call(this);
+          const maxval = __privateMethod(this, _InstrumentGauge_instances, GetAndResetMaxVal_fn).call(this);
           __privateGet(this, _timeSeriesList).push(maxval);
         }, __privateGet(this, _timerInterval2)));
         if (isNode) {
@@ -2107,10 +2027,10 @@ var __privateMethod = (obj, member, method) => {
       }
     }
     Inc(incVal = 1) {
-      __privateMethod(this, _SetVal5, SetVal_fn5).call(this, __privateGet(this, _val2) + incVal);
+      __privateMethod(this, _InstrumentGauge_instances, SetVal_fn5).call(this, __privateGet(this, _val2) + incVal);
     }
     Dec(decVal = 1) {
-      __privateMethod(this, _SetVal5, SetVal_fn5).call(this, __privateGet(this, _val2) - decVal);
+      __privateMethod(this, _InstrumentGauge_instances, SetVal_fn5).call(this, __privateGet(this, _val2) - decVal);
     }
     ProcessTelemetry(telemetry) {
       if (telemetry.Inc) {
@@ -2136,7 +2056,11 @@ var __privateMethod = (obj, member, method) => {
   _observations = new WeakMap();
   _total = new WeakMap();
   _copy5 = new WeakMap();
-  _GetVal5 = new WeakSet();
+  _InstrumentGauge_instances = new WeakSet();
+  /**
+  * If the gauge is being monitored as part of a time series, get the most recent recorded value (max value) from within the time interval
+  * otherwise, just return the current instant value.
+  */
   GetVal_fn5 = function() {
     if (__privateGet(this, _timerInterval2) > 0 && __privateGet(this, _observer) !== null) {
       if (__privateGet(this, _maxval) === null) {
@@ -2147,7 +2071,6 @@ var __privateMethod = (obj, member, method) => {
     }
     return this.GetNumber(__privateGet(this, _val2));
   };
-  _SetVal5 = new WeakSet();
   SetVal_fn5 = function(updatedValue) {
     __privateSet(this, _val2, updatedValue);
     __privateWrapper(this, _observations)._++;
@@ -2171,25 +2094,21 @@ var __privateMethod = (obj, member, method) => {
       }
     }
   };
-  _GetMin = new WeakSet();
   GetMin_fn = function() {
     if (__privateGet(this, _min) !== null) {
       return __privateGet(this, _min);
     }
     return 0;
   };
-  _GetMax = new WeakSet();
   GetMax_fn = function() {
     return __privateGet(this, _max);
   };
-  _GetAverage = new WeakSet();
   GetAverage_fn = function() {
     if (__privateGet(this, _observations) > 0) {
       return __privateGet(this, _total) / __privateGet(this, _observations);
     }
     return 0;
   };
-  _GetAndResetMaxVal = new WeakSet();
   GetAndResetMaxVal_fn = function() {
     if (__privateGet(this, _maxval) === null) {
       return __privateGet(this, _lastObservedValue);
@@ -2198,14 +2117,12 @@ var __privateMethod = (obj, member, method) => {
     __privateSet(this, _maxval, null);
     return retVal;
   };
-  _NumberCompare = new WeakSet();
   NumberCompare_fn = function(a, b) {
     return a - b;
   };
-  _GetPercentileData = new WeakSet();
   GetPercentileData_fn = function() {
     const sortedList = __privateGet(this, _timeSeriesList).slice(0);
-    timsort.sort(sortedList, __privateMethod(this, _NumberCompare, NumberCompare_fn));
+    timsort.sort(sortedList, __privateMethod(this, _InstrumentGauge_instances, NumberCompare_fn));
     return percentile$1([50, 80, 90, 95, 99, 99.95], sortedList);
   };
   class InstrumentObjectOptions extends InstrumentBaseOptions {
@@ -2224,8 +2141,7 @@ var __privateMethod = (obj, member, method) => {
   class InstrumentObject extends InstrumentBase {
     constructor(options = {}) {
       super(options);
-      __privateAdd(this, _GetVal6);
-      __privateAdd(this, _SetVal6);
+      __privateAdd(this, _InstrumentObject_instances);
       __privateAdd(this, _val3, {});
       __privateAdd(this, _copy6, false);
       __publicField(this, "val");
@@ -2250,9 +2166,9 @@ var __privateMethod = (obj, member, method) => {
       } else {
         Object.defineProperty(this, "val", {
           enumerable: true,
-          get: () => __privateMethod(this, _GetVal6, GetVal_fn6).call(this),
+          get: () => __privateMethod(this, _InstrumentObject_instances, GetVal_fn6).call(this),
           set: (value) => {
-            __privateMethod(this, _SetVal6, SetVal_fn6).call(this, value);
+            __privateMethod(this, _InstrumentObject_instances, SetVal_fn6).call(this, value);
           }
         });
       }
@@ -2278,11 +2194,10 @@ var __privateMethod = (obj, member, method) => {
   }
   _val3 = new WeakMap();
   _copy6 = new WeakMap();
-  _GetVal6 = new WeakSet();
+  _InstrumentObject_instances = new WeakSet();
   GetVal_fn6 = function() {
     return __privateGet(this, _val3);
   };
-  _SetVal6 = new WeakSet();
   SetVal_fn6 = function(updatedValue) {
     __privateSet(this, _val3, updatedValue);
   };
@@ -2553,8 +2468,7 @@ var __privateMethod = (obj, member, method) => {
   var colorName;
   var hasRequiredColorName;
   function requireColorName() {
-    if (hasRequiredColorName)
-      return colorName;
+    if (hasRequiredColorName) return colorName;
     hasRequiredColorName = 1;
     colorName = {
       "aliceblue": [240, 248, 255],
@@ -2711,8 +2625,7 @@ var __privateMethod = (obj, member, method) => {
   var conversions;
   var hasRequiredConversions;
   function requireConversions() {
-    if (hasRequiredConversions)
-      return conversions;
+    if (hasRequiredConversions) return conversions;
     hasRequiredConversions = 1;
     const cssKeywords = requireColorName();
     const reverseKeywords = {};
@@ -3384,8 +3297,7 @@ var __privateMethod = (obj, member, method) => {
   var route;
   var hasRequiredRoute;
   function requireRoute() {
-    if (hasRequiredRoute)
-      return route;
+    if (hasRequiredRoute) return route;
     hasRequiredRoute = 1;
     const conversions2 = requireConversions();
     function buildGraph() {
@@ -3456,8 +3368,7 @@ var __privateMethod = (obj, member, method) => {
   var colorConvert;
   var hasRequiredColorConvert;
   function requireColorConvert() {
-    if (hasRequiredColorConvert)
-      return colorConvert;
+    if (hasRequiredColorConvert) return colorConvert;
     hasRequiredColorConvert = 1;
     const conversions2 = requireConversions();
     const route2 = requireRoute();
@@ -3694,8 +3605,7 @@ var __privateMethod = (obj, member, method) => {
   var templates;
   var hasRequiredTemplates;
   function requireTemplates() {
-    if (hasRequiredTemplates)
-      return templates;
+    if (hasRequiredTemplates) return templates;
     hasRequiredTemplates = 1;
     const TEMPLATE_REGEX = /(?:\\(u(?:[a-f\d]{4}|\{[a-f\d]{1,6}\})|x[a-f\d]{2}|.))|(?:\{(~)?(\w+(?:\([^)]*\))?(?:\.\w+(?:\([^)]*\))?)*)(?:[ \t]|(?=\r?\n)))|(\})|((?:.|[\r\n\f])+?)/gi;
     const STYLE_REGEX = /(?:^|\.)(\w+)(?:\(([^)]*)\))?/g;
@@ -3987,14 +3897,7 @@ var __privateMethod = (obj, member, method) => {
   class PublishInstrumentController extends stsutils.STSOptionsBase {
     constructor(options) {
       super(options);
-      __privateAdd(this, _GetInstrument);
-      __privateAdd(this, _ProcessTelemetryCommand);
-      // Instrument factory
-      __privateAdd(this, _CreateInstrument);
-      __privateAdd(this, _CreateInstruments);
-      __privateAdd(this, _GetPayloadData);
-      __privateAdd(this, _PublishTimeoutLoop);
-      __privateAdd(this, _UpdateState);
+      __privateAdd(this, _PublishInstrumentController_instances);
       __privateAdd(this, _instruments, {});
       __privateAdd(this, _inPublish, false);
       __privateAdd(this, _observer2, null);
@@ -4004,7 +3907,7 @@ var __privateMethod = (obj, member, method) => {
           LogMessage: message
         });
       });
-      __privateMethod(this, _UpdateState, UpdateState_fn).call(this, 0, "constructor()");
+      __privateMethod(this, _PublishInstrumentController_instances, UpdateState_fn).call(this, 0, "constructor()");
       this.SetupInstrumentation();
       this.StartPublish();
     }
@@ -4018,7 +3921,7 @@ var __privateMethod = (obj, member, method) => {
       try {
         __privateSet(this, _inPublish, true);
         if (Object.keys(__privateGet(this, _instruments)).length > 0) {
-          const instrumentPayload = __privateMethod(this, _GetPayloadData, GetPayloadData_fn).call(this, this.options.processContext, __privateGet(this, _instruments));
+          const instrumentPayload = __privateMethod(this, _PublishInstrumentController_instances, GetPayloadData_fn).call(this, this.options.processContext, __privateGet(this, _instruments));
           return await this.options.publisherTransport.Publish(instrumentPayload);
         } else {
           return true;
@@ -4034,8 +3937,8 @@ var __privateMethod = (obj, member, method) => {
         this.options.logger.debug(chalk$1.yellow(`StartPublish:${this.options.processContext.nid}: StartPublish called when not currently in the init state. Current State: [${__privateGet(this, _publishState)}]`));
         return false;
       }
-      __privateMethod(this, _UpdateState, UpdateState_fn).call(this, 1, "StartPublish()");
-      __privateMethod(this, _PublishTimeoutLoop, PublishTimeoutLoop_fn).call(this, this.options.publishInterval);
+      __privateMethod(this, _PublishInstrumentController_instances, UpdateState_fn).call(this, 1, "StartPublish()");
+      __privateMethod(this, _PublishInstrumentController_instances, PublishTimeoutLoop_fn).call(this, this.options.publishInterval);
       return true;
     }
     async EndPublish() {
@@ -4043,14 +3946,14 @@ var __privateMethod = (obj, member, method) => {
         this.options.logger.debug(chalk$1.yellow(`EndPublish:${this.options.processContext.nid}: EndPublish called when not within the started state. Current State: [${__privateGet(this, _publishState)}]`));
         return false;
       }
-      __privateMethod(this, _UpdateState, UpdateState_fn).call(this, 2, "EndPublish() (1)");
+      __privateMethod(this, _PublishInstrumentController_instances, UpdateState_fn).call(this, 2, "EndPublish() (1)");
       if (__privateGet(this, _observer2) !== null) {
         clearInterval(__privateGet(this, _observer2));
         __privateSet(this, _observer2, null);
         await this.Publish();
       }
       await this.options.publisherTransport.Close();
-      __privateMethod(this, _UpdateState, UpdateState_fn).call(this, 0, "EndPublish() (2)");
+      __privateMethod(this, _PublishInstrumentController_instances, UpdateState_fn).call(this, 0, "EndPublish() (2)");
       return true;
     }
     SetupInstrumentation() {
@@ -4062,7 +3965,7 @@ var __privateMethod = (obj, member, method) => {
         this.options.logger.debug(chalk$1.yellow(`SetupInstrumentation: No context defined within supplied options.`));
         return;
       }
-      __privateMethod(this, _CreateInstruments, CreateInstruments_fn).call(this, this.options.instrumentDefinitions);
+      __privateMethod(this, _PublishInstrumentController_instances, CreateInstruments_fn).call(this, this.options.instrumentDefinitions);
     }
     /**
      * Check if an instrument exists within the managed instrument collection
@@ -4082,7 +3985,7 @@ var __privateMethod = (obj, member, method) => {
      */
     UpdateInstrument(instrumentName, telemetry) {
       if (__privateGet(this, _instruments)[instrumentName]) {
-        __privateMethod(this, _ProcessTelemetryCommand, ProcessTelemetryCommand_fn).call(this, instrumentName, telemetry);
+        __privateMethod(this, _PublishInstrumentController_instances, ProcessTelemetryCommand_fn).call(this, instrumentName, telemetry);
       } else {
         this.options.logger.debug(chalk$1.red(`UpdateInstrument:${this.options.processContext.nid}: Attempted to UpdateInstrument before initialised.`));
       }
@@ -4207,18 +4110,17 @@ var __privateMethod = (obj, member, method) => {
   _inPublish = new WeakMap();
   _observer2 = new WeakMap();
   _publishState = new WeakMap();
-  _GetInstrument = new WeakSet();
+  _PublishInstrumentController_instances = new WeakSet();
   GetInstrument_fn = function(instrumentName) {
     return __privateGet(this, _instruments)[instrumentName];
   };
-  _ProcessTelemetryCommand = new WeakSet();
   ProcessTelemetryCommand_fn = function(instrumentName, telemetry) {
-    const instrument = __privateMethod(this, _GetInstrument, GetInstrument_fn).call(this, instrumentName);
+    const instrument = __privateMethod(this, _PublishInstrumentController_instances, GetInstrument_fn).call(this, instrumentName);
     if (instrument) {
       instrument.ProcessTelemetry(telemetry);
     }
   };
-  _CreateInstrument = new WeakSet();
+  // Instrument factory
   CreateInstrument_fn = function(instrumentType, options) {
     let instrument;
     switch (instrumentType) {
@@ -4245,17 +4147,15 @@ var __privateMethod = (obj, member, method) => {
     }
     return instrument;
   };
-  _CreateInstruments = new WeakSet();
   CreateInstruments_fn = function(payload) {
     payload.forEach((instrumentDefinition) => {
       const g = instrumentDefinition[0];
       const gt = instrumentDefinition[1];
       const instrumentBaseOptions = instrumentDefinition[2];
-      const instrument = __privateMethod(this, _CreateInstrument, CreateInstrument_fn).call(this, gt, instrumentBaseOptions);
+      const instrument = __privateMethod(this, _PublishInstrumentController_instances, CreateInstrument_fn).call(this, gt, instrumentBaseOptions);
       __privateGet(this, _instruments)[g] = instrument;
     });
   };
-  _GetPayloadData = new WeakSet();
   GetPayloadData_fn = function(context, instruments) {
     const payloadInstruments = {};
     for (const [key, value] of Object.entries(instruments)) {
@@ -4270,7 +4170,6 @@ var __privateMethod = (obj, member, method) => {
       instruments: payloadInstruments
     };
   };
-  _PublishTimeoutLoop = new WeakSet();
   PublishTimeoutLoop_fn = function(publishInterval) {
     __privateSet(this, _observer2, setTimeout(async () => {
       const start = performance.now();
@@ -4278,13 +4177,11 @@ var __privateMethod = (obj, member, method) => {
       const end = performance.now();
       const diff = end - start;
       if (__privateGet(this, _publishState) === 1) {
-        __privateMethod(this, _PublishTimeoutLoop, PublishTimeoutLoop_fn).call(this, this.options.publishInterval - diff);
+        __privateMethod(this, _PublishInstrumentController_instances, PublishTimeoutLoop_fn).call(this, this.options.publishInterval - diff);
       }
     }, publishInterval));
-    if (isNode)
-      __privateGet(this, _observer2).unref();
+    if (isNode) __privateGet(this, _observer2).unref();
   };
-  _UpdateState = new WeakSet();
   UpdateState_fn = function(newState, comment) {
     const previousState = __privateGet(this, _publishState);
     __privateSet(this, _publishState, newState);
@@ -4427,9 +4324,7 @@ var __privateMethod = (obj, member, method) => {
       extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
         d2.__proto__ = b2;
       } || function(d2, b2) {
-        for (var p in b2)
-          if (Object.prototype.hasOwnProperty.call(b2, p))
-            d2[p] = b2[p];
+        for (var p in b2) if (Object.prototype.hasOwnProperty.call(b2, p)) d2[p] = b2[p];
       };
       return extendStatics(d, b);
     };
@@ -4979,7 +4874,7 @@ var __privateMethod = (obj, member, method) => {
   class PublishTransportRESTServer extends stsutils.STSOptionsBase {
     constructor(options) {
       super(options);
-      __privateAdd(this, _httpsAgent, void 0);
+      __privateAdd(this, _httpsAgent);
       // Returns true for success or false for failure.
       __publicField(this, "Publish", async (payload) => {
         try {
@@ -5613,7 +5508,7 @@ var __privateMethod = (obj, member, method) => {
   class KafkaHelper {
     constructor(options) {
       __privateAdd(this, _kafkaLog, {});
-      __privateAdd(this, _maxLogLength, void 0);
+      __privateAdd(this, _maxLogLength);
       __publicField(this, "GetKafkaLogData", (kafkaTopic, modelNode) => {
         if (__privateGet(this, _kafkaLog)[kafkaTopic]) {
           modelNode.instruments[Gauge.LOGGER] = ObservabilityModelUtils.GetModelNodeRawStringArray(__privateGet(this, _kafkaLog)[kafkaTopic].kafkaLog);
@@ -5644,19 +5539,14 @@ var __privateMethod = (obj, member, method) => {
   _maxLogLength = new WeakMap();
   class ObservabilityRESTAPISubscriber {
     constructor(options) {
-      __privateAdd(this, _LogDebugMessage);
-      __privateAdd(this, _LogErrorMessage);
-      __privateAdd(this, _InvokeRESTAPI);
-      __privateAdd(this, _SetupTimeout);
-      __privateAdd(this, _AddKeepAlive);
-      __privateAdd(this, _RemoveKeepAlive);
+      __privateAdd(this, _ObservabilityRESTAPISubscriber_instances);
       __privateAdd(this, _socketSubscribeKeepAlive, {});
-      __privateAdd(this, _options2, void 0);
+      __privateAdd(this, _options2);
       // This is required becuase each call to .bind create a new replica bound function - so we need the same instance for on/off event bindings.
       __publicField(this, "KeepAliveAckBoundFunction");
       __privateAdd(this, _GetData, async (subscription) => {
         try {
-          const retVal = await __privateMethod(this, _InvokeRESTAPI, InvokeRESTAPI_fn).call(this, subscription);
+          const retVal = await __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, InvokeRESTAPI_fn).call(this, subscription);
           if (retVal) {
             const payload = {
               subscriptionKey: subscription.subscriptionKey,
@@ -5665,8 +5555,8 @@ var __privateMethod = (obj, member, method) => {
             subscription.cb(payload);
           }
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
-          __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subscription);
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subscription);
         }
       });
       __privateSet(this, _options2, options);
@@ -5676,13 +5566,13 @@ var __privateMethod = (obj, member, method) => {
     }
     async Subscribe(subscriptions) {
       subscriptions.map(async (subId) => {
-        __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subId);
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`ObservabilityRESTAPISubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subId);
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogDebugMessage_fn).call(this, chalk$1.yellow(`ObservabilityRESTAPISubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
         try {
-          __privateMethod(this, _AddKeepAlive, AddKeepAlive_fn).call(this, subId);
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, AddKeepAlive_fn).call(this, subId);
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:Subscribe(): Error: response: [${JSON.stringify(error)}]`));
-          __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subId);
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:Subscribe(): Error: response: [${JSON.stringify(error)}]`));
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subId);
         }
       });
     }
@@ -5691,22 +5581,20 @@ var __privateMethod = (obj, member, method) => {
     }
     UnSubscribe(subscriptions) {
       subscriptions.map(async (subId) => {
-        __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subId);
-        __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`ObservabilityRESTAPISubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subId);
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogDebugMessage_fn).call(this, chalk$1.yellow(`ObservabilityRESTAPISubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
       });
     }
   }
   _socketSubscribeKeepAlive = new WeakMap();
   _options2 = new WeakMap();
-  _LogDebugMessage = new WeakSet();
+  _ObservabilityRESTAPISubscriber_instances = new WeakSet();
   LogDebugMessage_fn = function(message) {
     __privateGet(this, _options2).logger.debug(message);
   };
-  _LogErrorMessage = new WeakSet();
   LogErrorMessage_fn = function(message) {
     __privateGet(this, _options2).logger.error(message);
   };
-  _InvokeRESTAPI = new WeakSet();
   InvokeRESTAPI_fn = async function(subscription) {
     const { subscriptionKey } = subscription;
     let url = "";
@@ -5816,7 +5704,6 @@ var __privateMethod = (obj, member, method) => {
     }
   };
   _GetData = new WeakMap();
-  _SetupTimeout = new WeakSet();
   SetupTimeout_fn = function(socketSubscribeKeepAlive, subscription, timeout) {
     return setTimeout(async () => {
       try {
@@ -5829,30 +5716,28 @@ var __privateMethod = (obj, member, method) => {
           if (timeoutDuration < 500) {
             timeoutDuration = 500;
           }
-          socketSubscribeKeepAlive.timeout = __privateMethod(this, _SetupTimeout, SetupTimeout_fn).call(this, socketSubscribeKeepAlive, subscription, timeoutDuration);
+          socketSubscribeKeepAlive.timeout = __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, SetupTimeout_fn).call(this, socketSubscribeKeepAlive, subscription, timeoutDuration);
         } else {
-          __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.yellow(`Subscription removed: [${socketSubscribeKeepAlive.id}]. Processing terminate.`));
+          __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogDebugMessage_fn).call(this, chalk$1.yellow(`Subscription removed: [${socketSubscribeKeepAlive.id}]. Processing terminate.`));
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
-        __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subscription);
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogErrorMessage_fn).call(this, chalk$1.red(`ObservabilityRESTAPISubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
+        __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subscription);
       }
     }, timeout);
   };
-  _AddKeepAlive = new WeakSet();
   AddKeepAlive_fn = function(subscription) {
-    __privateMethod(this, _RemoveKeepAlive, RemoveKeepAlive_fn).call(this, subscription);
+    __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, RemoveKeepAlive_fn).call(this, subscription);
     const socketSubscribeKeepAlive = {
       id: subscription.subscriptionKey.id
     };
-    socketSubscribeKeepAlive.timeout = __privateMethod(this, _SetupTimeout, SetupTimeout_fn).call(this, socketSubscribeKeepAlive, subscription, __privateGet(this, _options2).keepAlive);
+    socketSubscribeKeepAlive.timeout = __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, SetupTimeout_fn).call(this, socketSubscribeKeepAlive, subscription, __privateGet(this, _options2).keepAlive);
     __privateGet(this, _socketSubscribeKeepAlive)[subscription.subscriptionKey.id] = socketSubscribeKeepAlive;
     __privateGet(this, _GetData).call(this, subscription);
   };
-  _RemoveKeepAlive = new WeakSet();
   RemoveKeepAlive_fn = function(subscription) {
     if (__privateGet(this, _socketSubscribeKeepAlive)[subscription.subscriptionKey.id]) {
-      __privateMethod(this, _LogDebugMessage, LogDebugMessage_fn).call(this, chalk$1.gray(`ObservabilityRESTAPISubscriber:#RemoveKeepAlive(): subscriptionKey: [${subscription.subscriptionKey.id}]`));
+      __privateMethod(this, _ObservabilityRESTAPISubscriber_instances, LogDebugMessage_fn).call(this, chalk$1.gray(`ObservabilityRESTAPISubscriber:#RemoveKeepAlive(): subscriptionKey: [${subscription.subscriptionKey.id}]`));
       clearTimeout(__privateGet(this, _socketSubscribeKeepAlive)[subscription.subscriptionKey.id].timeout);
       delete __privateGet(this, _socketSubscribeKeepAlive)[subscription.subscriptionKey.id].timeout;
       delete __privateGet(this, _socketSubscribeKeepAlive)[subscription.subscriptionKey.id];
@@ -5914,15 +5799,14 @@ var __privateMethod = (obj, member, method) => {
   })(messageStatusResponse || {});
   class SocketIoMessageSender {
     constructor(options) {
-      __privateAdd(this, _LogDebugMessage2);
-      __privateAdd(this, _GetSubscribeKeepAliveAckEventName);
+      __privateAdd(this, _SocketIoMessageSender_instances);
       __privateAdd(this, _messageWithAckPayloadRecords, {});
-      __privateAdd(this, _socket, void 0);
+      __privateAdd(this, _socket);
       __privateAdd(this, _maxReties, 3);
       //@@
       __privateAdd(this, _timeoutValue, 5e3);
       //@@
-      __privateAdd(this, _options3, void 0);
+      __privateAdd(this, _options3);
       __privateSet(this, _options3, options);
       __privateSet(this, _socket, options.socket);
     }
@@ -5930,38 +5814,38 @@ var __privateMethod = (obj, member, method) => {
       return __privateGet(this, _socket);
     }
     set socket(socket) {
-      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.cyan(`SocketIoMessageSender:set socket(): new socket assigned`));
+      __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.cyan(`SocketIoMessageSender:set socket(): new socket assigned`));
       __privateSet(this, _socket, socket);
     }
     AckListener(message, payload) {
       if (message.subscriptionKey.id.localeCompare(payload.id) === 0) {
         clearTimeout(message.timeoutId);
         delete message.timeoutId;
-        __privateGet(this, _socket).off(__privateMethod(this, _GetSubscribeKeepAliveAckEventName, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
+        __privateGet(this, _socket).off(__privateMethod(this, _SocketIoMessageSender_instances, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
         message.endTime = performance.now();
         message.duration = message.endTime - message.startTime;
         message.status = "SUCCESS";
         message.subscriptionKeyResponse = payload;
         delete __privateGet(this, _messageWithAckPayloadRecords)[message.id];
-        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.grey(`SocketIoMessageSender:AckListener(): ack received, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+        __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.grey(`SocketIoMessageSender:AckListener(): ack received, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
         message.resolve(message);
       }
     }
     ResponseTimout(message) {
-      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached: [${__privateGet(this, _timeoutValue)}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+      __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached: [${__privateGet(this, _timeoutValue)}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
       delete message.timeoutId;
-      __privateGet(this, _socket).off(__privateMethod(this, _GetSubscribeKeepAliveAckEventName, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
+      __privateGet(this, _socket).off(__privateMethod(this, _SocketIoMessageSender_instances, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
       message.endTime = performance.now();
       if (message.retryCount >= __privateGet(this, _maxReties)) {
         message.status = "FAIL";
-        __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.red(`SocketIoMessageSender:ResponseTimout(): timeout reached after ${__privateGet(this, _maxReties)} retries, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+        __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.red(`SocketIoMessageSender:ResponseTimout(): timeout reached after ${__privateGet(this, _maxReties)} retries, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
         delete __privateGet(this, _messageWithAckPayloadRecords)[message.id];
         message.reject(message);
         return;
       }
       message.status = "INRETRY";
       message.retryCount++;
-      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached, retrying. Retries: [${message.retryCount}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+      __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached, retrying. Retries: [${message.retryCount}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
       this.SendMessage(message);
     }
     SendMessage(message) {
@@ -5973,8 +5857,8 @@ var __privateMethod = (obj, member, method) => {
         this.AckListener(message, payload);
       };
       message.BoundAckListenerCallback = AckListenerCallback.bind(this);
-      __privateGet(this, _socket).on(__privateMethod(this, _GetSubscribeKeepAliveAckEventName, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
-      __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.gray(`SocketIoMessageSender:SendMessage(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+      __privateGet(this, _socket).on(__privateMethod(this, _SocketIoMessageSender_instances, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
+      __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.gray(`SocketIoMessageSender:SendMessage(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
       __privateGet(this, _socket).emit(message.eventName, message.subscriptionKey);
     }
     SendMessageWithAck(eventName, subscriptionKey) {
@@ -5998,10 +5882,10 @@ var __privateMethod = (obj, member, method) => {
       const killIds = [];
       for (const [, message] of Object.entries(__privateGet(this, _messageWithAckPayloadRecords))) {
         if (message.subscriptionKey.id.localeCompare(subscriptionKey.id) === 0) {
-          __privateMethod(this, _LogDebugMessage2, LogDebugMessage_fn2).call(this, chalk$1.blue(`SocketIoMessageSender:KillMessageInFlight(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
+          __privateMethod(this, _SocketIoMessageSender_instances, LogDebugMessage_fn2).call(this, chalk$1.blue(`SocketIoMessageSender:KillMessageInFlight(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
           clearTimeout(message.timeoutId);
           delete message.timeoutId;
-          __privateGet(this, _socket).off(__privateMethod(this, _GetSubscribeKeepAliveAckEventName, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
+          __privateGet(this, _socket).off(__privateMethod(this, _SocketIoMessageSender_instances, GetSubscribeKeepAliveAckEventName_fn).call(this, message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
           killIds.push(message.id);
           message.status = "KILLED";
           message.reject(message);
@@ -6017,24 +5901,20 @@ var __privateMethod = (obj, member, method) => {
   _maxReties = new WeakMap();
   _timeoutValue = new WeakMap();
   _options3 = new WeakMap();
-  _LogDebugMessage2 = new WeakSet();
+  _SocketIoMessageSender_instances = new WeakSet();
   LogDebugMessage_fn2 = function(message) {
     __privateGet(this, _options3).logger.debug(message);
   };
-  _GetSubscribeKeepAliveAckEventName = new WeakSet();
   GetSubscribeKeepAliveAckEventName_fn = function(eventName, subscriptionKey) {
     return `${eventName}Ack_${subscriptionKey.id}`;
   };
   class ObservabilitySocketIOSubscriber {
     constructor(options) {
-      __privateAdd(this, _LogDebugMessage3);
-      __privateAdd(this, _LogErrorMessage2);
-      __privateAdd(this, _AddKeepAlive2);
-      __privateAdd(this, _RemoveKeepAlive2);
+      __privateAdd(this, _ObservabilitySocketIOSubscriber_instances);
       __privateAdd(this, _socketSubscribeKeepAlive2, {});
-      __privateAdd(this, _socket2, void 0);
-      __privateAdd(this, _options4, void 0);
-      __privateAdd(this, _socketIoMessageSender, void 0);
+      __privateAdd(this, _socket2);
+      __privateAdd(this, _options4);
+      __privateAdd(this, _socketIoMessageSender);
       // This is required becuase each call to .bind create a new replica bound function - so we need the same instance for on/off event bindings.
       __publicField(this, "KeepAliveAckBoundFunction");
       __privateSet(this, _options4, options);
@@ -6048,7 +5928,7 @@ var __privateMethod = (obj, member, method) => {
       return __privateGet(this, _socket2);
     }
     set socket(socket) {
-      __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.cyan(`ObservabilitySocketIOSubscriber:set socket(): new socket assigned`));
+      __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.cyan(`ObservabilitySocketIOSubscriber:set socket(): new socket assigned`));
       __privateSet(this, _socket2, socket);
       __privateGet(this, _socketIoMessageSender).socket = socket;
     }
@@ -6058,17 +5938,17 @@ var __privateMethod = (obj, member, method) => {
     async Subscribe(subscriptions) {
       const socket = __privateGet(this, _socket2);
       subscriptions.map(async (subId) => {
-        __privateMethod(this, _RemoveKeepAlive2, RemoveKeepAlive_fn2).call(this, subId);
-        __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+        __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, RemoveKeepAlive_fn2).call(this, subId);
+        __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
         try {
           const retVal = await __privateGet(this, _socketIoMessageSender).SendMessageWithAck("subscribe", subId.subscriptionKey);
-          __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:Subscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
-          __privateMethod(this, _AddKeepAlive2, AddKeepAlive_fn2).call(this, socket, subId);
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:Subscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, AddKeepAlive_fn2).call(this, socket, subId);
           socket.on(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:Subscribe(): Error: response: [${JSON.stringify(error)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:Subscribe(): Error: response: [${JSON.stringify(error)}]`));
           socket.off(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
-          __privateMethod(this, _RemoveKeepAlive2, RemoveKeepAlive_fn2).call(this, subId);
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, RemoveKeepAlive_fn2).call(this, subId);
         }
       });
     }
@@ -6079,14 +5959,14 @@ var __privateMethod = (obj, member, method) => {
       const socket = __privateGet(this, _socket2);
       subscriptions.map(async (subId) => {
         socket.off(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
-        __privateMethod(this, _RemoveKeepAlive2, RemoveKeepAlive_fn2).call(this, subId);
+        __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, RemoveKeepAlive_fn2).call(this, subId);
         __privateGet(this, _socketIoMessageSender).KillMessageInFlight(subId.subscriptionKey);
-        __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+        __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
         try {
           const retVal = await __privateGet(this, _socketIoMessageSender).SendMessageWithAck("unsubscribe", subId.subscriptionKey);
-          __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:UnSubscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:UnSubscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:UnSubscribe(): Error response: [${JSON.stringify(error)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:UnSubscribe(): Error response: [${JSON.stringify(error)}]`));
         }
       });
     }
@@ -6108,52 +5988,48 @@ var __privateMethod = (obj, member, method) => {
   _socket2 = new WeakMap();
   _options4 = new WeakMap();
   _socketIoMessageSender = new WeakMap();
-  _LogDebugMessage3 = new WeakSet();
+  _ObservabilitySocketIOSubscriber_instances = new WeakSet();
   LogDebugMessage_fn3 = function(message) {
     __privateGet(this, _options4).logger.debug(message);
   };
-  _LogErrorMessage2 = new WeakSet();
   LogErrorMessage_fn2 = function(message) {
     __privateGet(this, _options4).logger.error(message);
   };
-  _AddKeepAlive2 = new WeakSet();
   AddKeepAlive_fn2 = function(socket, subscription) {
-    __privateMethod(this, _RemoveKeepAlive2, RemoveKeepAlive_fn2).call(this, subscription);
+    __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, RemoveKeepAlive_fn2).call(this, subscription);
     __privateGet(this, _socketSubscribeKeepAlive2)[subscription.subscriptionKey.id] = {
       id: subscription.subscriptionKey.id,
       timeout: setTimeout(async () => {
-        __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:#AddKeepAlive:timeoutCheck(): Sending keepAlive: subscriptionKey: [${subscription.subscriptionKey.id}]`));
+        __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.yellow(`ObservabilitySocketIOSubscriber:#AddKeepAlive:timeoutCheck(): Sending keepAlive: subscriptionKey: [${subscription.subscriptionKey.id}]`));
         try {
           const retVal = await __privateGet(this, _socketIoMessageSender).SendMessageWithAck("subscribeKeepAlive", subscription.subscriptionKey);
-          __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
-          __privateMethod(this, _AddKeepAlive2, AddKeepAlive_fn2).call(this, socket, subscription);
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.green(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, AddKeepAlive_fn2).call(this, socket, subscription);
         } catch (error) {
-          __privateMethod(this, _LogErrorMessage2, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogErrorMessage_fn2).call(this, chalk$1.red(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
           socket.off(GetSocketIOSubscriptionKey(subscription.subscriptionKey), subscription.cb);
-          __privateMethod(this, _RemoveKeepAlive2, RemoveKeepAlive_fn2).call(this, subscription);
+          __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, RemoveKeepAlive_fn2).call(this, subscription);
         }
       }, __privateGet(this, _options4).keepAlive)
     };
   };
-  _RemoveKeepAlive2 = new WeakSet();
   RemoveKeepAlive_fn2 = function(subscription) {
     if (__privateGet(this, _socketSubscribeKeepAlive2)[subscription.subscriptionKey.id]) {
-      __privateMethod(this, _LogDebugMessage3, LogDebugMessage_fn3).call(this, chalk$1.gray(`ObservabilitySocketIOSubscriber:#RemoveKeepAlive(): subscriptionKey: [${subscription.subscriptionKey.id}]`));
+      __privateMethod(this, _ObservabilitySocketIOSubscriber_instances, LogDebugMessage_fn3).call(this, chalk$1.gray(`ObservabilitySocketIOSubscriber:#RemoveKeepAlive(): subscriptionKey: [${subscription.subscriptionKey.id}]`));
       clearTimeout(__privateGet(this, _socketSubscribeKeepAlive2)[subscription.subscriptionKey.id].timeout);
       delete __privateGet(this, _socketSubscribeKeepAlive2)[subscription.subscriptionKey.id];
     }
   };
   class ObservabilitySubscriptionManager {
     constructor(options) {
-      __privateAdd(this, _LogDebugMessage4);
-      __privateAdd(this, _LogErrorMessage3);
+      __privateAdd(this, _ObservabilitySubscriptionManager_instances);
       __privateAdd(this, _observabilitySocketIOSubscriber, null);
       __privateAdd(this, _subscriptions, []);
-      __privateAdd(this, _kafkaHelper, void 0);
+      __privateAdd(this, _kafkaHelper);
       __privateAdd(this, _serviceModel, {});
       __privateAdd(this, _agentModel, {});
       __privateAdd(this, _lambdaModel, {});
-      __privateAdd(this, _options5, void 0);
+      __privateAdd(this, _options5);
       __privateSet(this, _options5, options);
       __privateSet(this, _kafkaHelper, new KafkaHelper({
         maxLogLength: __privateGet(this, _options5).maxLogLength
@@ -6186,7 +6062,7 @@ var __privateMethod = (obj, member, method) => {
       subscriptions.map((subscription) => {
         const retVal = this.subscriptions.find((v) => v.subscriptionKey.id.localeCompare(subscription.subscriptionKey.id) === 0);
         if (retVal) {
-          __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.magenta(`AddSubscription(): Subscription: [${retVal.subscriptionKey.id}] already exists - ignoring.`));
+          __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.magenta(`AddSubscription(): Subscription: [${retVal.subscriptionKey.id}] already exists - ignoring.`));
         } else {
           subscriptionsToAdd.push(subscription);
         }
@@ -6195,7 +6071,7 @@ var __privateMethod = (obj, member, method) => {
         subscriptionsToAdd.map((s) => this.subscriptions.push(s));
         (_a2 = __privateGet(this, _observabilitySocketIOSubscriber)) == null ? void 0 : _a2.Subscribe(subscriptionsToAdd);
       } else {
-        __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.magenta(`AddSubscription(): No valid subscriptions to subscribe.`));
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.magenta(`AddSubscription(): No valid subscriptions to subscribe.`));
       }
     }
     RemoveSubscriptionsByKey(keyToFind) {
@@ -6290,11 +6166,11 @@ var __privateMethod = (obj, member, method) => {
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.AllServicesCombined.toString()) === 0) {
           __privateGet(this, _serviceModel)["STS-Service"] = ObservabilityModelUtils.GetModelForService("STS-Service", subscriptionPayload.data, subscribeToKafka, __privateGet(this, _options5).logger);
           if (__privateGet(this, _serviceModel)["STS-Service"] === null) {
-            __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllServicesCombined():Error: GetModelForService() returned null`));
+            __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllServicesCombined():Error: GetModelForService() returned null`));
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, error);
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, error);
         return;
       }
     }
@@ -6305,7 +6181,7 @@ var __privateMethod = (obj, member, method) => {
         for (const [serviceId, serviceTelemetry] of Object.entries(subscriptionPayload.data)) {
           __privateGet(this, _serviceModel)[serviceId] = ObservabilityModelUtils.GetModelForService(serviceId, serviceTelemetry, subscribeToKafka, __privateGet(this, _options5).logger);
           if (__privateGet(this, _serviceModel)[serviceId] === null) {
-            __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServices():Error: GetModelForService() returned null`));
+            __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServices():Error: GetModelForService() returned null`));
           }
         }
       } catch (error) {
@@ -6339,7 +6215,7 @@ var __privateMethod = (obj, member, method) => {
                   }
                 }
               } else {
-                __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServiceInstances():Error: GetModelForService() returned null`));
+                __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServiceInstances():Error: GetModelForService() returned null`));
               }
             } else {
               if (subscribeToKafka) {
@@ -6382,7 +6258,7 @@ var __privateMethod = (obj, member, method) => {
                     }
                   }
                 } else {
-                  __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServiceInstance():Error: GetModelForService() returned null`));
+                  __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelServiceInstance():Error: GetModelForService() returned null`));
                 }
               } else {
                 if (subscribeToKafka) {
@@ -6407,12 +6283,12 @@ var __privateMethod = (obj, member, method) => {
           if (Object.keys(subscriptionPayload.data).length !== 0) {
             __privateGet(this, _agentModel)["STS-Agent"] = ObservabilityModelUtils.GetModelForAgent("STS-Agent", subscriptionPayload.data, subscribeToKafka, __privateGet(this, _options5).logger);
             if (__privateGet(this, _agentModel)["STS-Agent"] === null) {
-              __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllAgentsCombined():Error: GetModelForAgent() returned null`));
+              __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllAgentsCombined():Error: GetModelForAgent() returned null`));
             }
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, error);
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, error);
         return;
       }
     }
@@ -6441,7 +6317,7 @@ var __privateMethod = (obj, member, method) => {
                 }
               }
             } else {
-              __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgents():Error: GetModelForAgent() returned null`));
+              __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgents():Error: GetModelForAgent() returned null`));
             }
           } else {
             if (subscribeToKafka) {
@@ -6452,7 +6328,7 @@ var __privateMethod = (obj, member, method) => {
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgent:CreateModel(): Error: [${error}]`));
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgent:CreateModel(): Error: [${error}]`));
       }
     }
     // /agentId/agentWorkerId
@@ -6485,7 +6361,7 @@ var __privateMethod = (obj, member, method) => {
                   }
                 }
               } else {
-                __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgentWorkers():Error: GetModelForAgent() returned null`));
+                __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgentWorkers():Error: GetModelForAgent() returned null`));
               }
             } else {
               if (subscribeToKafka) {
@@ -6497,7 +6373,7 @@ var __privateMethod = (obj, member, method) => {
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgentThreads:CreateModel(): Error: [${error}]`));
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgentThreads:CreateModel(): Error: [${error}]`));
       }
     }
     // /agentId/agentWorkerId/asyncRunnerId
@@ -6527,7 +6403,7 @@ var __privateMethod = (obj, member, method) => {
                     }
                   }
                 } else {
-                  __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgentWorker():Error: GetModelForAgent() returned null`));
+                  __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAgentWorker():Error: GetModelForAgent() returned null`));
                 }
               } else {
                 if (subscribeToKafka) {
@@ -6540,7 +6416,7 @@ var __privateMethod = (obj, member, method) => {
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgentThread:CreateModel(): Error: [${error}]`));
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, chalk$1.red(`UIControllerAgentThread:CreateModel(): Error: [${error}]`));
       }
     }
     // --- [ Lambdas ] ------------------------------------------------------------------------------------------------------------------------------------------------
@@ -6551,11 +6427,11 @@ var __privateMethod = (obj, member, method) => {
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.AllLambdasCombined.toString()) === 0) {
           __privateGet(this, _lambdaModel)["STS-Lambda"] = ObservabilityModelUtils.GetModelForLambda("STS-Lambda", subscriptionPayload.data, subscribeToKafka, __privateGet(this, _options5).logger);
           if (__privateGet(this, _lambdaModel)["STS-Lambda"] === null) {
-            __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllLambdasCombined():Error: GetModelForLambda() returned null`));
+            __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelAllLambdasCombined():Error: GetModelForLambda() returned null`));
           }
         }
       } catch (error) {
-        __privateMethod(this, _LogErrorMessage3, LogErrorMessage_fn3).call(this, error);
+        __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogErrorMessage_fn3).call(this, error);
         return;
       }
     }
@@ -6566,7 +6442,7 @@ var __privateMethod = (obj, member, method) => {
         for (const [technologyId, technologyTelemetry] of Object.entries(subscriptionPayload.data)) {
           __privateGet(this, _lambdaModel)[technologyId] = ObservabilityModelUtils.GetModelForLambda(technologyId, technologyTelemetry, subscribeToKafka, __privateGet(this, _options5).logger);
           if (__privateGet(this, _lambdaModel)[technologyId] === null) {
-            __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaTechnologies():Error: GetModelForLambda() returned null`));
+            __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaTechnologies():Error: GetModelForLambda() returned null`));
           }
         }
       } catch (error) {
@@ -6600,7 +6476,7 @@ var __privateMethod = (obj, member, method) => {
                   }
                 }
               } else {
-                __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaSubTechnologies():Error: GetModelForLambda() returned null`));
+                __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaSubTechnologies():Error: GetModelForLambda() returned null`));
               }
             } else {
               if (subscribeToKafka) {
@@ -6643,7 +6519,7 @@ var __privateMethod = (obj, member, method) => {
                     }
                   }
                 } else {
-                  __privateMethod(this, _LogDebugMessage4, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaSubTechnologiesInstance():Error: GetModelForLambda() returned null`));
+                  __privateMethod(this, _ObservabilitySubscriptionManager_instances, LogDebugMessage_fn4).call(this, chalk$1.red(`CreateModelLambdaSubTechnologiesInstance():Error: GetModelForLambda() returned null`));
                 }
               } else {
                 if (subscribeToKafka) {
@@ -6667,22 +6543,17 @@ var __privateMethod = (obj, member, method) => {
   _agentModel = new WeakMap();
   _lambdaModel = new WeakMap();
   _options5 = new WeakMap();
-  _LogDebugMessage4 = new WeakSet();
+  _ObservabilitySubscriptionManager_instances = new WeakSet();
   LogDebugMessage_fn4 = function(message) {
     __privateGet(this, _options5).logger.debug(message);
   };
-  _LogErrorMessage3 = new WeakSet();
   LogErrorMessage_fn3 = function(message) {
     __privateGet(this, _options5).logger.error(message);
   };
   class SocketIoClientHelper {
     constructor(options) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      __privateAdd(this, _LogDebugMessage5);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      __privateAdd(this, _LogErrorMessage4);
-      __privateAdd(this, _EstablishSocketConnect);
-      __privateAdd(this, _options6, void 0);
+      __privateAdd(this, _SocketIoClientHelper_instances);
+      __privateAdd(this, _options6);
       __privateAdd(this, _sockets, {});
       __privateAdd(this, _httpsAgent2, null);
       __privateSet(this, _options6, options);
@@ -6709,7 +6580,7 @@ var __privateMethod = (obj, member, method) => {
         socket: null,
         errorCallBack
       };
-      __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack);
+      __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack);
       return this.sockets[name].socket;
     }
     GetSocket(name) {
@@ -6722,17 +6593,15 @@ var __privateMethod = (obj, member, method) => {
   _options6 = new WeakMap();
   _sockets = new WeakMap();
   _httpsAgent2 = new WeakMap();
-  _LogDebugMessage5 = new WeakSet();
+  _SocketIoClientHelper_instances = new WeakSet();
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   LogDebugMessage_fn5 = function(message) {
-    if (__privateGet(this, _options6).logger)
-      __privateGet(this, _options6).logger.debug(message);
+    if (__privateGet(this, _options6).logger) __privateGet(this, _options6).logger.debug(message);
   };
-  _LogErrorMessage4 = new WeakSet();
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   LogErrorMessage_fn4 = function(message) {
-    if (__privateGet(this, _options6).logger)
-      __privateGet(this, _options6).logger.error(message);
+    if (__privateGet(this, _options6).logger) __privateGet(this, _options6).logger.error(message);
   };
-  _EstablishSocketConnect = new WeakSet();
   EstablishSocketConnect_fn = function(name, onConnectCallBack, socketEventsCallBack) {
     const socketDetail = this.sockets[name];
     if (socketDetail.socket !== null) {
@@ -6741,9 +6610,9 @@ var __privateMethod = (obj, member, method) => {
       }
       socketDetail.socket = null;
       if (isNode) {
-        setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
+        setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
       } else {
-        setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
+        setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
       }
       return;
     }
@@ -6763,7 +6632,7 @@ var __privateMethod = (obj, member, method) => {
     socketDetail.socket = socket_ioClient.io(socketDetail.address, socketOptions);
     socketDetail.socket.on("connect", () => {
       if (socketDetail.socket) {
-        __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, `Socket: [${socketDetail.socket.id}]: connected`);
+        __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, `Socket: [${socketDetail.socket.id}]: connected`);
         if (onConnectCallBack) {
           setTimeout(() => {
             onConnectCallBack(socketDetail.socket);
@@ -6774,45 +6643,45 @@ var __privateMethod = (obj, member, method) => {
         }
       } else {
         const errorMessage = "Could not get socket object from socket.io";
-        __privateMethod(this, _LogErrorMessage4, LogErrorMessage_fn4).call(this, errorMessage);
+        __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn4).call(this, errorMessage);
         socketDetail.errorCallBack(new Error(errorMessage));
       }
     });
     socketDetail.socket.on("disconnect", (reason) => {
-      __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "socket disconnect: " + reason);
+      __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "socket disconnect: " + reason);
       switch (reason) {
         case "io server disconnect":
           {
-            __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
-            __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "The connection will be re-established when the server becomes available.");
+            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
+            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "The connection will be re-established when the server becomes available.");
             const socketDetail2 = this.sockets[name];
             socketDetail2.socket = null;
             if (isNode) {
-              setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
+              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
             } else {
-              setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
+              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
             }
           }
           break;
         case "io client disconnect":
-          __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
-          __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "The connection will not be re-established automatically.");
+          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
+          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "The connection will not be re-established automatically.");
           break;
         case "transport close":
         case "ping timeout":
         case "transport error":
           {
-            __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, `Server unexpectedly disconnected. Reason: [${reason}]`);
-            __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "The connection will be re-established when the server becomes available.");
+            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, `Server unexpectedly disconnected. Reason: [${reason}]`);
+            __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn5).call(this, "The connection will be re-established when the server becomes available.");
             const socketDetail2 = this.sockets[name];
             if (socketDetail2.socket) {
               socketDetail2.socket.disconnect();
             }
             socketDetail2.socket = null;
             if (isNode) {
-              setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
+              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
             } else {
-              setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
+              setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
             }
           }
           break;