@biorate/nestjs-tools 1.152.0 → 1.152.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biorate/nestjs-tools",
-  "version": "1.152.0",
+  "version": "1.152.1",
   "description": "NestJS tools",
   "main": "dist",
   "scripts": {
@@ -38,14 +38,14 @@
     "@biorate/errors": "1.102.0",
     "@biorate/inversion": "1.120.0",
     "@biorate/opentelemetry": "1.152.0",
-    "@biorate/prometheus": "1.120.0",
+    "@biorate/prometheus": "1.152.1",
     "@biorate/tools": "1.102.1",
     "http-proxy": "1.18.1",
     "http-proxy-middleware": "2.0.6",
     "json-stringify-safe": "5.0.1",
     "on-headers": "1.0.2"
   },
-  "gitHead": "e4648a0c8480013fef0867b54dabd8ccf6a85fa1",
+  "gitHead": "ed77d69613ed24efaaa76a0c592550492e50d4e4",
   "devDependencies": {
     "@types/json-stringify-safe": "5.0.3"
   }

package/src/middlewares/proxy-middleware.ts

@@ -5,11 +5,15 @@ import { Request, Response } from 'express';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import { Options, RequestHandler } from 'http-proxy-middleware/dist/types';
 import { Injectable } from '@nestjs/common';
-import { counter, histogram, Counter, Histogram } from '@biorate/prometheus';
+import { counter, Counter, Histogram, Prometheus } from '@biorate/prometheus';
 import { time } from '@biorate/tools';
+import { inject, Types } from '@biorate/inversion';
+import { IConfig } from '@biorate/config';
 
 @Injectable()
 export class ProxyPrometheusMiddleware {
+  @inject(Types.Config) private config: IConfig;
+
   @counter({
     name: 'http_proxy_server_requests_seconds_count',
     help: 'Http proxy server requests count',
@@ -17,12 +21,6 @@ export class ProxyPrometheusMiddleware {
   })
   private counter: Counter;
 
-  @histogram({
-    name: 'http_proxy_server_requests_seconds',
-    help: 'Http proxy server requests seconds bucket',
-    labelNames: ['method', 'uri', 'status'],
-    buckets: [0.005, 0.01, 0.02, 0.05, 0.1, 0.3, 0.5, 1, 2, 3, 5, 10],
-  })
   private histogram: Histogram;
 
   private handler: RequestHandler;
@@ -35,6 +33,16 @@ export class ProxyPrometheusMiddleware {
 
   private constructor(options: Options = {}) {
     const { onProxyReq, onProxyRes } = pick(options, 'onProxyReq', 'onProxyRes');
+    this.histogram = new Histogram({
+      name: 'http_proxy_server_requests_seconds',
+      help: 'Http proxy server requests seconds bucket',
+      labelNames: ['method', 'uri', 'status'],
+      buckets: this.config.get<number[]>(
+        'ProxyPrometheusMiddleware.histogram.buckets',
+        [0.005, 0.01, 0.02, 0.05, 0.1, 0.3, 0.5, 1, 2, 3, 5, 10],
+      ),
+      registers: [Prometheus.registry],
+    });
     this.handler = createProxyMiddleware({
       ...omit(options, 'onProxyReq', 'onProxyRes'),
       onProxyReq: (

package/src/middlewares/response-time-middleware.ts

@@ -3,7 +3,7 @@ import * as onHeaders from 'on-headers';
 import { Injectable, NestMiddleware } from '@nestjs/common';
 import { inject, Types } from '@biorate/inversion';
 import { IConfig } from '@biorate/config';
-import { histogram, Histogram } from '@biorate/prometheus';
+import { Prometheus, Histogram } from '@biorate/prometheus';
 import { Request, Response, NextFunction } from 'express';
 import { time } from '@biorate/tools';
 import { RoutesInterceptor } from '../interceptors';
@@ -18,12 +18,6 @@ export class ResponseTimeMiddleware implements NestMiddleware {
 
   private readonly digits: number;
 
-  @histogram({
-    name: 'http_server_requests_seconds',
-    help: 'Http server requests seconds bucket',
-    labelNames: ['method', 'uri', 'status'],
-    buckets: [0.005, 0.01, 0.02, 0.05, 0.1, 0.3, 0.5, 1, 2, 3, 5, 10],
-  })
   private histogram: Histogram;
 
   public constructor() {
@@ -39,6 +33,16 @@ export class ResponseTimeMiddleware implements NestMiddleware {
       'app.middleware.ResponseTimeMiddleware.digits',
       3,
     );
+    this.histogram = new Histogram({
+      name: 'http_server_requests_seconds',
+      help: 'Http server requests seconds bucket',
+      labelNames: ['method', 'uri', 'status'],
+      buckets: this.config.get<number[]>(
+        'ResponseTimeMiddleware.histogram.buckets',
+        [0.005, 0.01, 0.02, 0.05, 0.1, 0.3, 0.5, 1, 2, 3, 5, 10],
+      ),
+      registers: [Prometheus.registry],
+    });
   }
 
   public use(req: Request, res: Response, next: NextFunction) {