feat: willsoto/nestjs-prometheus by prom-client, use originalUrl for logs

Author: LabEG

.github/workflows/docker-publish.yml

@@ -35,4 +35,4 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: mtsrus/image-optimize:latest, mtsrus/image-optimize:1, mtsrus/image-optimize:1.4, mtsrus/image-optimize:1.4.0
+          tags: mtsrus/image-optimize:latest, mtsrus/image-optimize:1, mtsrus/image-optimize:1.4, mtsrus/image-optimize:1.4.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "image-optimize",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "",
   "author": "MobileTeleSystems",
   "homepage": "https://github.com/MobileTeleSystems/image-optimize",
@@ -39,8 +39,7 @@
     "@nestjs/common": "^9.2.0",
     "@nestjs/core": "^9.2.0",
     "@nestjs/platform-express": "^9.2.0",
-    "@willsoto/nestjs-prometheus": "^4.7.0",
-    "prom-client": "^14.1.0",
+    "prom-client": "^14.2.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.7",

package.json

@@ -1,15 +1,15 @@
+import { MetricsController } from "./controllers/metrics/metrics.controller";
 import { Module } from "@nestjs/common";
 import { OptimizeController } from "./controllers/optimize-controller/optimize.controller";
 import { OptimizeService } from "./services/optimize.service";
 import { AllowService } from "./services/allow.service";
-import { PrometheusModule } from "@willsoto/nestjs-prometheus";
 import { NestModule, MiddlewareConsumer } from "@nestjs/common";
 import { RequestLoggerMiddleware } from "./middleware/RequestLoggerMiddleware";
 import { ImgLoaderService } from "./services/img-loader.service";
 
 @Module({
-    imports: [PrometheusModule.register()],
-    controllers: [OptimizeController],
+    imports: [],
+    controllers: [OptimizeController, MetricsController],
     providers: [OptimizeService, AllowService, ImgLoaderService],
 })
 export class AppModule implements NestModule {

src/app.module.ts

@@ -0,0 +1,22 @@
+import { Test, TestingModule } from "@nestjs/testing";
+import { PrometheusService } from "../../services/prometheus.service";
+import { MetricsController } from "./metrics.controller";
+
+describe("MetricsController", () => {
+    let appController: MetricsController;
+
+    beforeEach(async () => {
+        const app: TestingModule = await Test.createTestingModule({
+            controllers: [MetricsController],
+            providers: [PrometheusService],
+        }).compile();
+
+        appController = app.get<MetricsController>(MetricsController);
+    });
+
+    describe("root", () => {
+        it('should return "Hello World!"', () => {
+            expect("Hello World!").toBe("Hello World!");
+        });
+    });
+});

src/controllers/metrics/metrics.controller.spec.ts

@@ -0,0 +1,19 @@
+import { Controller, Response, Get } from "@nestjs/common";
+import { Response as EResponse } from "express";
+import { collectDefaultMetrics, Registry } from "prom-client";
+
+const register = new Registry();
+collectDefaultMetrics({
+    register: register,
+    eventLoopMonitoringPrecision: 100,
+});
+
+@Controller("metrics")
+export class MetricsController {
+    @Get()
+    public async getMetrics(@Response() response: EResponse) {
+        return response
+            .set("Content-Type", register.contentType)
+            .send(await register.metrics());
+    }
+}

src/controllers/metrics/metrics.controller.ts

@@ -8,7 +8,7 @@ export class RequestLoggerMiddleware implements NestMiddleware {
     private logger = new JsonLogger();
 
     use(request: Request, response: Response, next: NextFunction): void {
-        const { ip, method, url, query } = request;
+        const { ip, method, originalUrl, query } = request;
         const userAgent = request.get("user-agent") || "not set";
         const startTime = performance.now();
         const traceId = request.get("x-trace-id") || void 0;
@@ -27,7 +27,7 @@ export class RequestLoggerMiddleware implements NestMiddleware {
 
             this.logger.extraLogs("Request", level, {
                 method: method,
-                url: url,
+                url: originalUrl,
                 query: query,
                 statusCode: statusCode,
                 contentLength: contentLength,