@emartech/aggregate-metric-logger 3.0.1 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emartech/aggregate-metric-logger",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "description": "aggregate metrics in memory for logging",
   "main": "src/index.js",
   "scripts": {
@@ -29,19 +29,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@emartech/json-logger": "^3.1.0",
+    "@emartech/json-logger": "^7.2.3",
     "@google-cloud/monitoring": "^3.0.2",
     "date-fns": "^2.3.0",
     "json-stable-stringify": "^1.0.1",
-    "lodash": "^4.17.15"
+    "lodash": "^4.17.15",
+    "ms": "^2.1.3"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "9.1.1",
-    "@types/jest": "27.4.1",
+    "@sinonjs/fake-timers": "^10.0.0",
+    "@types/jest": "^29.2.3",
     "dotenv-haphap": "^3.1.2",
     "eslint": "^8.12.0",
     "eslint-config-emarsys": "^5.1.0",
-    "eslint-plugin-jest": "^26.1.3",
+    "eslint-plugin-jest": "^27.1.5",
     "jest": "^29.2.2",
     "semantic-release": "^19.0.2"
   }

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

@@ -25,10 +25,10 @@ const addToMetric = (metricName, labels = {}, type, value) => {
   }
   const key = `${metricName}_${stringify(labels)}`;
   if (!metrics[key]) {
-    const value = type === 'counter' ? createCounter() : createDistribution();
-    metrics[key] = { name: metricName, labels, value };
+    const aggregator = type === 'counter' ? createCounter() : createDistribution();
+    metrics[key] = { name: metricName, labels, aggregator };
   }
