@mhubcloud/tms_core 3.7.2 → 3.8.0-beta.1

package/dist/index.js

@@ -53,6 +53,7 @@ var import_service_bus = require("@azure/service-bus");
 var utils_exports = {};
 __export(utils_exports, {
   EventPublisherBase: () => EventPublisherBase,
+  aiClient: () => aiClient,
   encodeEmail: () => encodeEmail,
   extractAdCode: () => extractAdCode,
   extractClickId: () => extractClickId,
@@ -61,17 +62,37 @@ __export(utils_exports, {
   flatten: () => flatten,
   formatError: () => formatError,
   handlePlatformRequest: () => handlePlatformRequest,
+  logAggregatedMetric: () => logAggregatedMetric,
   logEvent: () => logEvent,
   logException: () => logException,
   logMessage: () => logMessage,
+  logMilestone: () => logMilestone,
   prepareTestRequestHeaders: () => prepareTestRequestHeaders,
   removeUndefined: () => removeUndefined
 });
 var crypto = __toESM(require("crypto"));
 var appInsights = __toESM(require("applicationinsights"));
+
+// src/utils/redisClient.ts
+var import_redis = require("redis");
+var client;
+var port = process.env["RedisPort"] ?? "6380";
+async function getRedisClient() {
+  if (!client) {
+    client = (0, import_redis.createClient)({
+      url: `rediss://${process.env["RedisUrl"]}:${port}`,
+      password: process.env["RedisPassword"],
+      socket: { tls: true }
+    });
+    await client.connect();
+  }
+  return client;
+}
+
+// src/utils/utils.ts
 var aiClient = null;
 if (process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
-  appInsights.setup().setAutoCollectDependencies(false).setAutoCollectConsole(true, false).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false).setUseDiskRetryCaching(false).start();
+  appInsights.setup().setAutoCollectDependencies(false).setAutoCollectConsole(true, false).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false, false).setUseDiskRetryCaching(false).start();
   aiClient = appInsights.defaultClient;
 }
 var EventPublisherBase = class {
@@ -95,6 +116,17 @@ var EventPublisherBase = class {
     );
   }
 };
+async function logRedisEvent(key) {
+  const redis = await getRedisClient();
+  if (!redis) return;
+  await redis.hIncrBy(key, "count", 1);
+  await redis.expire(key, 660);
+}
+function logAggregatedMetric(prefix, name, dimensions) {
+  const windowStart = Math.floor(Date.now() / 6e4) * 6e4;
+  const key = dimensions ? `${prefix}:${windowStart}:${dimensions}:${name}` : `${prefix}:${windowStart}:${name}`;
+  logRedisEvent(key);
+}
 function logMessage(level, message, properties) {
   console.log(message);
   aiClient?.trackTrace({
@@ -104,59 +136,40 @@ function logMessage(level, message, properties) {
   });
 }
 function logEvent(publisher2, event, region, status, payload, id) {
-  let message = "";
-  if (status || status === 0) {
-    if (status >= 200 && status < 300) {
-      if (!process.env["DisableMetrics"]) {
-        aiClient?.trackMetric({
-          name: `DispatchSuccess`,
-          value: 1,
-          properties: {
-            publisher: publisher2,
-            event,
-            region
-          }
-        });
-      }
-      message = "Event dispatched to platform";
-    } else {
-      if (!process.env["DisableMetrics"]) {
-        aiClient?.trackMetric({
-          name: `DispatchFail`,
-          value: 1,
-          properties: {
-            publisher: publisher2,
-            event,
-            region
-          }
-        });
-      }
-      message = "Event dispatch failed";
-    }
-  } else {
-    message = "Event dispatched to platform";
+  if (!process.env["DisableMetrics"]) {
+    const metricRegion = process.env["DisableMetricRegionLogging"] ? "default" : region;
+    const name = status >= 200 && status < 400 ? "DispatchSuccess" : "DispatchFailure";
+    logAggregatedMetric("events", name, `${metricRegion}:${publisher2}:${event}`);
   }
-  let properties = {
-    publisher: publisher2,
-    event,
-    region,
-    id,
-    status,
-    payload
-  };
-  properties = removeUndefined(properties);
-  logMessage(1, message, properties);
+  ;
+  if (!process.env["DisableTraces"]) {
+    let properties = {
+      publisher: publisher2,
+      event,
+      region,
+      id,
+      status,
+      payload
+    };
+    const message = status >= 200 && status < 400 ? "Event dispatched to platform" : "Event dispatch failed";
+    properties = removeUndefined(properties);
+    logMessage(1, message, properties);
+  }
+  ;
 }
 function logException(exception, publisher2) {
-  aiClient?.trackMetric({
-    name: `Error`,
-    value: 1,
-    properties: {
-      type: exception.name,
-      publisher: publisher2 ?? "Other"
-    }
-  });
-  aiClient?.trackException({ exception });
+  if (!process.env["DisableMetrics"]) {
+    const message = exception.message.split(".")[0]?.substring(0, 100).replace(/:/g, "");
+    logAggregatedMetric("errors", exception.name, `${publisher2 ?? "Other"}:${message}`);
+  }
+  ;
+  if (!process.env["DisableTraces"]) {
+    aiClient?.trackException({ exception });
+  }
+  ;
+}
+function logMilestone(name, value) {
+  logAggregatedMetric("milestones", String(value), name);
 }
 function removeUndefined(originalValue) {
   if (originalValue instanceof Array) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mhubcloud/tms_core",
-    "version": "3.7.2",
+    "version": "3.8.0-beta.1",
     "description": "Core function for mHub Cloud TMS publishers",
     "homepage": "https://mhubcloud.com/",
     "license": "Apache 2.0",
@@ -25,7 +25,8 @@
         "@azure/data-tables": "^13.2.2",
         "@azure/service-bus": "^7.9.5",
         "ajv": "^8.12.0",
-        "applicationinsights": "^2.6.0"
+        "applicationinsights": "^2.9.8",
+        "redis": "^6.1.0"
     },
     "devDependencies": {
         "@azure/functions": "^3.5.1",
@@ -44,4 +45,4 @@
         "tsup": "^8.5.0",
         "typescript": "^4.9.5"
     }
-}
+}