@tramvai/module-metrics 2.111.1 → 2.117.0

package/lib/metrics/eventLoop.es.js

@@ -1,20 +1,22 @@
 const NODEJS_EVENTLOOP_LAG = 'nodejs_eventloop_setinterval_lag_seconds';
+const RESOLUTION = 100;
 function startEventLoopLagMeasure(histogram) {
     let start = process.hrtime();
-    const interval = 100;
-    setInterval(() => {
+    const measure = () => {
         const delta = process.hrtime(start);
         const nanosec = delta[0] * 1e9 + delta[1];
         const ms = nanosec / 1e6;
-        const lag = ms - interval;
+        const lag = ms - RESOLUTION;
         histogram.observe(lag / 1e3);
         start = process.hrtime();
-    }, interval).unref();
+        setTimeout(measure, RESOLUTION).unref();
+    };
+    setTimeout(measure, RESOLUTION).unref();
 }
 const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
         name: NODEJS_EVENTLOOP_LAG,
-        help: 'Lag of event loop in seconds (setInterval based).',
+        help: 'Lag of event loop in seconds (setTimeout based).',
         buckets: [0.01, 0.02, 0.1, 0.2, 0.5, 1, 3, 5, 7.5, 10],
     });
     startEventLoopLagMeasure(histogram);

package/lib/metrics/eventLoop.js

@@ -3,22 +3,24 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const NODEJS_EVENTLOOP_LAG = 'nodejs_eventloop_setinterval_lag_seconds';
+const RESOLUTION = 100;
 function startEventLoopLagMeasure(histogram) {
     let start = process.hrtime();
-    const interval = 100;
-    setInterval(() => {
+    const measure = () => {
         const delta = process.hrtime(start);
         const nanosec = delta[0] * 1e9 + delta[1];
         const ms = nanosec / 1e6;
-        const lag = ms - interval;
+        const lag = ms - RESOLUTION;
         histogram.observe(lag / 1e3);
         start = process.hrtime();
-    }, interval).unref();
+        setTimeout(measure, RESOLUTION).unref();
+    };
+    setTimeout(measure, RESOLUTION).unref();
 }
 const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
         name: NODEJS_EVENTLOOP_LAG,
-        help: 'Lag of event loop in seconds (setInterval based).',
+        help: 'Lag of event loop in seconds (setTimeout based).',
         buckets: [0.01, 0.02, 0.1, 0.2, 0.5, 1, 3, 5, 7.5, 10],
     });
     startEventLoopLagMeasure(histogram);

package/lib/performance-devtools/PerfMetrics.browser.js

