@tramvai/module-metrics 1.60.2 → 1.63.1

package/lib/request/createRequestWithMetrics.d.ts

@@ -1,11 +1,3 @@
-declare type Args = [Record<string, any> | string | URL, (res: Record<string, any>) => void] | [string | URL, Record<string, any>, (res: Record<string, any>) => void];
+import type { Args, CreateRequestWithMetrics } from './types';
 export declare const getUrlAndOptions: (args: Args) => any[];
-export declare const createRequestWithMetrics: ({ metricsInstances: { requestsTotal, requestsErrors, requestsDuration }, getServiceName, }: {
-    metricsInstances: {
-        requestsTotal: any;
-        requestsErrors: any;
-        requestsDuration: any;
-    };
-    getServiceName: any;
-}) => (originalRequest: any, ...args: Args) => any;
-export {};
+export declare const createRequestWithMetrics: CreateRequestWithMetrics;

package/lib/request/initRequestsMetrics.d.ts

@@ -1,7 +1,9 @@
-export declare const initRequestsMetrics: ({ metrics, getServiceName, http, https, createRequestWithMetrics, }: {
-    metrics: any;
-    getServiceName: any;
-    http: any;
-    https: any;
-    createRequestWithMetrics: any;
+import type { MetricsModule, GetServiceName, CreateRequestWithMetrics, HttpModule, HttpsModule, ModuleConfig } from './types';
+export declare const initRequestsMetrics: ({ metrics, getServiceName, http, https, createRequestWithMetrics, config, }: {
+    metrics: MetricsModule;
+    http: HttpModule;
+    https: HttpsModule;
+    createRequestWithMetrics: CreateRequestWithMetrics;
+    getServiceName: GetServiceName;
+    config: ModuleConfig;
 }) => void;

package/lib/request/types.d.ts

@@ -0,0 +1,28 @@
+/// <reference types="node" />
+import type { RequestOptions, IncomingMessage, ClientRequest } from 'http';
+import type httpType from 'http';
+import type httpsType from 'https';
+import type { Counter, Histogram } from 'prom-client';
+import type { METRICS_MODULE_TOKEN, METRICS_SERVICES_REGISTRY_TOKEN } from '@tramvai/tokens-metrics';
+export declare type ModuleConfig = {
+    enableConnectionResolveMetrics: boolean;
+};
+export declare type MetricsModule = typeof METRICS_MODULE_TOKEN;
+export declare type HttpModule = typeof httpType;
+export declare type HttpsModule = typeof httpsType;
+export declare type OriginalRequest = HttpModule['request'];
+export declare type MetricsInstances = {
+    requestsTotal: Counter<'status' | 'method' | 'service'>;
+    requestsErrors: Counter<'status' | 'method' | 'service'>;
+    requestsDuration: Histogram<'status' | 'method' | 'service'>;
+    dnsResolveDuration: Histogram<'service'>;
+    tcpConnectDuration: Histogram<'service'>;
+    tlsHandshakeDuration: Histogram<'service'>;
+};
+export declare type GetServiceName = typeof METRICS_SERVICES_REGISTRY_TOKEN['getServiceName'];
+export declare type Args = [RequestOptions | string | URL, (res: IncomingMessage) => void] | [string | URL, RequestOptions, (res: IncomingMessage) => void];
+export declare type CreateRequestWithMetrics = (args: {
+    metricsInstances: MetricsInstances;
+    getServiceName: GetServiceName;
+    config: ModuleConfig;
+}) => (originalRequest: HttpModule['request'], ...requestArgs: Args) => ClientRequest;

package/lib/server.d.ts

@@ -1,2 +1,4 @@
+import { METRICS_MODULE_CONFIG_TOKEN } from './tokens';
 export declare class MetricsModule {
 }
+export { METRICS_MODULE_CONFIG_TOKEN };

package/lib/server.es.js

@@ -1,5 +1,5 @@
 import { __decorate } from 'tslib';
-import { Module, commandLineListTokens, Scope } from '@tramvai/core';
+import { createToken, Module, commandLineListTokens, Scope, provide } from '@tramvai/core';
 import { SERVER_MODULE_PAPI_PUBLIC_ROUTE, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_TOKEN, SPECIAL_SERVER_PATHS } from '@tramvai/tokens-server';
 import { METRICS_MODULE_TOKEN, METRICS_SERVICES_REGISTRY_TOKEN, REGISTER_INSTANT_METRIC_TOKEN } from '@tramvai/tokens-metrics';
 import { measure } from '@tinkoff/measure-express-requests';
@@ -68,18 +68,22 @@ const getUrlAndOptions = (args) => {
     const urlWOQuery = parsedUrl.origin + parsedUrl.pathname;
     return [urlWOQuery, options || {}];
 };
-const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsErrors, requestsDuration }, getServiceName, }) => function requestWithMetrics(originalRequest, ...args) {
-    const req = originalRequest.apply(this, args);
-    const timerDone = requestsDuration.startTimer();
+// in seconds
+const getDuration = (current, prev) => 
+// max to avoid negative values and turn that into zero
+prev === 0 ? 0 : Math.max((current - prev) / 1000, 0);
+const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsErrors, requestsDuration, dnsResolveDuration, tcpConnectDuration, tlsHandshakeDuration, }, getServiceName, config, }) => function requestWithMetrics(originalRequest, ...args) {
     const [url, options] = getUrlAndOptions(args);
     const serviceName = getServiceName(url);
+    const req = originalRequest.apply(this, args);
+    const timerDone = requestsDuration.startTimer();
     const labelsValues = {
         method: options.method || 'unknown',
         service: serviceName || new URL(url).origin || 'unknown',
         status: 'unknown',
     };
     req.on('response', (res) => {
-        labelsValues.status = res.statusCode;
+        labelsValues.status = res.statusCode.toString();
         if (res.statusCode >= 400) {
             requestsErrors.inc(labelsValues);
         }
@@ -94,10 +98,34 @@ const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsE
         requestsErrors.inc(labelsValues);
         timerDone(labelsValues);
     });
+    if (config.enableConnectionResolveMetrics) {
+        req.on('socket', (socket) => {
+            const timings = {
+                start: Date.now(),
+                lookupEnd: 0,
+                connectEnd: 0,
+                secureConnectEnd: 0,
+            };
+            const { service } = labelsValues;
+            socket.on('lookup', () => {
+                timings.lookupEnd = Date.now();
+                dnsResolveDuration.observe({ service }, getDuration(timings.lookupEnd, timings.start));
+            });
+            socket.on('connect', () => {
+                timings.connectEnd = Date.now();
+                tcpConnectDuration.observe({ service }, getDuration(timings.connectEnd, timings.lookupEnd));
+            });
+            socket.on('secureConnect', () => {
+                timings.secureConnectEnd = Date.now();
+                tlsHandshakeDuration.observe({ service }, getDuration(timings.secureConnectEnd, timings.connectEnd));
+            });
+        });
+    }
     return req;
 };
 
