@lucaapp/service-utils 1.11.0 → 1.13.0

package/dist/lib/logger/index.d.ts

@@ -1,5 +1,7 @@
 import { Logger, LoggerOptions } from 'pino';
+import type { IncomingMessage } from 'http';
 import { HttpLoggerCreationOptions } from './utils';
+export declare const ignore: (request: IncomingMessage) => boolean;
 export declare class LoggerFactory {
     static getLogger(logLevel: string): Logger<LoggerOptions>;
     static getHttpLogger(options: HttpLoggerCreationOptions): import("pino-http").HttpLogger;

package/dist/lib/logger/index.js

@@ -3,26 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoggerFactory = void 0;
+exports.LoggerFactory = exports.ignore = void 0;
 const pino_1 = __importDefault(require("pino"));
 const pino_http_1 = __importDefault(require("pino-http"));
 const pick_1 = __importDefault(require("lodash/pick"));
-const uuid_1 = require("uuid");
+const requestTracer_1 = require("../requestTracer");
+const ignore = (request) => {
+    const url = request.url || '';
+    return (!!url.match(/\/health(\/ready)?$/g) ||
+        !!url.match(/(\/[a-z]{3})?\/internal\/metrics$/g) ||
+        false);
+};
+exports.ignore = ignore;
 class LoggerFactory {
     static getLogger(logLevel) {
-        return (0, pino_1.default)({ level: logLevel });
+        return (0, pino_1.default)({ level: logLevel, mixin: requestTracer_1.getRequestTracerMixin });
     }
     static getHttpLogger(options) {
         const { requestSerializer, responseSerializer, errorSerializer, defaultHttpLogLevel, customMessage, } = new HttpLoggerHelpers(options);
         const logger = this.getLogger(options.logLevel);
         return (0, pino_http_1.default)({
-            logger: logger,
+            logger,
+            autoLogging: {
+                ignore: exports.ignore,
+            },
             serializers: {
                 req: requestSerializer,
                 res: responseSerializer,
                 err: errorSerializer,
             },
-            customLogLevel: (response, error) => {
+            customLogLevel: (_, response, error) => {
                 if (response.statusCode >= 400 && response.statusCode < 500)
                     return 'warn';
                 if (response.statusCode >= 500 || error)
@@ -30,8 +40,9 @@ class LoggerFactory {
                 return defaultHttpLogLevel;
             },
             customSuccessMessage: customMessage,
-            customErrorMessage: (_, response) => customMessage(response),
-            genReqId: () => (0, uuid_1.v4)(),
+            customErrorMessage: customMessage,
+            mixin: requestTracer_1.getRequestTracerMixin,
+            genReqId: requestTracer_1.getRequestTracerId,
         });
     }
 }
@@ -51,6 +62,7 @@ class HttpLoggerHelpers {
                 'x-forwarded-host',
                 'x-forwarded-port',
                 'x-scheme',
+                'x-request-id',
                 'user-agent',
                 'content-type',
                 'accept',
@@ -69,6 +81,7 @@ class HttpLoggerHelpers {
             ]);
             return response;
         };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.errorSerializer = (error) => {
             if (error?.parameters)
                 error.parameters = undefined;
@@ -78,12 +91,13 @@ class HttpLoggerHelpers {
                 error.original.parameters = undefined;
             return error;
         };
-        this.customMessage = (response) => {
-            const { req: { method, originalUrl }, statusCode, } = response;
+        this.customMessage = (request, response) => {
+            const { method, originalUrl } = request;
+            const { statusCode } = response;
             return `${statusCode} ${method} ${originalUrl}`;
         };
-        this.debug = !!debug;
-        this.e2e = !!e2e;
+        this.debug = debug;
+        this.e2e = e2e;
         this.defaultHttpLogLevel = defaultHttpLogLevel || 'info';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -43,7 +43,7 @@
     "kafkajs": "2.1.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "pino-http": "6.6.0",
+    "pino-http": "8.2.1",
     "prom-client": "14.1.0",
     "uuid": "^9.0.0"
   }