plutin 1.6.0 → 1.6.2

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import { z } from 'zod';
 import { Express } from 'express';
-import { FastifyInstance } from 'fastify';
+import { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
+import { Logger } from '@opentelemetry/api-logs';
+import winston from 'winston';
 
 type AnyObject = Record<string, any>;
 type Request = {
@@ -329,6 +331,40 @@ declare class SentryNotifier implements IErrorNotifier {
     notify(error: Error, context: ContextError): Promise<void>;
 }
 
+declare class WinstonOtelFastify {
+    private readonly env;
+    logger: Logger;
+    consoleLogger: winston.Logger;
+    level: 'info' | 'error' | 'debug' | 'fatal' | 'warn';
+    constructor(env: Record<string, any>);
+    private bodyIsFastifyRequest;
+    private bodyIsFastifyReply;
+    private buildMessage;
+    private logMessage;
+    info(body: string | {
+        req?: FastifyRequest;
+        res?: FastifyReply;
+    }): void;
+    error(body: string | {
+        req?: FastifyRequest;
+        res?: FastifyReply;
+    }): void;
+    debug(body: string | {
+        req?: FastifyRequest;
+        res?: FastifyReply;
+    }): void;
+    fatal(body: string | {
+        req?: FastifyRequest;
+        res?: FastifyReply;
+    }): void;
+    warn(body: string | {
+        req?: FastifyRequest;
+        res?: FastifyReply;
+    }): void;
+    trace(message: string): void;
+    child(): WinstonOtelFastify;
+}
+
 declare function Span(): MethodDecorator;
 
 interface ITracerGateway {
@@ -348,4 +384,4 @@ declare const logger: {
     error: (...args: any[]) => void;
 };
 
-export { AggregateObjectRoot, AggregateRoot, BaseController, CommonDTO, ContextError, Controller, CreateCommonDTO, DependencyContainer, DiscordNotifier, DtoResponsePagination, Entity, EntityObject, ExpressAdapter, FastifyAdapter, GlobalErrorHandler, IErrorNotifier, IHealthCheckDB, IHttp, ITracerGateway, Inject, MethodType, MiddlewareFunction, NotPagination, NotificationErrorInMemory, NotificationFactory, Optional, Pagination, Replace, Request, RequestHttp, Response, SentryNotifier, Span, TracerGatewayOpentelemetry, UniqueEntityId, UniqueObjectId, ValueObject, WatchedList, ZodSchema, baseEnvSchema, getTakeAndSkip, logger, zodValidator };
+export { AggregateObjectRoot, AggregateRoot, BaseController, CommonDTO, ContextError, Controller, CreateCommonDTO, DependencyContainer, DiscordNotifier, DtoResponsePagination, Entity, EntityObject, ExpressAdapter, FastifyAdapter, GlobalErrorHandler, IErrorNotifier, IHealthCheckDB, IHttp, ITracerGateway, Inject, MethodType, MiddlewareFunction, NotPagination, NotificationErrorInMemory, NotificationFactory, Optional, Pagination, Replace, Request, RequestHttp, Response, SentryNotifier, Span, TracerGatewayOpentelemetry, UniqueEntityId, UniqueObjectId, ValueObject, WatchedList, WinstonOtelFastify, ZodSchema, baseEnvSchema, getTakeAndSkip, logger, zodValidator };

package/dist/index.mjs

@@ -1456,8 +1456,115 @@ function zodValidator(schema) {
 }
 __name(zodValidator, "zodValidator");
 
+// src/infra/adapters/logger/winston-otel-fastify.ts
+import opentelemetry from "@opentelemetry/api";
+import { logs, SeverityNumber } from "@opentelemetry/api-logs";
+import winston from "winston";
+var WinstonOtelFastify = class WinstonOtelFastify2 {
+  static {
+    __name(this, "WinstonOtelFastify");
+  }
+  env;
+  logger;
+  consoleLogger;
+  level;
+  constructor(env) {
+    this.env = env;
+    this.level = "info";
+    if (env.OTEL_ENABLE) {
+      this.logger = logs.getLogger(this.env.OTEL_SERVICE_NAME, this.env.OTEL_SERVICE_VERSION);
+      this.level = this.env.LOG_LEVEL;
+      const transports = this.env.NODE_ENV === "test" ? [
+        new winston.transports.Console({
+          silent: true
+        })
+      ] : [
+        new winston.transports.Console()
+      ];
+      this.consoleLogger = winston.createLogger({
+        level: this.level,
+        format: winston.format.combine(winston.format.timestamp({
+          format: "YYYY-MM-DD HH:mm:ss:ms"
+        }), winston.format((info) => {
+          if (this.env.NODE_ENV !== "test") {
+            const span = opentelemetry.trace.getActiveSpan();
+            if (span) {
+              info.spanId = span.spanContext().spanId;
+              info.traceId = span.spanContext().traceId;
+            }
+          }
+          return info;
+        })(), winston.format.json()),
+        transports
+      });
+    } else {
+      this.consoleLogger = winston.createLogger({
+        level: this.level,
+        format: winston.format.combine(winston.format.timestamp({
+          format: "YYYY-MM-DD HH:mm:ss:ms"
+        }), winston.format.json())
+      });
+    }
+  }
+  bodyIsFastifyRequest(body) {
+    return body.method !== void 0;
+  }
+  bodyIsFastifyReply(body) {
+    return body.statusCode !== void 0;
+  }
+  buildMessage(body) {
+    if (typeof body === "object" && body.req && this.bodyIsFastifyRequest(body.req)) {
+      return `${body.req.method} ${body.req.url}`;
+    } else if (typeof body === "object" && body.res && this.bodyIsFastifyReply(body.res)) {
+      return `${body.res.request.method} ${body.res.request.url} ${body.res.statusCode} - ${body.res.elapsedTime} ms`;
+    } else if (typeof body === "string") {
+      return body;
+    } else {
+      return "";
+    }
+  }
+  logMessage(body, severityNumber, severityText) {
+    const message = this.buildMessage(body);
+    this.consoleLogger[severityText.toLowerCase()](message);
+    if (this.env.NODE_ENV !== "test") {
+      this.logger.emit({
+        body: message,
+        severityNumber,
+        severityText
+      });
+    }
+  }
+  info(body) {
+    this.logMessage(body, SeverityNumber.INFO, "INFO");
+  }
+  error(body) {
+    this.logMessage(body, SeverityNumber.ERROR, "ERROR");
+  }
+  debug(body) {
+    this.logMessage(body, SeverityNumber.DEBUG, "DEBUG");
+  }
+  fatal(body) {
+    this.logMessage(body, SeverityNumber.FATAL, "FATAL");
+  }
+  warn(body) {
+    this.logMessage(body, SeverityNumber.WARN, "WARN");
+  }
+  trace(message) {
+    if (this.env.NODE_ENV !== "test") {
+      this.logger.emit({
+        body: message,
+        severityNumber: SeverityNumber.TRACE,
+        severityText: "TRACE"
+      });
+    }
+  }
+  child() {
+    return new WinstonOtelFastify2(process.env);
+  }
+};
+
 // src/infra/adapters/observability/otel/span-decorator.ts
-import opentelemetry, { SpanStatusCode } from "@opentelemetry/api";
+import opentelemetry2, { SpanStatusCode } from "@opentelemetry/api";
 import "reflect-metadata";
 function Span() {
   return function(target, propertyKey, descriptor) {
@@ -1466,7 +1573,7 @@ function Span() {
     }
     const originalMethod = descriptor.value;
     descriptor.value = function(...args) {
-      const tracer = opentelemetry.trace.getTracer(process.env.OTEL_SERVICE_NAME, process.env.OTEL_SERVICE_VERSION);
+      const tracer = opentelemetry2.trace.getTracer(process.env.OTEL_SERVICE_NAME, process.env.OTEL_SERVICE_VERSION);
       const className = target.constructor?.name || "UnknownClass";
       const methodName = String(propertyKey);
       const spanName = `${className}.${methodName}`;
@@ -1514,7 +1621,7 @@ function handleSpanError(span, error) {
 __name(handleSpanError, "handleSpanError");
 
 // src/infra/adapters/observability/otel/tracer-gateway-opentelemetry.ts
-import opentelemetry2 from "@opentelemetry/api";
+import opentelemetry3 from "@opentelemetry/api";
 var TracerGatewayOpentelemetry = class {
   static {
     __name(this, "TracerGatewayOpentelemetry");
@@ -1523,7 +1630,7 @@ var TracerGatewayOpentelemetry = class {
     if (!process.env.OTEL_ENABLE) {
       return;
     }
-    const span = opentelemetry2.trace.getActiveSpan();
+    const span = opentelemetry3.trace.getActiveSpan();
     if (span && attributes) {
       span.addEvent(name, attributes);
     } else if (span) {
@@ -1534,7 +1641,7 @@ var TracerGatewayOpentelemetry = class {
     if (!process.env.OTEL_ENABLE) {
       return;
     }
-    const span = opentelemetry2.trace.getActiveSpan();
+    const span = opentelemetry3.trace.getActiveSpan();
     if (span) {
       span.setAttribute(key, value);
     }
@@ -1602,6 +1709,7 @@ export {
   UniqueObjectId,
   ValueObject,
   WatchedList,
+  WinstonOtelFastify,
   baseEnvSchema,
   getTakeAndSkip,
   logger,