@tramvai/module-metrics 7.27.0 → 7.27.3

package/lib/metrics/eventLoop.d.ts

@@ -1,3 +1,3 @@
 import type { Metrics } from '@tramvai/tokens-metrics';
-export declare const eventLoopMetrics: (metrics: Metrics) => void;
+export declare const eventLoopMetrics: (metrics: Metrics) => () => void;
 //# sourceMappingURL=eventLoop.d.ts.map

package/lib/metrics/eventLoop.es.js

@@ -2,6 +2,7 @@ const NODEJS_EVENTLOOP_LAG = 'nodejs_eventloop_setinterval_lag_seconds';
 const RESOLUTION = 100;
 function startEventLoopLagMeasure(histogram) {
     let start = process.hrtime();
+    let currentTimer;
     const measure = () => {
         const delta = process.hrtime(start);
         const nanosec = delta[0] * 1e9 + delta[1];
@@ -9,9 +10,12 @@ function startEventLoopLagMeasure(histogram) {
         const lag = ms - RESOLUTION;
         histogram.observe(lag / 1e3);
         start = process.hrtime();
-        setTimeout(measure, RESOLUTION).unref();
+        currentTimer = setTimeout(measure, RESOLUTION).unref();
+    };
+    currentTimer = setTimeout(measure, RESOLUTION).unref();
+    return () => {
+        clearTimeout(currentTimer);
     };
-    setTimeout(measure, RESOLUTION).unref();
 }
 const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
@@ -19,7 +23,7 @@ const eventLoopMetrics = (metrics) => {
         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);
+    return startEventLoopLagMeasure(histogram);
 };
 
 export { eventLoopMetrics };

package/lib/metrics/eventLoop.js

@@ -6,6 +6,7 @@ const NODEJS_EVENTLOOP_LAG = 'nodejs_eventloop_setinterval_lag_seconds';
 const RESOLUTION = 100;
 function startEventLoopLagMeasure(histogram) {
     let start = process.hrtime();
+    let currentTimer;
     const measure = () => {
         const delta = process.hrtime(start);
         const nanosec = delta[0] * 1e9 + delta[1];
@@ -13,9 +14,12 @@ function startEventLoopLagMeasure(histogram) {
         const lag = ms - RESOLUTION;
         histogram.observe(lag / 1e3);
         start = process.hrtime();
-        setTimeout(measure, RESOLUTION).unref();
+        currentTimer = setTimeout(measure, RESOLUTION).unref();
+    };
+    currentTimer = setTimeout(measure, RESOLUTION).unref();
+    return () => {
+        clearTimeout(currentTimer);
     };
-    setTimeout(measure, RESOLUTION).unref();
 }
 const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
@@ -23,7 +27,7 @@ const eventLoopMetrics = (metrics) => {
         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);
+    return startEventLoopLagMeasure(histogram);
 };
 
 exports.eventLoopMetrics = eventLoopMetrics;

package/lib/request/initRequestsMetrics.es.js

@@ -1,8 +1,12 @@
 import monkeypatch from '@tinkoff/monkeypatch';
