@nsshunt/stsobservability 1.0.4 → 1.0.6

package/dist/stsobservability.mjs

@@ -5071,6 +5071,328 @@ const GetSocketIOSubscriptionKey = (subscriptionKey) => {
   return `SubscriptionData_${subscriptionKey.id}`;
 };
 const KAFKA_PREFIX = "__STS__";
+var influxDBDataType = /* @__PURE__ */ ((influxDBDataType2) => {
+  influxDBDataType2["intField"] = "intField";
+  influxDBDataType2["floatField"] = "floatField";
+  influxDBDataType2["stringField"] = "stringField";
+  return influxDBDataType2;
+})(influxDBDataType || {});
+const instrumentationObservationInterval = 1e3;
+const instrumentationTimeWindow = 600;
+const consoleLogging = true;
+const instrumentLogging = true;
+const globalServiceDefinitions = {
+  coreFieldList: [
+    { fieldName: "requestCount", gauge: Gauge.REQUEST_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "errorCount", gauge: Gauge.ERROR_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "retryCount", gauge: Gauge.RETRY_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "authenticationCount", gauge: Gauge.AUTHENTICATION_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "authenticationErrorCount", gauge: Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "authenticationRetryCount", gauge: Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "velocity", gauge: Gauge.VELOCITY_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
+    {
+      fieldName: "activeRequestCount",
+      gauge: Gauge.ACTIVE_REQUEST_GAUGE,
+      instrumentProperty: "val",
+      dataType: "number",
+      timeSeriesIndex: true,
+      quantile: true,
+      influxdbDataType: "intField",
+      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
+      instrumentOptions: {
+        interval: instrumentationObservationInterval,
+        sampleSize: instrumentationTimeWindow
+      }
+    },
+    { fieldName: "coreCount", gauge: Gauge.CORE_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+    { fieldName: "rx", gauge: Gauge.NETWORK_RX_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
+    { fieldName: "tx", gauge: Gauge.NETWORK_TX_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
+    { fieldName: "timer", gauge: Gauge.TIMER_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_TIMER },
+    {
+      fieldName: "duration",
+      gauge: Gauge.DURATION_GAUGE,
+      instrumentProperty: "val",
+      dataType: "number",
+      timeSeriesIndex: true,
+      quantile: true,
+      influxdbDataType: "floatField",
+      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
+      instrumentOptions: {
+        interval: instrumentationObservationInterval,
+        sampleSize: instrumentationTimeWindow
+      },
+      histo: [
+        { label: "B10", bucketLimit: 10 },
+        { label: "B20", bucketLimit: 20 },
+        { label: "B50", bucketLimit: 50 },
+        { label: "B100", bucketLimit: 100 },
+        { label: "B1000", bucketLimit: 1e3 },
+        { label: "B50000", bucketLimit: 5e4 },
+        { label: "BInfinity", bucketLimit: -1 }
+      ],
+      histoGauge: Gauge.DURATION_HISTOGRAM_GAUGE
+    },
+    {
+      fieldName: "latency",
+      gauge: Gauge.LATENCY_GAUGE,
+      instrumentProperty: "val",
+      dataType: "number",
+      timeSeriesIndex: true,
+      quantile: true,
+      influxdbDataType: "floatField",
+      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
+      instrumentOptions: {
+        interval: instrumentationObservationInterval,
+        sampleSize: instrumentationTimeWindow
+      },
+      histo: [
+        { label: "B10", bucketLimit: 10 },
+        { label: "B20", bucketLimit: 20 },
+        { label: "B50", bucketLimit: 50 },
+        { label: "B100", bucketLimit: 100 },
+        { label: "B1000", bucketLimit: 1e3 },
+        { label: "B50000", bucketLimit: 5e4 },
+        { label: "BInfinity", bucketLimit: -1 }
+      ],
+      histoGauge: Gauge.LATENCY_HISTOGRAM_GAUGE
+    }
+  ],
+  logFieldList: [
+    {
+      fieldName: "log",
+      gauge: Gauge.LOGGER,
+      instrumentProperty: "val",
+      dataType: "string",
+      timeSeriesIndex: false,
+      quantile: false,
+      influxdbDataType: "stringField",
+      gaugeType: GaugeTypes.INSTRUMENT_LOG,
+      instrumentOptions: {
+        consoleLogging,
+        instrumentLogging
+      }
+    }
+  ],
+  services: {
+    ["service"]: {
+      influxDBContextTags: [
+        "serviceId",
+        "serviceName",
+        "serviceVersion",
+        "serviceInstanceId",
+        "serviceInstanceProcessId",
+        "hostName",
+        "pid",
+        "ppid"
+      ],
+      redisIndexPrefixDefinitions: {
+        timeSeriesIndex: "idx:serviceIndexTimeSeries",
+        timeSeriesPrefix: "/serviceTimeSeries:",
+        instantIndex: "idx:serviceIndexInstant",
+        instantPrefix: "/serviceInstant:"
+      },
+      fieldList: [
+        {
+          fieldName: "cpu",
+          gauge: Gauge.CPU_LOAD_GAUGE,
+          instrumentProperty: "val",
+          dataType: "number",
+          timeSeriesIndex: true,
+          quantile: true,
+          influxdbDataType: "floatField",
+          gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
+          instrumentOptions: {
+            interval: instrumentationObservationInterval,
+            sampleSize: instrumentationTimeWindow
+          }
+        },
+        {
+          fieldName: "connectionCount",
+          gauge: Gauge.CONNECTION_COUNT_GAUGE,
+          instrumentProperty: "val",
+          dataType: "number",
+          timeSeriesIndex: true,
+          quantile: true,
+          influxdbDataType: "intField",
+          gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
+          instrumentOptions: {
+            interval: instrumentationObservationInterval,
+            sampleSize: instrumentationTimeWindow
+          }
+        },
+        { fieldName: "connectionPoolCount", gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionIdleCount", gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionWaitingCount", gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "systemcpu", gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        {
+          fieldName: "memory",
+          gauge: Gauge.OBJECT_GAUGE,
+          instrumentProperty: "val",
+          dataType: "JSON",
+          influxdbDataType: "stringField",
+          gaugeType: GaugeTypes.INSTRUMENT_OBJECT,
+          instrumentOptions: {
+            label: "InstrumentObjectMaster"
+          }
+        }
+      ],
+      GetPathFromContext(context) {
+        const { serviceId, serviceInstanceId, serviceInstanceProcessId } = context;
+        return `/${serviceId}/${serviceInstanceId}/${serviceInstanceProcessId}`;
+      },
+      redisQueryFilters: {
+        level1ContextField: "serviceType",
+        level2ContextField: "appid",
+        level3ContextField: "appinstanceid"
+      },
+      subscriptionTopics: [
+        {
+          subscriptionTopic: SubscriptionTopic.AllServicesCombined,
+          route: "/metrics"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.Services,
+          route: "/metrics/services"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.ServiceInstances,
+          route: "/metrics/services/:key"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.ServiceInstance,
+          route: "/metrics/services/:key/:subkey"
+        }
+      ]
+    },
+    ["agent"]: {
+      influxDBContextTags: [
+        "id",
+        "hostName",
+        "agentName",
+        "threadId",
+        "asyncRunnerId"
+      ],
+      redisIndexPrefixDefinitions: {
+        timeSeriesIndex: "idx:agentIndexTimeSeries",
+        timeSeriesPrefix: "/agentTimeSeries:",
+        instantIndex: "idx:agentIndexInstant",
+        instantPrefix: "/agentInstant:"
+      },
+      fieldList: [
+        { fieldName: "childCount", gauge: Gauge.CHILD_COUNT, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE }
+      ],
+      //@@ need type declare in appframework ?? agent does not use appframework ... perhaps stspublisher
+      GetPathFromContext(context) {
+        const { agentName, threadId, asyncRunnerId } = context;
+        return `/${agentName}/${threadId}/${asyncRunnerId}`;
+      },
+      redisQueryFilters: {
+        level1ContextField: "serviceType",
+        level2ContextField: "appid",
+        //@@ this should be named something else
+        level3ContextField: "appinstanceid"
+        //@@ this should be named something else
+      },
+      subscriptionTopics: [
+        {
+          subscriptionTopic: SubscriptionTopic.AllAgentsCombined,
+          route: "/metrics"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.Agents,
+          route: "/metrics/agents"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.AgentWorkers,
+          route: "/metrics/agents/:key"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.AgentWorker,
+          route: "/metrics/agents/:key/:subkey"
+        }
+      ]
+    },
+    ["lambda"]: {
+      influxDBContextTags: [
+        "technology",
+        "subTechnology",
+        "lambdaFunctionName",
+        "lambdaInstance",
+        "hostName",
+        "processId",
+        "parentProcessId",
+        "useCase",
+        "pattern"
+      ],
+      redisIndexPrefixDefinitions: {
+        timeSeriesIndex: "idx:lambdaIndexTimeSeries",
+        timeSeriesPrefix: "/lambdaTimeSeries:",
+        instantIndex: "idx:lambdaIndexInstant",
+        instantPrefix: "/lambdaInstant:"
+      },
+      fieldList: [
+        { fieldName: "cpu", gauge: Gauge.CPU_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionCount", gauge: Gauge.CONNECTION_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionPoolCount", gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionIdleCount", gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "connectionWaitingCount", gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "systemcpu", gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
+        { fieldName: "memory", gauge: Gauge.OBJECT_GAUGE, instrumentProperty: "val", dataType: "JSON", influxdbDataType: "stringField", gaugeType: GaugeTypes.INSTRUMENT_OBJECT }
+      ],
+      //@@ need type declare in appframework
+      GetPathFromContext(context) {
+        const { technology, subTechnology, lambdaInstance } = context;
+        return `/${technology}/${subTechnology}/${lambdaInstance}`;
+      },
+      redisQueryFilters: {
+        level1ContextField: "serviceType",
+        level2ContextField: "technology",
+        level3ContextField: "subTechnology"
+      },
+      subscriptionTopics: [
+        {
+          subscriptionTopic: SubscriptionTopic.AllLambdasCombined,
+          // uicontrollerlanding
+          route: "/metrics"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.LambdaTechnologies,
+          // uicontrollerlambda
+          route: "/metrics/lambdas"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.LambdaSubTechnologies,
+          // uicontrollerlambdasubtechnologies
+          route: "/metrics/lambdas/:key"
+        },
+        {
+          subscriptionTopic: SubscriptionTopic.LambdaSubTechnologiesInstance,
+          // uicontrollerlambdasubtechnologiesinstance
+          route: "/metrics/lambdas/:key/:subkey"
+        }
+      ]
+    }
+  }
+};
+const GetInstruments = (service) => {
+  const fieldList = [
+    ...globalServiceDefinitions.coreFieldList,
+    ...globalServiceDefinitions.logFieldList,
+    ...globalServiceDefinitions.services[service].fieldList
+  ];
+  const retVal = [];
+  fieldList.forEach((v) => {
+    if (v.instrumentOptions) {
+      retVal.push([v.gauge, v.gaugeType, v.instrumentOptions]);
+    } else {
+      retVal.push([v.gauge, v.gaugeType]);
+    }
+    if (v.histo) {
+      retVal.push([v.histoGauge, GaugeTypes.INSTRUMENT_HISTOGRAM]);
+    }
+  });
+  return retVal;
+};
 const _ObservabilityModelUtils = class _ObservabilityModelUtils {
   static GetModelNode(data) {
     const fixedSize = 2;
@@ -5169,6 +5491,23 @@ const _ObservabilityModelUtils = class _ObservabilityModelUtils {
       };
     }
   }
+  static GetModelData(serviceType, model, data, parseLog) {
+    const fieldList = [
+      ...globalServiceDefinitions.coreFieldList,
+      ...globalServiceDefinitions.services[serviceType].fieldList
+    ];
+    fieldList.forEach((field) => {
+      if (field.quantile) {
+        _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, field.gauge, field.fieldName, `${field.fieldName}_quantile`);
+      } else if (field.histo) {
+        _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, field.histoGauge, `${field.fieldName}_histo`);
+      } else if (field.gaugeType.localeCompare(GaugeTypes.INSTRUMENT_OBJECT) === 0) {
+        _ObservabilityModelUtils.ParseModelNodeObject(model, data, parseLog, field.gauge, field.fieldName);
+      } else {
+        _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, field.gauge, field.fieldName);
+      }
+    });
+  }
   static GetModelForService(id, data, subscribeToKafka, logger) {
     try {
       const parseLog = [];
@@ -5176,29 +5515,7 @@ const _ObservabilityModelUtils = class _ObservabilityModelUtils {
         id,
         instruments: {}
       };
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.REQUEST_COUNT_GAUGE, "requestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ERROR_COUNT_GAUGE, "errorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.RETRY_COUNT_GAUGE, "retryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_COUNT_GAUGE, "authenticationCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, "authenticationErrorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, "authenticationRetryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.VELOCITY_GAUGE, "velocity");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ACTIVE_REQUEST_GAUGE, "activeRequestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_COUNT_GAUGE, "connectionCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_TOTAL_GAUGE, "connectionPoolCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_IDLE_GAUGE, "connectionIdleCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_WAITING_GAUGE, "connectionWaitingCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CORE_COUNT_GAUGE, "coreCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.TIMER_GAUGE, "timer");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_RX_GAUGE, "rx");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_TX_GAUGE, "tx");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.CPU_LOAD_GAUGE, "cpu", "cpu_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.CPU_SYSTEM_LOAD_GAUGE, "systemcpu", "systemcpu_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.DURATION_GAUGE, "duration", "duration_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.LATENCY_GAUGE, "latency", "latency_quantile");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.DURATION_HISTOGRAM_GAUGE, "duration_histo");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.LATENCY_HISTOGRAM_GAUGE, "latency_histo");
-      _ObservabilityModelUtils.ParseModelNodeObject(model, data, parseLog, Gauge.OBJECT_GAUGE, "memory");
+      this.GetModelData("service", model, data, parseLog);
       if (!subscribeToKafka) {
         model.instruments[Gauge.LOGGER] = _ObservabilityModelUtils.GetModelNodeRawStringArray(data["logMessages"]);
       }
@@ -5217,29 +5534,7 @@ const _ObservabilityModelUtils = class _ObservabilityModelUtils {
         id,
         instruments: {}
       };
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.REQUEST_COUNT_GAUGE, "requestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ERROR_COUNT_GAUGE, "errorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.RETRY_COUNT_GAUGE, "retryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_COUNT_GAUGE, "authenticationCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, "authenticationErrorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, "authenticationRetryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.VELOCITY_GAUGE, "velocity");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ACTIVE_REQUEST_GAUGE, "activeRequestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_COUNT_GAUGE, "connectionCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_TOTAL_GAUGE, "connectionPoolCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_IDLE_GAUGE, "connectionIdleCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CONNECTION_POOL_WAITING_GAUGE, "connectionWaitingCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CORE_COUNT_GAUGE, "coreCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.TIMER_GAUGE, "timer");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_RX_GAUGE, "rx");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_TX_GAUGE, "tx");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.CPU_LOAD_GAUGE, "cpu", "cpu_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.CPU_SYSTEM_LOAD_GAUGE, "systemcpu", "systemcpu_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.DURATION_GAUGE, "duration", "duration_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.LATENCY_GAUGE, "latency", "latency_quantile");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.DURATION_HISTOGRAM_GAUGE, "duration_histo");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.LATENCY_HISTOGRAM_GAUGE, "latency_histo");
-      _ObservabilityModelUtils.ParseModelNodeObject(model, data, parseLog, Gauge.OBJECT_GAUGE, "memory");
+      this.GetModelData("lambda", model, data, parseLog);
       if (!subscribeToKafka) {
         model.instruments[Gauge.LOGGER] = _ObservabilityModelUtils.GetModelNodeRawStringArray(data["logMessages"]);
       }
