@emartech/aggregate-metric-logger 6.7.0 → 6.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emartech/aggregate-metric-logger",
-  "version": "6.7.0",
+  "version": "6.7.2",
   "description": "aggregate metrics in memory for logging",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/gcp-metric-collector/gcp-metric-collector.js

@@ -19,6 +19,7 @@ class GcpMetricCollector {
   initialized = false;
   timeoutId = null;
   projectId = null;
+  flushInProgress = false;
 
   constructor(projectId = null) {
     this.projectId = projectId ?? process.env.MONITORING_PROJECT_ID;
@@ -106,11 +107,17 @@ class GcpMetricCollector {
   }
 
   async publishPending() {
-    const timeSeries = createGcpTimeSeriesBuilder(this.projectId).buildTimeSeries(this.metrics);
-    for (const [, metric] of Object.entries(this.metrics)) {
-      metric.aggregator.advanceTimer();
+    if (this.flushInProgress) return;
+    this.flushInProgress = true;
+    try {
+      const timeSeries = createGcpTimeSeriesBuilder(this.projectId).buildTimeSeries(this.metrics);
+      for (const [, metric] of Object.entries(this.metrics)) {
+        metric.aggregator.advanceTimer();
+      }
+      await createGcpTimeSeriesPublisher(this.projectId).publishTimeSeries(timeSeries);
+    } finally {
+      this.flushInProgress = false;
     }
-    await createGcpTimeSeriesPublisher(this.projectId).publishTimeSeries(timeSeries);
   }
 }
 

package/src/gcp-metric-collector/gcp-metric-collector.spec.js

@@ -538,6 +538,26 @@ describe('gcpMetricCollector', () => {
     });
   });
 
+  describe('concurrent flush', () => {
+    it('should not publish concurrently if a flush is already in flight', async () => {
+      const firstCreateTimeSeriesPromise = resolvablePromise();
+      jest.spyOn(MetricServiceClient.prototype, 'createTimeSeries')
+        .mockReturnValueOnce(firstCreateTimeSeriesPromise)
+        .mockResolvedValue();
+
+      gcpMetricCollector.count('jolo', {}, 1);
+      jest.advanceTimersByTime(60 * 1000 + 1);
+
+      gcpMetricCollector.count('jolo', {}, 1);
+      jest.advanceTimersByTime(60 * 1000 + 1);
+
+      firstCreateTimeSeriesPromise.resolve();
+      await flushPromises();
+
+      expect(MetricServiceClient.prototype.createTimeSeries).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('shutdown', () => {
     it('should flush pending metrics immediately', async () => {
       stubCreateTimeSeries();

package/src/metric-types/counter/counter.js

@@ -2,7 +2,7 @@
 
 exports.createCounter = () => {
   let count = 0;
-  const startTime = Date.now() - 1000;
+  let startTime = Date.now() - 1000;
 
   return {
     getState: () => ({
@@ -13,6 +13,8 @@ exports.createCounter = () => {
       value: { int64Value: `${count}` }
     }),
     add: value => (count += value),
-    advanceTimer: () => {}
+    advanceTimer: () => {
+      startTime = Date.now();
+    }
   };
 };

package/src/metric-types/counter/counter.spec.js

@@ -43,11 +43,23 @@ describe('count', () => {
 
     expect(counter.getState()).toMatchObject({
       value: { int64Value: '3' },
-      startTime: 7880,
+      startTime: 8900,
       endTime: 8900
     });
   });
 
+  it('should advance startTime on advanceTimer so successive GCP writes are in order', () => {
+    jest.useFakeTimers().setSystemTime(new Date(8880));
+    const counter = createCounter();
+
+    const firstStartTime = counter.getState().startTime;
+    jest.advanceTimersByTime(60000);
+    counter.advanceTimer();
+    const secondStartTime = counter.getState().startTime;
+
+    expect(secondStartTime).toBeGreaterThan(firstStartTime);
+  });
+
   it('should return current time as endTime', () => {
     jest.useFakeTimers().setSystemTime(new Date(880));
     const counter = createCounter();