FIX: query with incomplete span

sensedeep · Dec 8, 2024 · e2ed655 · e2ed655
1 parent 27a098b
commit e2ed655
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/dist/cjs/index.js b/dist/cjs/index.js
@@ -145,8 +145,10 @@ class CustomMetrics {
             spans: [{ points: [{ count: 0, sum: 0 }] }],
         });
         let current = elt.spans[0].points.at(-1);
-        current.count += point.count;
-        current.sum += point.sum;
+        if (current) {
+            current.count += point.count;
+            current.sum += point.sum;
+        }
         elt.count += point.count;
         elt.sum += point.sum;
         if (buffer.force ||
@@ -334,6 +336,9 @@ class CustomMetrics {
             let interval = span.period / span.samples;
             let count = Math.ceil(period / interval);
             let index = span.points.length - (span.end - start) / interval;
+            if (index < 0) {
+                index = 0;
+            }
             span.points = span.points.slice(index, index + count);
             if (options.accumulate) {
                 result = this.accumulateMetric(metric, span, statistic, owner, timestamp);

diff --git a/dist/mjs/index.js b/dist/mjs/index.js
@@ -153,8 +153,10 @@ export class CustomMetrics {
             spans: [{ points: [{ count: 0, sum: 0 }] }],
         });
         let current = elt.spans[0].points.at(-1);
-        current.count += point.count;
-        current.sum += point.sum;
+        if (current) {
+            current.count += point.count;
+            current.sum += point.sum;
+        }
         elt.count += point.count;
         elt.sum += point.sum;
         if (buffer.force ||
@@ -342,6 +344,9 @@ export class CustomMetrics {
             let interval = span.period / span.samples;
             let count = Math.ceil(period / interval);
             let index = span.points.length - (span.end - start) / interval;
+            if (index < 0) {
+                index = 0;
+            }
             span.points = span.points.slice(index, index + count);
             if (options.accumulate) {
                 result = this.accumulateMetric(metric, span, statistic, owner, timestamp);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "custom-metrics",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "Custom metrics for AWS",
     "main": "dist/cjs/index.js",
     "module": "dist/mjs/index.js",

diff --git a/src/index.ts b/src/index.ts
@@ -356,8 +356,10 @@ export class CustomMetrics {
             Add point value to the lowest span and to the elt (to manage when to persist)
          */
         let current = elt.spans[0].points.at(-1)
-        current.count += point.count
-        current.sum += point.sum
+        if (current) {
+            current.count += point.count
+            current.sum += point.sum
+        }
         elt.count += point.count
         elt.sum += point.sum
 
@@ -645,6 +647,9 @@ export class CustomMetrics {
             let interval = span.period / span.samples
             let count = Math.ceil(period / interval)
             let index = span.points.length - (span.end - start) / interval
+            if (index < 0) {
+                index = 0
+            }
             span.points = span.points.slice(index, index + count)
 
             if (options.accumulate) {