@@ -5261,22 +5556,7 @@ const _ObservabilityModelUtils = class _ObservabilityModelUtils {
         id,
         instruments: {}
       };
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.REQUEST_COUNT_GAUGE, "requestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ERROR_COUNT_GAUGE, "errorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.RETRY_COUNT_GAUGE, "retryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_COUNT_GAUGE, "authenticationCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, "authenticationErrorCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, "authenticationRetryCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.VELOCITY_GAUGE, "velocity");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.CORE_COUNT_GAUGE, "coreCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.TIMER_GAUGE, "timer");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.ACTIVE_REQUEST_GAUGE, "activeRequestCount");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_RX_GAUGE, "rx");
-      _ObservabilityModelUtils.ParseModelNode(model, data, parseLog, Gauge.NETWORK_TX_GAUGE, "tx");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.DURATION_GAUGE, "duration", "duration_quantile");
-      _ObservabilityModelUtils.ParseModelNodeWithQuantile(model, data, parseLog, Gauge.LATENCY_GAUGE, "latency", "latency_quantile");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.DURATION_HISTOGRAM_GAUGE, "duration_histo");
-      _ObservabilityModelUtils.ParseModelNodeHisto(model, data, parseLog, Gauge.LATENCY_HISTOGRAM_GAUGE, "latency_histo");
+      this.GetModelData("agent", model, data, parseLog);
       if (!subscribeToKafka) {
         model.instruments[Gauge.LOGGER] = _ObservabilityModelUtils.GetModelNodeRawStringArray(data["logMessages"]);
       }