-const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics, }) => {
+const DEFAULT_BUCKETS = [0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 40, 60];
+const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics, config, }) => {
     const metricsInstances = {
         requestsTotal: metrics.counter({
             name: 'http_sent_requests_total',
@@ -113,17 +141,36 @@ const initRequestsMetrics = ({ metrics, getServiceName, http, https, createReque
             name: 'http_sent_requests_duration',
             help: 'Execution time of the sent requests',
             labelNames: ['status', 'method', 'service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        dnsResolveDuration: metrics.histogram({
+            name: 'dns_resolve_duration',
+            help: 'Time for dns resolve of the outhgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        tcpConnectDuration: metrics.histogram({
+            name: 'tcp_connect_duration',
+            help: 'Duration of tcp connect of the outgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        tlsHandshakeDuration: metrics.histogram({
+            name: 'tls_handshake_duration',
+            help: 'Duration of tls handshake of the outgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
         }),
     };
     monkeypatch({
         obj: https,
         method: 'request',
-        handler: createRequestWithMetrics({ metricsInstances, getServiceName }),
+        handler: createRequestWithMetrics({ metricsInstances, getServiceName, config }),
     });
     monkeypatch({
         obj: http,
         method: 'request',
-        handler: createRequestWithMetrics({ metricsInstances, getServiceName }),
+        handler: createRequestWithMetrics({ metricsInstances, getServiceName, config }),
     });
 };
 
@@ -226,6 +273,8 @@ class MetricsServicesRegistry {
     }
 }
 
+const METRICS_MODULE_CONFIG_TOKEN = createToken('metrics-module-config');
+
 let RequestModule = class RequestModule {
 };
 RequestModule = __decorate([
@@ -234,7 +283,7 @@ RequestModule = __decorate([
             {
                 provide: commandLineListTokens.init,
                 multi: true,
-                useFactory: ({ metrics, envManager, metricsServicesRegistry }) => {
+                useFactory: ({ metrics, envManager, metricsServicesRegistry, metricsModuleConfig, }) => {
                     if (!metrics) {
                         return noop;
                     }
@@ -242,7 +291,14 @@ RequestModule = __decorate([
                         const env = envManager.getAll();
                         metricsServicesRegistry.registerEnv(env);
                         const getServiceName = metricsServicesRegistry.getServiceName.bind(metricsServicesRegistry);
-                        initRequestsMetrics({ metrics, getServiceName, http, https, createRequestWithMetrics });
+                        initRequestsMetrics({
+                            metrics,
+                            getServiceName,
+                            http,
+                            https,
+                            createRequestWithMetrics,
+                            config: metricsModuleConfig,
+                        });
                     };
                 },
                 deps: {
@@ -252,6 +308,7 @@ RequestModule = __decorate([
                     },
                     metricsServicesRegistry: METRICS_SERVICES_REGISTRY_TOKEN,
                     envManager: ENV_MANAGER_TOKEN,
+                    metricsModuleConfig: METRICS_MODULE_CONFIG_TOKEN,
                 },
             },
             {
@@ -379,7 +436,7 @@ const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
         name: NODEJS_EVENTLOOP_LAG,
         help: 'Lag of event loop in seconds (setInterval based).',
-        buckets: [0.02, 0.1, 0.2, 0.5, 1, 3, 5],
+        buckets: [0.02, 0.1, 0.2, 0.5, 1, 3, 5, 7.5, 10],
     });
     startEventLoopLagMeasure(histogram);
 };
@@ -390,11 +447,17 @@ MetricsModule = __decorate([
     Module({
         imports: [RequestModule, InstantMetricsModule],
         providers: [
-            {
+            provide({
+                provide: METRICS_MODULE_CONFIG_TOKEN,
+                useValue: {
+                    enableConnectionResolveMetrics: false,
+                },
+            }),
+            provide({
                 provide: 'metricsDefaultRegistry',
                 useClass: Registry,
-            },
-            {
+            }),
+            provide({
                 provide: METRICS_MODULE_TOKEN,
                 useFactory: ({ registry }) => {
                     collectDefaultMetrics({ register: registry });
@@ -409,8 +472,8 @@ MetricsModule = __decorate([
                 deps: {
                     registry: 'metricsDefaultRegistry',
                 },
-            },
-            {
+            }),
+            provide({
                 provide: WEB_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ metrics, app, additionalLabelNamesList, getAdditionalLabelValuesList, httpRequestsDurationBuckets, metricsExcludePaths, registry, }) => {
                     return () => {
@@ -456,8 +519,8 @@ MetricsModule = __decorate([
                     registry: 'metricsDefaultRegistry',
                 },
                 multi: true,
-            },
-            {
+            }),
+            provide({
                 provide: WEB_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ metrics }) => {
                     return () => {
@@ -468,9 +531,9 @@ MetricsModule = __decorate([
                     metrics: METRICS_MODULE_TOKEN,
                 },
                 multi: true,
-            },
+            }),
         ],
     })
 ], MetricsModule);
 
-export { MetricsModule };
+export { METRICS_MODULE_CONFIG_TOKEN, MetricsModule };

package/lib/server.js

@@ -82,18 +82,22 @@ const getUrlAndOptions = (args) => {
     const urlWOQuery = parsedUrl.origin + parsedUrl.pathname;
     return [urlWOQuery, options || {}];
 };
-const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsErrors, requestsDuration }, getServiceName, }) => function requestWithMetrics(originalRequest, ...args) {
-    const req = originalRequest.apply(this, args);
-    const timerDone = requestsDuration.startTimer();
+// in seconds
+const getDuration = (current, prev) => 
+// max to avoid negative values and turn that into zero
+prev === 0 ? 0 : Math.max((current - prev) / 1000, 0);
+const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsErrors, requestsDuration, dnsResolveDuration, tcpConnectDuration, tlsHandshakeDuration, }, getServiceName, config, }) => function requestWithMetrics(originalRequest, ...args) {
     const [url, options] = getUrlAndOptions(args);
     const serviceName = getServiceName(url);
+    const req = originalRequest.apply(this, args);
+    const timerDone = requestsDuration.startTimer();
     const labelsValues = {
         method: options.method || 'unknown',
         service: serviceName || new URL(url).origin || 'unknown',
         status: 'unknown',
     };
     req.on('response', (res) => {
-        labelsValues.status = res.statusCode;
+        labelsValues.status = res.statusCode.toString();
         if (res.statusCode >= 400) {
             requestsErrors.inc(labelsValues);
         }
@@ -108,10 +112,34 @@ const createRequestWithMetrics = ({ metricsInstances: { requestsTotal, requestsE
         requestsErrors.inc(labelsValues);
         timerDone(labelsValues);
     });
+    if (config.enableConnectionResolveMetrics) {
+        req.on('socket', (socket) => {
+            const timings = {
+                start: Date.now(),
+                lookupEnd: 0,
+                connectEnd: 0,
+                secureConnectEnd: 0,
+            };
+            const { service } = labelsValues;
+            socket.on('lookup', () => {
+                timings.lookupEnd = Date.now();
+                dnsResolveDuration.observe({ service }, getDuration(timings.lookupEnd, timings.start));
+            });
+            socket.on('connect', () => {
+                timings.connectEnd = Date.now();
+                tcpConnectDuration.observe({ service }, getDuration(timings.connectEnd, timings.lookupEnd));
+            });
+            socket.on('secureConnect', () => {
+                timings.secureConnectEnd = Date.now();
+                tlsHandshakeDuration.observe({ service }, getDuration(timings.secureConnectEnd, timings.connectEnd));
+            });
+        });
+    }
     return req;
 };
 
-const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics, }) => {
+const DEFAULT_BUCKETS = [0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 40, 60];
+const initRequestsMetrics = ({ metrics, getServiceName, http, https, createRequestWithMetrics, config, }) => {
     const metricsInstances = {
         requestsTotal: metrics.counter({
             name: 'http_sent_requests_total',
@@ -127,17 +155,36 @@ const initRequestsMetrics = ({ metrics, getServiceName, http, https, createReque
             name: 'http_sent_requests_duration',
             help: 'Execution time of the sent requests',
             labelNames: ['status', 'method', 'service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        dnsResolveDuration: metrics.histogram({
+            name: 'dns_resolve_duration',
+            help: 'Time for dns resolve of the outhgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        tcpConnectDuration: metrics.histogram({
+            name: 'tcp_connect_duration',
+            help: 'Duration of tcp connect of the outgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
+        }),
+        tlsHandshakeDuration: metrics.histogram({
+            name: 'tls_handshake_duration',
+            help: 'Duration of tls handshake of the outgoing requests',
+            labelNames: ['service'],
+            buckets: DEFAULT_BUCKETS,
         }),
     };
     monkeypatch__default["default"]({
         obj: https,
         method: 'request',
-        handler: createRequestWithMetrics({ metricsInstances, getServiceName }),
+        handler: createRequestWithMetrics({ metricsInstances, getServiceName, config }),
     });
     monkeypatch__default["default"]({
         obj: http,
         method: 'request',
-        handler: createRequestWithMetrics({ metricsInstances, getServiceName }),
+        handler: createRequestWithMetrics({ metricsInstances, getServiceName, config }),
     });
 };
 
@@ -240,6 +287,8 @@ class MetricsServicesRegistry {
     }
 }
 
+const METRICS_MODULE_CONFIG_TOKEN = core.createToken('metrics-module-config');
+
 let RequestModule = class RequestModule {
 };
 RequestModule = tslib.__decorate([
@@ -248,7 +297,7 @@ RequestModule = tslib.__decorate([
             {
                 provide: core.commandLineListTokens.init,
                 multi: true,
-                useFactory: ({ metrics, envManager, metricsServicesRegistry }) => {
+                useFactory: ({ metrics, envManager, metricsServicesRegistry, metricsModuleConfig, }) => {
                     if (!metrics) {
                         return noop__default["default"];
                     }
@@ -256,7 +305,14 @@ RequestModule = tslib.__decorate([
                         const env = envManager.getAll();
                         metricsServicesRegistry.registerEnv(env);
                         const getServiceName = metricsServicesRegistry.getServiceName.bind(metricsServicesRegistry);
-                        initRequestsMetrics({ metrics, getServiceName, http: http__default["default"], https: https__default["default"], createRequestWithMetrics });
+                        initRequestsMetrics({
+                            metrics,
+                            getServiceName,
+                            http: http__default["default"],
+                            https: https__default["default"],
+                            createRequestWithMetrics,
+                            config: metricsModuleConfig,
+                        });
                     };
                 },
                 deps: {
@@ -266,6 +322,7 @@ RequestModule = tslib.__decorate([
                     },
                     metricsServicesRegistry: tokensMetrics.METRICS_SERVICES_REGISTRY_TOKEN,
                     envManager: moduleCommon.ENV_MANAGER_TOKEN,
+                    metricsModuleConfig: METRICS_MODULE_CONFIG_TOKEN,
                 },
             },
             {
@@ -393,7 +450,7 @@ const eventLoopMetrics = (metrics) => {
     const histogram = metrics.histogram({
         name: NODEJS_EVENTLOOP_LAG,
         help: 'Lag of event loop in seconds (setInterval based).',
-        buckets: [0.02, 0.1, 0.2, 0.5, 1, 3, 5],
+        buckets: [0.02, 0.1, 0.2, 0.5, 1, 3, 5, 7.5, 10],
     });
     startEventLoopLagMeasure(histogram);
 };
@@ -404,11 +461,17 @@ exports.MetricsModule = tslib.__decorate([
     core.Module({
         imports: [RequestModule, InstantMetricsModule],
         providers: [
-            {
+            core.provide({
+                provide: METRICS_MODULE_CONFIG_TOKEN,
+                useValue: {
+                    enableConnectionResolveMetrics: false,
+                },
+            }),
+            core.provide({
                 provide: 'metricsDefaultRegistry',
                 useClass: promClient.Registry,
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensMetrics.METRICS_MODULE_TOKEN,
                 useFactory: ({ registry }) => {
                     promClient.collectDefaultMetrics({ register: registry });
@@ -423,8 +486,8 @@ exports.MetricsModule = tslib.__decorate([
                 deps: {
                     registry: 'metricsDefaultRegistry',
                 },
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensServer.WEB_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ metrics, app, additionalLabelNamesList, getAdditionalLabelValuesList, httpRequestsDurationBuckets, metricsExcludePaths, registry, }) => {
                     return () => {
@@ -470,8 +533,8 @@ exports.MetricsModule = tslib.__decorate([
                     registry: 'metricsDefaultRegistry',
                 },
                 multi: true,
-            },
-            {
+            }),
+            core.provide({
                 provide: tokensServer.WEB_APP_BEFORE_INIT_TOKEN,
                 useFactory: ({ metrics }) => {
                     return () => {
@@ -482,7 +545,9 @@ exports.MetricsModule = tslib.__decorate([
                     metrics: tokensMetrics.METRICS_MODULE_TOKEN,
                 },
                 multi: true,
-            },
+            }),
         ],
     })
 ], exports.MetricsModule);
+
+exports.METRICS_MODULE_CONFIG_TOKEN = METRICS_MODULE_CONFIG_TOKEN;

package/lib/tokens.d.ts

@@ -0,0 +1,2 @@
+import type { ModuleConfig } from './request/types';
+export declare const METRICS_MODULE_CONFIG_TOKEN: ModuleConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-metrics",
-  "version": "1.60.2",
+  "version": "1.63.1",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -19,14 +19,14 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tramvai/core": "1.60.2",
-    "@tramvai/tokens-server": "1.60.2",
-    "@tramvai/tokens-metrics": "1.60.2",
-    "@tramvai/module-common": "1.60.2",
-    "@tramvai/tokens-http-client": "1.60.2",
-    "@tramvai/state": "1.60.2",
-    "@tramvai/papi": "1.60.2",
-    "@tinkoff/measure-express-requests": "1.4.2",
+    "@tramvai/core": "1.63.1",
+    "@tramvai/tokens-server": "1.63.1",
+    "@tramvai/tokens-metrics": "1.63.1",
+    "@tramvai/module-common": "1.63.1",
+    "@tramvai/tokens-http-client": "1.63.1",
+    "@tramvai/state": "1.63.1",
+    "@tramvai/papi": "1.63.1",
+    "@tinkoff/measure-express-requests": "1.4.3",
     "@tinkoff/monkeypatch": "1.3.3",
     "@tinkoff/url": "0.7.37",
     "@tinkoff/utils": "^2.1.2",