+import { TRAMVAI_INITED_SYMBOL } from '@tramvai/core';
 import { DEFAULT_BUCKETS } from '../constants.es.js';
 import { addMetricsForFetch, initConnectionResolveMetrics } from './createRequestWithMetrics.es.js';
 
 const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics, config, }) => {
+    if (globalThis[TRAMVAI_INITED_SYMBOL]) {
+        return;
+    }
     const metricsInstances = {
         requestsTotal: metrics.counter({
             name: 'http_sent_requests_total',

package/lib/request/initRequestsMetrics.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var monkeypatch = require('@tinkoff/monkeypatch');
+var core = require('@tramvai/core');
 var constants = require('../constants.js');
 var createRequestWithMetrics = require('./createRequestWithMetrics.js');
 
@@ -11,6 +12,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var monkeypatch__default = /*#__PURE__*/_interopDefaultLegacy(monkeypatch);
 
 const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics: createRequestWithMetrics$1, config, }) => {
+    if (globalThis[core.TRAMVAI_INITED_SYMBOL]) {
+        return;
+    }
     const metricsInstances = {
         requestsTotal: metrics.counter({
             name: 'http_sent_requests_total',

package/lib/server.es.js

@@ -1,5 +1,5 @@
 import { __decorate } from 'tslib';
-import { Module, provide, Scope, commandLineListTokens } from '@tramvai/core';
+import { Module, provide, Scope, TRAMVAI_INITED_SYMBOL, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
 import { COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
 import { UTILITY_SERVER_PATHS } from '@tramvai/tokens-server';
 import { WEB_FASTIFY_APP_BEFORE_INIT_TOKEN, UTILITY_WEB_FASTIFY_APP_TOKEN, WEB_FASTIFY_APP_METRICS_TOKEN, WEB_FASTIFY_APP_TOKEN, PAPI_METRICS_TOKEN } from '@tramvai/tokens-server-private';
@@ -38,7 +38,9 @@ MetricsModule = __decorate([
             provide({
                 provide: METRICS_MODULE_TOKEN,
                 useFactory: ({ registry }) => {
-                    collectDefaultMetrics({ register: registry });
+                    if (!globalThis[TRAMVAI_INITED_SYMBOL]) {
+                        collectDefaultMetrics({ register: registry });
+                    }
                     return {
                         counter: (opt) => new Counter({ registers: [registry], ...opt }),
                         gauge: (opt) => new Gauge({ registers: [registry], ...opt }),
@@ -115,13 +117,18 @@ MetricsModule = __decorate([
             }),
             provide({
                 provide: commandLineListTokens.listen,
-                useFactory: ({ metrics }) => {
+                useFactory: ({ metrics, di }) => {
                     return () => {
-                        eventLoopMetrics(metrics);
+                        const clearEventLoopMetrics = eventLoopMetrics(metrics);
+                        di.register({
+                            provide: commandLineListTokens.close,
+                            useValue: clearEventLoopMetrics,
+                        });
                     };
                 },
                 deps: {
                     metrics: METRICS_MODULE_TOKEN,
+                    di: DI_TOKEN,
                 },
                 multi: true,
             }),

package/lib/server.js

@@ -44,7 +44,9 @@ exports.MetricsModule = tslib.__decorate([
             core.provide({
                 provide: tokensMetrics.METRICS_MODULE_TOKEN,
                 useFactory: ({ registry }) => {
-                    promClient.collectDefaultMetrics({ register: registry });
+                    if (!globalThis[core.TRAMVAI_INITED_SYMBOL]) {
+                        promClient.collectDefaultMetrics({ register: registry });
+                    }
                     return {
                         counter: (opt) => new promClient.Counter({ registers: [registry], ...opt }),
                         gauge: (opt) => new promClient.Gauge({ registers: [registry], ...opt }),
@@ -121,13 +123,18 @@ exports.MetricsModule = tslib.__decorate([
             }),
             core.provide({
                 provide: core.commandLineListTokens.listen,
-                useFactory: ({ metrics }) => {
+                useFactory: ({ metrics, di }) => {
                     return () => {
-                        eventLoop.eventLoopMetrics(metrics);
+                        const clearEventLoopMetrics = eventLoop.eventLoopMetrics(metrics);
+                        di.register({
+                            provide: core.commandLineListTokens.close,
+                            useValue: clearEventLoopMetrics,
+                        });
                     };
                 },
                 deps: {
                     metrics: tokensMetrics.METRICS_MODULE_TOKEN,
+                    di: core.DI_TOKEN,
                 },
                 multi: true,
             }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-metrics",
-  "version": "7.27.0",
+  "version": "7.27.3",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -25,16 +25,16 @@
     "@tinkoff/monkeypatch": "7.0.1",
     "@tinkoff/url": "0.13.1",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "7.27.0",
-    "@tramvai/papi": "7.27.0",
-    "@tramvai/state": "7.27.0",
-    "@tramvai/tokens-common": "7.27.0",
-    "@tramvai/tokens-core-private": "7.27.0",
-    "@tramvai/tokens-http-client": "7.27.0",
-    "@tramvai/tokens-metrics": "7.27.0",
-    "@tramvai/tokens-router": "7.27.0",
-    "@tramvai/tokens-server": "7.27.0",
-    "@tramvai/tokens-server-private": "7.27.0",
+    "@tramvai/core": "7.27.3",
+    "@tramvai/papi": "7.27.3",
+    "@tramvai/state": "7.27.3",
+    "@tramvai/tokens-common": "7.27.3",
+    "@tramvai/tokens-core-private": "7.27.3",
+    "@tramvai/tokens-http-client": "7.27.3",
+    "@tramvai/tokens-metrics": "7.27.3",
+    "@tramvai/tokens-router": "7.27.3",
+    "@tramvai/tokens-server": "7.27.3",
+    "@tramvai/tokens-server-private": "7.27.3",
     "prom-client": "^14.2.0",
     "undici": "^7.24.4"
   },