DEV: fix TTL on termination and default dimensions on emit()

sensedeep · Jun 24, 2024 · 76dc5ca · 76dc5ca
1 parent f5ac357
commit 76dc5ca
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 219 deletions.
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
@@ -94,6 +94,9 @@ class CustomMetrics {
         if (value == undefined || value == null) {
             throw new Error('Invalid metric value');
         }
+        if (dimensionsList.length == 0) {
+            dimensionsList = [{}];
+        }
         value = Number(value);
         if (isNaN(value)) {
             throw new Error(`Value to emit is not valid`);
@@ -224,7 +227,13 @@ class CustomMetrics {
     }
     async flushElt(elt) {
         let point = { count: elt.count, sum: elt.sum, timestamp: elt.timestamp };
-        await this.emitDimensionedMetric(elt.namespace, elt.metric, point, elt.dimensions, { timestamp: elt.timestamp });
+        let timestamp = Date.now() / 1000;
+        if (timestamp > elt.timestamp) {
+            timestamp = elt.timestamp;
+        }
+        await this.emitDimensionedMetric(elt.namespace, elt.metric, point, elt.dimensions, {
+            timestamp: timestamp * 1000
+        });
     }
     getBufferKey(namespace, metricName, dimensions) {
         return `${namespace}|${metricName}|${JSON.stringify(dimensions)}`;

diff --git a/dist/mjs/index.js b/dist/mjs/index.js
@@ -102,6 +102,9 @@ export class CustomMetrics {
         if (value == undefined || value == null) {
             throw new Error('Invalid metric value');
         }
+        if (dimensionsList.length == 0) {
+            dimensionsList = [{}];
+        }
         value = Number(value);
         if (isNaN(value)) {
             throw new Error(`Value to emit is not valid`);
@@ -232,7 +235,13 @@ export class CustomMetrics {
     }
     async flushElt(elt) {
         let point = { count: elt.count, sum: elt.sum, timestamp: elt.timestamp };
-        await this.emitDimensionedMetric(elt.namespace, elt.metric, point, elt.dimensions, { timestamp: elt.timestamp });
+        let timestamp = Date.now() / 1000;
+        if (timestamp > elt.timestamp) {
+            timestamp = elt.timestamp;
+        }
+        await this.emitDimensionedMetric(elt.namespace, elt.metric, point, elt.dimensions, {
+            timestamp: timestamp * 1000
+        });
     }
     getBufferKey(namespace, metricName, dimensions) {
         return `${namespace}|${metricName}|${JSON.stringify(dimensions)}`;