@hkube/metrics 1.0.42 → 1.0.45

package/.github/workflows/main.yml

@@ -34,26 +34,30 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
   publish:
-    if: github.ref == 'refs/heads/master'
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: setup git
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-      - name: version
-        run: |
-          git checkout -f -b version-branch
-          npm version patch --no-commit-hooks -m "$(git log -1 --pretty=%B) .... bump version [skip ci]"
-          git push origin version-branch:master --follow-tags
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 14
-      - name: Publish
-        run: |
-          npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
-          npm publish --ignore-scripts
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      if: github.ref == 'refs/heads/master'
+      needs: test
+      runs-on: ubuntu-latest
+      #Needed for OIDC - Npm repo publishing
+      permissions:
+          id-token: write
+          contents: write
+      steps:
+          - uses: actions/checkout@v2
+          - name: setup git
+            run: |
+                git config --local user.email "action@github.com"
+                git config --local user.name "GitHub Action"
+          - name: version
+            run: |
+              git checkout -f -b version-branch
+              npm version patch --no-commit-hooks -m "$(git log -1 --pretty=%B) .... bump version [skip ci]"
+              git push origin version-branch:master --follow-tags
+          - uses: actions/setup-node@v4 # Use v4 for OIDC support
+            with:
+                node-version: 24 # Use a modern Node version
+                registry-url: https://registry.npmjs.org
+                scope: '@hkube'
+          - name: Enable provenance
+            run: npm config set provenance true
+          - name: Publish to npm
+            run: NODE_AUTH_TOKEN="" npm publish --access public --loglevel verbose

package/lib/counter.js

@@ -24,6 +24,16 @@ class CounterMeasure {
     remove() {
         client.register.removeSingleMetric(this._name + COUNTER_POSTFIX);
     }
+    removeEntriesByLabel(labelName, labelValue) {
+        const keysToDelete = [];
+        const hashKeys = Object.keys(this._requestCounter.hashMap);
+        hashKeys.forEach((key) => {
+            if (this._requestCounter.hashMap[key].labels[labelName] === labelValue) {
+                keysToDelete.push(key);
+            }
+        });
+        keysToDelete.forEach(key => delete this._requestCounter.hashMap[key]);
+    }
 }
 
 module.exports = CounterMeasure;

package/lib/gauge.js

@@ -36,6 +36,16 @@ class GaugeMeasure {
     remove() {
         client.register.removeSingleMetric(this._name + GAUGE_POSTFIX);
     }
+    removeEntriesByLabel(labelName, labelValue) {
+        const keysToDelete = [];
+        const hashKeys = Object.keys(this._requestGauge.hashMap);
+        hashKeys.forEach((key) => {
+            if (this._requestGauge.hashMap[key].labels[labelName] === labelValue) {
+                keysToDelete.push(key);
+            }
+        });
+        keysToDelete.forEach(key => delete this._requestGauge.hashMap[key]);
+    }
 }
 
 module.exports = GaugeMeasure;

package/lib/metrics.js

@@ -8,6 +8,7 @@ const GaugeMeasure = require('./gauge');
 const { addTimeMeasureSchema, addCounterMeasureSchema, addTimeMeasureSummarySchema } = require('./schema');
 const router = require('./router');
 const RestServer = require('@hkube/rest-server');
+const promUtils = require('prom-client/lib/util.js');
 
 const {
     beforeRoutesMiddlewares,
@@ -167,6 +168,23 @@ class Metrics {
             this._metrics.delete(this.prefix + name);
         }
     }
+
+    /**
+     * remove all entries in the specified metrics, that are assosiated with the specified jobId
+     * @param {*} options
+     * @param {string} options.labelName
+     * @param {string} options.labelValue
+     * @param {string[]} options.metricsToRemove array of metric names to remove
+     */
+    removeMeasureEntries(options) {
+        const { labelName, labelValue, metricsToRemove } = options;
+        metricsToRemove.forEach((metricName) => {
+            const measureInstance = this.get(metricName);
+            if (measureInstance) {
+                measureInstance.removeEntriesByLabel(labelName, labelValue);
+            }
+        });
+    }   
 }
 
 module.exports = new Metrics();

package/lib/schema.js

@@ -121,7 +121,8 @@ const tracerSchema = {
                 logSpans: { type: 'boolean' },
                 agentHost: { type: 'string', default: 'localhost' },
                 agentPort: { type: ['number', 'string'], default: 6832 },
-                flushIntervalMs: { type: 'number' }
+                queueSize: { type: 'number', default: 2000 }, 
+                flushIntervalMs: { type: 'number', default: 1000 } 
             },
             default: {},
             additionalProperties: false

package/lib/tracer.js

@@ -121,6 +121,19 @@ class Tracer {
         return span;
     }
 
+    close() {
+        return new Promise((resolve) => {
+            if (!this._tracer) {
+                resolve();
+                return;
+            }
+            this._tracer.close(() => {
+                this._tracer = null;
+                resolve();
+            });
+        });
+    }
+
     get parentRelationships() {
         return parentRelationships;
     }

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@hkube/metrics",
-  "version": "1.0.42",
+  "version": "1.0.45",
   "description": "",
   "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/kube-HPC/metrics.hkube.git"
+  },
   "scripts": {
     "test": "NODE_ENV=test node_modules/mocha/bin/mocha test --colors --recursive --exit",
     "test-travis": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec test --exit",

package/test/tracerTest.js

@@ -69,6 +69,26 @@ describe('Tracer', () => {
             const moreTracer = await tracer.createTracer('moreTracer', {});
             expect(moreTracer._tracer._serviceName).to.equal('moreTracer');
         });
+
+        it('should close tracer', async () => {
+            await tracer.init({
+                tracerConfig: {
+                    serviceName: 'test',
+                },
+                tracerOptions: {
+                    reporter: new InMemoryReporter()
+                }
+
+            });
+            expect(tracer._tracer).to.exist;
+            await tracer.close();
+            expect(tracer._tracer).to.not.exist;
+        });
+
+        it('should close without tracer', async () => {
+            await tracer.close();
+            expect(tracer._tracer).to.not.exist;
+        });
     });
     describe('Span', () => {
         it('should throw without options', async () => {