@@ -6480,383 +6760,61 @@ EstablishSocketConnect_fn = function(name, onConnectCallBack, socketEventsCallBa
   socketDetail.socket = io(socketDetail.address, socketOptions);
   socketDetail.socket.on("connect", () => {
     if (socketDetail.socket) {
-      __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, `Socket: [${socketDetail.socket.id}]: connected`);
-      if (onConnectCallBack) {
-        setTimeout(() => {
-          onConnectCallBack(socketDetail.socket);
-        }, 0);
-      }
-      if (socketEventsCallBack) {
-        socketEventsCallBack(socketDetail.socket);
-      }
-    } else {
-      const errorMessage = "Could not get socket object from socket.io";
-      __privateMethod(this, _LogErrorMessage4, 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);
-    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.");
-          const socketDetail2 = this.sockets[name];
-          socketDetail2.socket = null;
-          if (isNode) {
-            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
-          } else {
-            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, 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.");
-        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.");
-          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();
-          } else {
-            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
-          }
-        }
-        break;
-    }
-  });
-};
-var influxDBDataType = /* @__PURE__ */ ((influxDBDataType2) => {
-  influxDBDataType2["intField"] = "intField";
-  influxDBDataType2["floatField"] = "floatField";
-  influxDBDataType2["stringField"] = "stringField";
-  return influxDBDataType2;
-})(influxDBDataType || {});
-const instrumentationObservationInterval = 1e3;
-const instrumentationTimeWindow = 600;
-const consoleLogging = true;
-const instrumentLogging = true;
-const globalServiceDefinitions = {
-  coreFieldList: [
-    { fieldName: "requestCount", gauge: Gauge.REQUEST_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "errorCount", gauge: Gauge.ERROR_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "retryCount", gauge: Gauge.RETRY_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "authenticationCount", gauge: Gauge.AUTHENTICATION_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "authenticationErrorCount", gauge: Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "authenticationRetryCount", gauge: Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "velocity", gauge: Gauge.VELOCITY_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
-    {
-      fieldName: "activeRequestCount",
-      gauge: Gauge.ACTIVE_REQUEST_GAUGE,
-      instrumentProperty: "val",
-      dataType: "number",
-      timeSeriesIndex: true,
-      quantile: true,
-      influxdbDataType: "intField",
-      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
-      instrumentOptions: {
-        interval: instrumentationObservationInterval,
-        sampleSize: instrumentationTimeWindow
-      }
-    },
-    { fieldName: "coreCount", gauge: Gauge.CORE_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-    { fieldName: "rx", gauge: Gauge.NETWORK_RX_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
-    { fieldName: "tx", gauge: Gauge.NETWORK_TX_GAUGE, instrumentProperty: "va", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_VELOCITY },
-    { fieldName: "timer", gauge: Gauge.TIMER_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_TIMER },
-    {
-      fieldName: "duration",
-      gauge: Gauge.DURATION_GAUGE,
-      instrumentProperty: "val",
-      dataType: "number",
-      timeSeriesIndex: true,
-      quantile: true,
-      influxdbDataType: "floatField",
-      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
-      instrumentOptions: {
-        interval: instrumentationObservationInterval,
-        sampleSize: instrumentationTimeWindow
-      },
-      histo: [
-        { label: "B10", bucketLimit: 10 },
-        { label: "B20", bucketLimit: 20 },
-        { label: "B50", bucketLimit: 50 },
-        { label: "B100", bucketLimit: 100 },
-        { label: "B1000", bucketLimit: 1e3 },
-        { label: "B50000", bucketLimit: 5e4 },
-        { label: "BInfinity", bucketLimit: -1 }
-      ],
-      histoGaugeType: Gauge.DURATION_HISTOGRAM_GAUGE
-    },
-    {
-      fieldName: "latency",
-      gauge: Gauge.LATENCY_GAUGE,
-      instrumentProperty: "val",
-      dataType: "number",
-      timeSeriesIndex: true,
-      quantile: true,
-      influxdbDataType: "floatField",
-      gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
-      instrumentOptions: {
-        interval: instrumentationObservationInterval,
-        sampleSize: instrumentationTimeWindow
-      },
-      histo: [
-        { label: "B10", bucketLimit: 10 },
-        { label: "B20", bucketLimit: 20 },
-        { label: "B50", bucketLimit: 50 },
-        { label: "B100", bucketLimit: 100 },
-        { label: "B1000", bucketLimit: 1e3 },
-        { label: "B50000", bucketLimit: 5e4 },
-        { label: "BInfinity", bucketLimit: -1 }
-      ],
-      histoGaugeType: Gauge.LATENCY_HISTOGRAM_GAUGE
-    }
-  ],
-  logFieldList: [
-    {
-      fieldName: "log",
-      gauge: Gauge.LOGGER,
-      instrumentProperty: "val",
-      dataType: "string",
-      timeSeriesIndex: false,
-      quantile: false,
-      influxdbDataType: "stringField",
-      gaugeType: GaugeTypes.INSTRUMENT_LOG,
-      instrumentOptions: {
-        consoleLogging,
-        instrumentLogging
+      __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, `Socket: [${socketDetail.socket.id}]: connected`);
+      if (onConnectCallBack) {
+        setTimeout(() => {
+          onConnectCallBack(socketDetail.socket);
+        }, 0);
+      }
+      if (socketEventsCallBack) {
+        socketEventsCallBack(socketDetail.socket);
       }
+    } else {
+      const errorMessage = "Could not get socket object from socket.io";
+      __privateMethod(this, _LogErrorMessage4, LogErrorMessage_fn4).call(this, errorMessage);
+      socketDetail.errorCallBack(new Error(errorMessage));
     }
-  ],
-  services: {
-    ["service"]: {
-      influxDBContextTags: [
-        "serviceId",
-        "serviceName",
-        "serviceVersion",
-        "serviceInstanceId",
-        "serviceInstanceProcessId",
-        "hostName",
-        "pid",
-        "ppid"
-      ],
-      redisIndexPrefixDefinitions: {
-        timeSeriesIndex: "idx:serviceIndexTimeSeries",
-        timeSeriesPrefix: "/serviceTimeSeries:",
-        instantIndex: "idx:serviceIndexInstant",
-        instantPrefix: "/serviceInstant:"
-      },
-      fieldList: [
+  });
+  socketDetail.socket.on("disconnect", (reason) => {
+    __privateMethod(this, _LogDebugMessage5, LogDebugMessage_fn5).call(this, "socket disconnect: " + reason);
+    switch (reason) {
+      case "io server disconnect":
         {
-          fieldName: "cpu",
-          gauge: Gauge.CPU_LOAD_GAUGE,
-          instrumentProperty: "val",
-          dataType: "number",
-          timeSeriesIndex: true,
-          quantile: true,
-          influxdbDataType: "floatField",
-          gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
-          instrumentOptions: {
-            interval: instrumentationObservationInterval,
-            sampleSize: instrumentationTimeWindow
+          __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.");
+          const socketDetail2 = this.sockets[name];
+          socketDetail2.socket = null;
+          if (isNode) {
+            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
+          } else {
+            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, 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.");
+        break;
+      case "transport close":
+      case "ping timeout":
+      case "transport error":
         {
-          fieldName: "connectionCount",
-          gauge: Gauge.CONNECTION_COUNT_GAUGE,
-          instrumentProperty: "val",
-          dataType: "number",
-          timeSeriesIndex: true,
-          quantile: true,
-          influxdbDataType: "intField",
-          gaugeType: GaugeTypes.INSTRUMENT_GAUGE,
-          instrumentOptions: {
-            interval: instrumentationObservationInterval,
-            sampleSize: instrumentationTimeWindow
+          __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.");
+          const socketDetail2 = this.sockets[name];
+          if (socketDetail2.socket) {
+            socketDetail2.socket.disconnect();
           }
-        },
-        { fieldName: "connectionPoolCount", gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionIdleCount", gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionWaitingCount", gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "systemcpu", gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        {
-          fieldName: "memory",
-          gauge: Gauge.OBJECT_GAUGE,
-          instrumentProperty: "val",
-          dataType: "JSON",
-          influxdbDataType: "stringField",
-          gaugeType: GaugeTypes.INSTRUMENT_OBJECT,
-          instrumentOptions: {
-            label: "InstrumentObjectMaster"
+          socketDetail2.socket = null;
+          if (isNode) {
+            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100).unref();
+          } else {
+            setTimeout(() => __privateMethod(this, _EstablishSocketConnect, EstablishSocketConnect_fn).call(this, name, onConnectCallBack, socketEventsCallBack), 100);
           }
         }
-      ],
-      GetPathFromContext(context) {
-        const { serviceId, serviceInstanceId, serviceInstanceProcessId } = context;
-        return `/${serviceId}/${serviceInstanceId}/${serviceInstanceProcessId}`;
-      },
-      redisQueryFilters: {
-        level1ContextField: "serviceType",
-        level2ContextField: "appid",
-        level3ContextField: "appinstanceid"
-      },
-      subscriptionTopics: [
-        {
-          subscriptionTopic: SubscriptionTopic.AllServicesCombined,
-          route: "/metrics"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.Services,
-          route: "/metrics/services"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.ServiceInstances,
-          route: "/metrics/services/:key"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.ServiceInstance,
-          route: "/metrics/services/:key/:subkey"
-        }
-      ]
-    },
-    ["agent"]: {
-      influxDBContextTags: [
-        "id",
-        "hostName",
-        "agentName",
-        "threadId",
-        "asyncRunnerId"
-      ],
-      redisIndexPrefixDefinitions: {
-        timeSeriesIndex: "idx:agentIndexTimeSeries",
-        timeSeriesPrefix: "/agentTimeSeries:",
-        instantIndex: "idx:agentIndexInstant",
-        instantPrefix: "/agentInstant:"
-      },
-      fieldList: [
-        { fieldName: "childCount", gauge: Gauge.CHILD_COUNT, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE }
-      ],
-      //@@ need type declare in appframework ?? agent does not use appframework ... perhaps stspublisher
-      GetPathFromContext(context) {
-        const { agentName, threadId, asyncRunnerId } = context;
-        return `/${agentName}/${threadId}/${asyncRunnerId}`;
-      },
-      redisQueryFilters: {
-        level1ContextField: "serviceType",
-        level2ContextField: "appid",
-        //@@ this should be named something else
-        level3ContextField: "appinstanceid"
-        //@@ this should be named something else
-      },
-      subscriptionTopics: [
-        {
-          subscriptionTopic: SubscriptionTopic.AllAgentsCombined,
-          route: "/metrics"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.Agents,
-          route: "/metrics/agents"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.AgentWorkers,
-          route: "/metrics/agents/:key"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.AgentWorker,
-          route: "/metrics/agents/:key/:subkey"
-        }
-      ]
-    },
-    ["lambda"]: {
-      influxDBContextTags: [
-        "technology",
-        "subTechnology",
-        "lambdaFunctionName",
-        "lambdaInstance",
-        "hostName",
-        "processId",
-        "parentProcessId",
-        "useCase",
-        "pattern"
-      ],
-      redisIndexPrefixDefinitions: {
-        timeSeriesIndex: "idx:lambdaIndexTimeSeries",
-        timeSeriesPrefix: "/lambdaTimeSeries:",
-        instantIndex: "idx:lambdaIndexInstant",
-        instantPrefix: "/lambdaInstant:"
-      },
-      fieldList: [
-        { fieldName: "cpu", gauge: Gauge.CPU_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionCount", gauge: Gauge.CONNECTION_COUNT_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionPoolCount", gauge: Gauge.CONNECTION_POOL_TOTAL_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionIdleCount", gauge: Gauge.CONNECTION_POOL_IDLE_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "connectionWaitingCount", gauge: Gauge.CONNECTION_POOL_WAITING_GAUGE, instrumentProperty: "val", dataType: "number", influxdbDataType: "intField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "systemcpu", gauge: Gauge.CPU_SYSTEM_LOAD_GAUGE, instrumentProperty: "val", dataType: "number", timeSeriesIndex: true, quantile: true, influxdbDataType: "floatField", gaugeType: GaugeTypes.INSTRUMENT_GAUGE },
-        { fieldName: "memory", gauge: Gauge.OBJECT_GAUGE, instrumentProperty: "val", dataType: "JSON", influxdbDataType: "stringField", gaugeType: GaugeTypes.INSTRUMENT_OBJECT }
-      ],
-      //@@ need type declare in appframework
-      GetPathFromContext(context) {
-        const { technology, subTechnology, lambdaInstance } = context;
-        return `/${technology}/${subTechnology}/${lambdaInstance}`;
-      },
-      redisQueryFilters: {
-        level1ContextField: "serviceType",
-        level2ContextField: "technology",
-        level3ContextField: "subTechnology"
-      },
-      subscriptionTopics: [
-        {
-          subscriptionTopic: SubscriptionTopic.AllLambdasCombined,
-          // uicontrollerlanding
-          route: "/metrics"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.LambdaTechnologies,
-          // uicontrollerlambda
-          route: "/metrics/lambdas"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.LambdaSubTechnologies,
-          // uicontrollerlambdasubtechnologies
-          route: "/metrics/lambdas/:key"
-        },
-        {
-          subscriptionTopic: SubscriptionTopic.LambdaSubTechnologiesInstance,
-          // uicontrollerlambdasubtechnologiesinstance
-          route: "/metrics/lambdas/:key/:subkey"
-        }
-      ]
-    }
-  }
-};
-const GetInstruments = (service) => {
-  const fieldList = [
-    ...globalServiceDefinitions.coreFieldList,
-    ...globalServiceDefinitions.logFieldList,
-    ...globalServiceDefinitions.services[service].fieldList
-  ];
-  const retVal = [];
-  fieldList.forEach((v) => {
-    if (v.instrumentOptions) {
-      retVal.push([v.gauge, v.gaugeType, v.instrumentOptions]);
-    } else {
-      retVal.push([v.gauge, v.gaugeType]);
-    }
-    if (v.histo) {
-      retVal.push([v.histoGaugeType, GaugeTypes.INSTRUMENT_HISTOGRAM]);
+        break;
     }
   });
-  return retVal;
 };
 export {
   AgentInstrumentController,