-  metrics[key].value.add(value);
+  metrics[key].aggregator.add(value);
 };
 
 exports.reset = () => {
@@ -44,7 +44,7 @@ const setupNextFlush = () => {
 const flush = async () => {
   const timeSeries = buildTimeSeries(metrics);
   for (const [, metric] of Object.entries(metrics)) {
-    metric.value.advanceTimer();
+    metric.aggregator.advanceTimer();
   }
   await publishTimeSeries(timeSeries);
   setupNextFlush();

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

@@ -36,7 +36,7 @@ describe('gcpMetricCollector', () => {
             name: 'jolo',
             labels: { kacsa: 'A' },
             value: { int64Value: '88' },
-            startTime: 20000,
+            startTime: 19999,
             endTime: 80000,
             metricKind: 'CUMULATIVE',
             valueType: 'int64Value'

package/src/gcp-time-series-builder/gcp-time-series-builder.js

@@ -2,7 +2,7 @@
 
 exports.buildTimeSeries = metrics =>
   Object.values(metrics).map(metric => {
-    const state = metric.value.getState();
+    const state = metric.aggregator.getState();
     return {
       metric: {
         type: `custom.googleapis.com/${metric.name}`,

package/src/gcp-time-series-builder/gcp-time-series-builder.spec.js

@@ -15,7 +15,7 @@ const dummyMetric = ({
 }) => ({
   name,
   labels,
-  value: {
+  aggregator: {
     getState: () => ({
       value: { int64Value: `${count}` },
       startTime,

package/src/gcp-time-series-publisher/gcp-time-series-publisher.js

@@ -1,26 +1,36 @@
 'use strict';
 
-const logger = require('@emartech/json-logger')('aggregate-metric-logger');
+const { createLogger } = require('@emartech/json-logger');
 const monitoring = require('@google-cloud/monitoring');
 const { chunk } = require('lodash');
+const ms = require('ms');
 
+const logger = createLogger('aggregate-metric-logger');
 const MAX_TIME_SERIES_COUNT = 200;
 
 exports.publishTimeSeries = async timeSeries => {
   try {
     const client = getMonitoringClient();
-
     for (const timeSeriesChunk of chunk(timeSeries, MAX_TIME_SERIES_COUNT)) {
-      await client.createTimeSeries({
-        name: client.projectPath(process.env.MONITORING_PROJECT_ID),
-        timeSeries: timeSeriesChunk
-      });
+      await createTimeSeries(client, timeSeriesChunk);
     }
   } catch (error) {
     logger.warnFromError('pushing-metrics-failed', error, { do_not_alert: true });
   }
 };
 
+const createTimeSeries = async (client, timeSeries) => {
+  const name = client.projectPath(process.env.MONITORING_PROJECT_ID);
+  try {
+    await client.createTimeSeries({ name, timeSeries });
+  } catch (error) {
+    await sleep(ms('10 sec'));
+    await client.createTimeSeries({ name, timeSeries });
+  }
+};
+
+const sleep = async sleepTime => new Promise(resolve => setTimeout(resolve, sleepTime));
+
 let monitoringClientInstance = null;
 const getMonitoringClient = () => {
   if (!monitoringClientInstance) {

package/src/laas-metric-logger/laas-metric-logger.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const loggerFactory = require('@emartech/json-logger');
+const { createLogger } = require('@emartech/json-logger');
 const { getSeconds, startOfMinute, addSeconds } = require('date-fns');
 const { omit, pick, fromPairs, toPairs } = require('lodash');
 const stringify = require('json-stable-stringify');
@@ -9,7 +9,7 @@ module.exports = ({
   enabled = true,
   namespace = 'aggregate-metric-logger'
 } = {}) => {
-  const logger = loggerFactory(namespace);
+  const logger = createLogger(namespace);
 
   const thresholdsByTag = {};
   let metrics = {};

package/src/laas-metric-logger/laas-metric-logger.spec.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Logger = require('@emartech/json-logger').Logger;
+const { Logger } = require('@emartech/json-logger');
 const fakeTimers = require('@sinonjs/fake-timers');
 const metricLoggerFactory = require('./laas-metric-logger');
 
@@ -19,7 +19,7 @@ describe('metricLogger', () => {
       metricLogger.measure('elfogyasztot-tap', 4);
 
       clock.tick(60 * 1000 + 1);
-      expect(Logger.prototype.info).toBeCalledWith('elfogyasztot-tap', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('elfogyasztot-tap', {
         min: 4,
         max: 4,
         count: 1,
@@ -35,7 +35,7 @@ describe('metricLogger', () => {
       metricLogger.measure('kacsa-cucc', 18);
 
       clock.tick(60 * 1000 + 1);
-      expect(Logger.prototype.info).toBeCalledWith('elfogyasztot-tap', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('elfogyasztot-tap', {
         min: 4,
         max: 8,
         count: 2,
@@ -43,7 +43,7 @@ describe('metricLogger', () => {
         average: 6,
         is_metric: true
       });
-      expect(Logger.prototype.info).toBeCalledWith('kacsa-cucc', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('kacsa-cucc', {
         min: 18,
         max: 18,
         count: 1,
@@ -59,7 +59,7 @@ describe('metricLogger', () => {
       metricLogger.measure('elfogyasztot-tap', 18, { emberke: 'jano' });
 
       clock.tick(60 * 1000 + 1);
-      expect(Logger.prototype.info).toBeCalledWith('elfogyasztot-tap', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('elfogyasztot-tap', {
         min: 4,
         max: 8,
         count: 2,
@@ -68,7 +68,7 @@ describe('metricLogger', () => {
         emberke: 'bela',
         is_metric: true
       });
-      expect(Logger.prototype.info).toBeCalledWith('elfogyasztot-tap', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('elfogyasztot-tap', {
         min: 18,
         max: 18,
         count: 1,
@@ -84,7 +84,7 @@ describe('metricLogger', () => {
       metricLogger.measure('elfogyasztot-tap', 8, { b: 2, a: 1 });
 
       clock.tick(60 * 1000 + 1);
-      expect(Logger.prototype.info).toBeCalledWith('elfogyasztot-tap', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('elfogyasztot-tap', {
         min: 4,
         max: 8,
         count: 2,
@@ -108,7 +108,7 @@ describe('metricLogger', () => {
       metricLogger.measure('etwas', 816);
 
       clock.tick(60 * 1000 + 1);
-      expect(Logger.prototype.info).toBeCalledWith('etwas', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('etwas', {
         min: 2,
         max: 816,
         count: 7,
@@ -141,7 +141,7 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement);
 
       clock.tick(60 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', {
         min: 50,
         max: 50,
         count: 1,
@@ -160,7 +160,7 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement2);
 
       clock.tick(60 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', {
         min: 50,
         max: 70,
         sum: 120,
@@ -175,9 +175,9 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement);
 
       clock.tick(29 * 1000 + 999);
-      expect(Logger.prototype.info).not.toBeCalled();
+      expect(Logger.prototype.info).not.toHaveBeenCalled();
       clock.tick(1 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', expect.anything());
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', expect.anything());
     });
 
     it('should flush at next minute:30 if we are after 30 in current minute', () => {
@@ -186,9 +186,9 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement);
 
       clock.tick(44 * 1000);
-      expect(Logger.prototype.info).not.toBeCalled();
+      expect(Logger.prototype.info).not.toHaveBeenCalled();
       clock.tick(1 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', expect.anything());
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', expect.anything());
     });
 
     it('should periodically log measuerments', () => {
@@ -199,7 +199,7 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement1);
 
       clock.tick(21 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', {
         count: 1,
         max: 10000,
         min: 10000,
@@ -211,7 +211,7 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement2);
       metricLogger.stop(measurement3);
       clock.tick(60 * 1000);
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', {
         count: 2,
         max: 31000,
         min: 21000,
@@ -230,7 +230,7 @@ describe('metricLogger', () => {
       metricLogger.stop(measurement2);
       clock.tick(15 * 1000);
 
-      expect(Logger.prototype.info).toBeCalledWith('utlegeles', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('utlegeles', {
         count: 1,
         max: 10000,
         min: 10000,
@@ -239,7 +239,7 @@ describe('metricLogger', () => {
         a: 21,
         is_metric: true
       });
-      expect(Logger.prototype.info).toBeCalledWith('nyavogas', {
+      expect(Logger.prototype.info).toHaveBeenCalledWith('nyavogas', {
         count: 1,
         max: 15000,
         min: 15000,
@@ -260,7 +260,7 @@ describe('metricLogger', () => {
         metricLogger[method]('elfogyasztot-tap', { alma: 2 });
 
         clock.tick(60 * 1000 + 11500);
-        expect(Logger.prototype[method]).toBeCalledWith('elfogyasztot-tap', {
+        expect(Logger.prototype[method]).toHaveBeenCalledWith('elfogyasztot-tap', {
           count: 2,
           alma: 2,
           is_metric: true

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

@@ -2,7 +2,7 @@
 
 exports.createCounter = () => {
   let count = 0;
-  const startTime = Date.now();
+  const startTime = Date.now() - 1;
 
   return {
     getState: () => ({

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

@@ -8,7 +8,7 @@ describe('count', () => {
     const counter = createCounter();
 
     expect(counter.getState()).toEqual({
-      startTime: 880,
+      startTime: 879,
       endTime: 880,
       metricKind: 'CUMULATIVE',
       valueType: 'int64Value',
@@ -16,6 +16,13 @@ describe('count', () => {
     });
   });
 
+  it('should return with the startTime which is before the endTime even when no time passes', () => {
+    // which is a must-have for non-gauge metrics
+    jest.useFakeTimers().setSystemTime(new Date(880));
+    const counter = createCounter();
+    expect(counter.getState().endTime).toBeGreaterThan(counter.getState().startTime);
+  });
+
   it('should increment counter when a value is added', () => {
     const counter = createCounter();
 
@@ -36,7 +43,7 @@ describe('count', () => {
 
     expect(counter.getState()).toMatchObject({
       value: { int64Value: '3' },
-      startTime: 880,
+      startTime: 879,
       endTime: 900
     });
   });