@@ -5,7 +5,7 @@ import { uniqueId } from './uniqueId.browser.js';
 
 function startMeasurePerformance(name, startLabels = {}) {
     if (!supportsUserTiming) {
-        return () => { };
+        return () => 0;
     }
     const endMeasure = startMeasure(name, uniqueId());
     return (endLabels = {}) => {
@@ -13,7 +13,7 @@ function startMeasurePerformance(name, startLabels = {}) {
         const labelsNames = Object.keys(labels)
             .map((key) => `${key}="${labels[key]}"`)
             .join(',');
-        endMeasure(labelsNames && `${name}{${labelsNames}}`);
+        return endMeasure(labelsNames && `${name}{${labelsNames}}`);
     };
 }
 class PerfHistogram extends Histogram {
@@ -24,9 +24,13 @@ class PerfHistogram extends Histogram {
     startTimer(startLabels) {
         const endMeasure = startMeasurePerformance(this.name, startLabels);
         return (endLabels) => {
-            endMeasure(endLabels);
+            return endMeasure(endLabels);
         };
     }
+    zero(labels) {
+        // need to set metric for labels to 0
+        this.startTimer(labels)();
+    }
 }
 class PerfSummary extends Summary {
     constructor(configurator) {
@@ -36,7 +40,7 @@ class PerfSummary extends Summary {
     startTimer() {
         const endMeasure = startMeasurePerformance(this.name);
         return (endLabels) => {
-            endMeasure(endLabels);
+            return endMeasure(endLabels);
         };
     }
 }
@@ -48,7 +52,7 @@ class PerfGauge extends Gauge {
     startTimer(startLabels) {
         const endMeasure = startMeasurePerformance(this.name, startLabels);
         return (endLabels) => {
-            endMeasure(endLabels);
+            return endMeasure(endLabels);
         };
     }
 }

package/lib/performance-devtools/PerfMetrics.d.ts

@@ -1,6 +1,6 @@
 import { Gauge, Histogram, Summary } from '@tinkoff/metrics-noop';
 type Labels<T extends string> = Record<T, string | number>;
-export declare function startMeasurePerformance<T extends string>(name: string, startLabels?: Labels<T>): (endLabels?: Labels<T>) => void;
+export declare function startMeasurePerformance<T extends string>(name: string, startLabels?: Labels<T>): (endLabels?: Labels<T>) => number;
 interface PerfMetricConfigurator {
     name: string;
     [key: string]: unknown;
@@ -8,16 +8,17 @@ interface PerfMetricConfigurator {
 export declare class PerfHistogram extends Histogram {
     name: string;
     constructor(configurator: PerfMetricConfigurator);
-    startTimer(startLabels?: Labels<string>): (endLabels?: Labels<string>) => void;
+    startTimer(startLabels?: Labels<string>): (endLabels?: Labels<string>) => number;
+    zero(labels?: Labels<string>): void;
 }
 export declare class PerfSummary extends Summary {
     name: string;
     constructor(configurator: PerfMetricConfigurator);
-    startTimer(): (endLabels?: Labels<string>) => void;
+    startTimer(): (endLabels?: Labels<string>) => number;
 }
 export declare class PerfGauge extends Gauge {
     name: string;
     constructor(configurator: PerfMetricConfigurator);
-    startTimer(startLabels?: Labels<string>): (endLabels?: Labels<string>) => void;
+    startTimer(startLabels?: Labels<string>): (endLabels?: Labels<string>) => number;
 }
 export {};

package/lib/performance-devtools/startMeasure.browser.js

@@ -2,11 +2,13 @@ function startMeasure(markName, uniqueMarkId) {
     const uniqueMarkName = `${markName}:${uniqueMarkId}`;
     performance.mark(uniqueMarkName);
     function endMeasure(measureName) {
+        let duration = 0;
         try {
-            performance.measure(measureName || markName, uniqueMarkName);
+            duration = performance.measure(measureName || markName, uniqueMarkName).duration;
         }
         catch (e) { }
         performance.clearMarks(uniqueMarkName);
+        return duration;
     }
     return endMeasure;
 }

package/lib/performance-devtools/startMeasure.d.ts

@@ -1,2 +1,2 @@
-declare function startMeasure(markName: string, uniqueMarkId: number): (measureName?: string) => void;
+declare function startMeasure(markName: string, uniqueMarkId: number): (measureName?: string) => number;
 export { startMeasure };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-metrics",
-  "version": "2.111.1",
+  "version": "2.117.0",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -18,23 +18,23 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tramvai/core": "2.111.1",
-    "@tramvai/tokens-common": "2.111.1",
-    "@tramvai/tokens-core-private": "2.111.1",
-    "@tramvai/tokens-server": "2.111.1",
-    "@tramvai/tokens-server-private": "2.111.1",
-    "@tramvai/tokens-metrics": "2.111.1",
-    "@tramvai/tokens-router": "2.111.1",
-    "@tramvai/tokens-http-client": "2.111.1",
-    "@tramvai/state": "2.111.1",
-    "@tramvai/papi": "2.111.1",
-    "@tinkoff/measure-fastify-requests": "0.1.8",
+    "@tramvai/core": "2.117.0",
+    "@tramvai/tokens-common": "2.117.0",
+    "@tramvai/tokens-core-private": "2.117.0",
+    "@tramvai/tokens-server": "2.117.0",
+    "@tramvai/tokens-server-private": "2.117.0",
+    "@tramvai/tokens-metrics": "2.117.0",
+    "@tramvai/tokens-router": "2.117.0",
+    "@tramvai/tokens-http-client": "2.117.0",
+    "@tramvai/state": "2.117.0",
+    "@tramvai/papi": "2.117.0",
+    "@tinkoff/measure-fastify-requests": "0.1.9",
     "@tinkoff/monkeypatch": "2.0.5",
     "@tinkoff/url": "0.8.6",
     "@tinkoff/utils": "^2.1.2",
-    "prom-client": "^12.0.0",
+    "prom-client": "^14.2.0",
     "@tinkoff/logger": "0.10.63",
-    "@tinkoff/metrics-noop": "2.0.6",
+    "@tinkoff/metrics-noop": "2.1.0",
     "@tinkoff/browser-timings": "0.10.6"
   },
   "peerDependencies": {