@emartech/aggregate-metric-logger 4.0.1 → 5.0.1

package/.github/workflows/build.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Use correct Node version
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - name: Cache node_modules
         id: cache_node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: node_modules-${{ hashFiles('**/package-lock.json') }}
@@ -33,7 +33,7 @@ jobs:
       - name: Run tests
         run: npm test
       - name: Slack notification
-        uses: 8398a7/action-slack@a189acbf0b7ea434558662ae25a0de71df69a435
+        uses: 8398a7/action-slack@v3
         if: ${{ failure() }}
         with:
           status: ${{ job.status }}
@@ -48,14 +48,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Use correct Node version
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
       - name: Cache node_modules
         id: cache_node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: node_modules-${{ hashFiles('**/package-lock.json') }}
@@ -63,7 +63,7 @@ jobs:
         if: github.ref_name == 'master'
         run: CI=true npm run semantic-release
       - name: Slack notification
-        uses: 8398a7/action-slack@a189acbf0b7ea434558662ae25a0de71df69a435
+        uses: 8398a7/action-slack@v3
         with:
           status: ${{ job.status }}
           fields: repo,message,author,job,ref

package/.nvmrc

@@ -1 +1 @@
-v16.14.0
+v20.14.0

package/eslint.config.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { getEslintRulesForJs } = require('@emartech/rti-server-tools');
+const globals = require('globals');
+
+module.exports = [
+  ...getEslintRulesForJs(),
+  {
+    languageOptions: {
+      globals: globals.node
+    }
+  },
+  {
+    files: ['**/*.spec.js', 'test-helpers/*.js'],
+    languageOptions: {
+      globals: globals.jest
+    }
+  }
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emartech/aggregate-metric-logger",
-  "version": "4.0.1",
+  "version": "5.0.1",
   "description": "aggregate metrics in memory for logging",
   "main": "src/index.js",
   "scripts": {
@@ -29,21 +29,21 @@
     "access": "public"
   },
   "dependencies": {
-    "@emartech/json-logger": "^8.0.2",
-    "@google-cloud/monitoring": "^4.0.0",
-    "date-fns": "2.30.0",
-    "json-stable-stringify": "^1.0.1",
+    "@emartech/json-logger": "^8.0.3",
+    "@google-cloud/monitoring": "^3.0.2",
+    "date-fns": "^2.3.0",
+    "json-stable-stringify": "^1.1.1",
     "lodash": "^4.17.15",
     "ms": "^2.1.3"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "11.1.0",
-    "@types/jest": "29.5.5",
+    "@emartech/rti-server-tools": "^6.13.8",
+    "@sinonjs/fake-timers": "^11.2.2",
+    "@types/jest": "^29.5.12",
     "dotenv-haphap": "^3.1.2",
-    "eslint": "8.50.0",
-    "eslint-config-emarsys": "^5.1.0",
-    "eslint-plugin-jest": "27.4.2",
-    "jest": "29.7.0",
+    "eslint": "^9.4.0",
+    "globals": "15.4.0",
+    "jest": "^29.2.2",
     "semantic-release": "^19.0.2"
   }
 }

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

@@ -5,13 +5,23 @@ const { publishTimeSeries } = require('../gcp-time-series-publisher/gcp-time-ser
 const { buildTimeSeries } = require('../gcp-time-series-builder/gcp-time-series-builder');
 const { createCounter } = require('../metric-types/counter/counter');
 const { createDistribution } = require('../metric-types/distribution/distribution');
+const { isNumber, isPlainObject } = require('lodash');
 
 let metrics = {};
 let initialized = false;
 let timeoutId = null;
 
-exports.count = (metricName, labels = {}, value = 1) =>
+exports.count = (metricName, labels = {}, value = 1) => {
+  if (!isNumber(value)) {
+    throw new Error(`${ value } is not a number`);
+  }
+
+  if (!isPlainObject(labels)) {
+    throw new Error('labels is not a plain object');
+  }
+
   addToMetric(metricName, labels, 'counter', value);
+};
 
 exports.measure = (metricName, labels = {}, value = 1) =>
   addToMetric(metricName, labels, 'distribution', value);

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

@@ -98,6 +98,22 @@ describe('gcpMetricCollector', () => {
 
       expect(getPublishedMetrics()).toEqual([]);
     });
+
+    it('should validate labels parameter whether it is an object', async () => {
+      process.env.METRIC_LOGGER_ENABLED = 'false';
+
+      expect(() => {
+        gcpMetricCollector.count('irrelevant', new Error('not a plain object'), 88);
+      }).toThrow(new Error('labels is not a plain object'));
+    });
+
+    it('should validate value parameter whether it is a number', async () => {
+      process.env.METRIC_LOGGER_ENABLED = 'false';
+
+      expect(() => {
+        gcpMetricCollector.count('irrelevant', {}, '88');
+      }).toThrow(new Error('88 is not a number'));
+    });
   });
 
   describe('measure', () => {

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

@@ -39,6 +39,5 @@ describe('gcpMetricPublisher', () => {
         timeSeries: range(201, 300)
       });
     });
-
   });
 });

package/.eslintrc.js

@@ -1,25 +0,0 @@
-'use strict';
-
-module.exports = {
-  env: {
-    es6: true,
-    browser: true,
-    node: true
-  },
-  parserOptions: {
-    ecmaVersion: 2018
-  },
-  extends: ['eslint:recommended', 'plugin:jest/recommended', 'emarsys'],
-  rules: {
-    curly: ['error', 'multi-line'],
-    'operator-linebreak': ['error', 'after', { overrides: { '?': 'before', ':': 'before' } }]
-  },
-  overrides: [
-    {
-      files: ['*.spec.js'],
-      env: {
-        jest: true
-      }
-    }
-  ]
-};