@rsdk/logging 4.2.5-next.0 → 4.3.0-next.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.3.0-next.0...v4.3.0-next.1) (2024-03-21)
+
+**Note:** Version bump only for package @rsdk/logging
+
+## [4.3.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.5-next.0...v4.3.0-next.0) (2024-03-19)
+
+### Features
+
+* reworked cli system ([745ebf5](https://github.com/R-Vision/rsdk/commit/745ebf53635de135a4a9083f47ce833efe2d4411))
+
 ## [4.2.5-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.4...v4.2.5-next.0) (2024-03-04)
 
 **Note:** Version bump only for package @rsdk/logging

package/dist/logger.factory.d.ts

@@ -13,17 +13,6 @@ export declare class LoggerFactory {
      * @param opts Опции логгер
      */
     static reconfigure(opts: Partial<LoggerOptions>): void;
-    /**
-     * Under the hood every logger instance will use this
-     * static instance. Motivation for this is that it's much
-     * easier to substitute the instance when configuration is
-     * changed.
-     *
-     * Downside is that the idea is not composable with child
-     * loggers (which are no used anywhere yet)
-     */
-    private static _globalPino;
-    private static events;
     /**
      * Этот метод должен быть вызван после того, как подключен instrumentation-pino.
      * Пакет instrumentation-pino модифицирует require. Согласно предполагаемому автором
@@ -37,6 +26,17 @@ export declare class LoggerFactory {
      * конфигурации, а уже потом решать - делать инструментирование или нет.
      */
     static applyInstrumentations<T extends Record<string, any>>(logHookFunction?: (record: T) => void): void;
+    private static events;
+    /**
+     * Under the hood every logger instance will use this
+     * static instance. Motivation for this is that it's much
+     * easier to substitute the instance when configuration is
+     * changed.
+     *
+     * Downside is that the idea is not composable with child
+     * loggers (which are no used anywhere yet)
+     */
+    private static _globalPino;
     private static opts;
     static onMessage(handler: OnMessage): void;
     static create(context: LoggingContext): ILogger;

package/dist/logger.factory.js

@@ -5,9 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoggerFactory = void 0;
 const node_events_1 = __importDefault(require("node:events"));
-const pino_1 = __importDefault(require("pino"));
 const defaults_1 = require("./defaults");
 const implementations_1 = require("./implementations");
+/**
+ * ATTENTION: require('pino') тут не просто так, в общем они нужны для корректной работы хуков из `@opentelemetry/instrumentation-pino`
+ */
+const requirePino = () => {
+    return require('pino');
+};
 /**
  * TODO: Дополнить доку
  * Фабрика является статической потому что
@@ -23,22 +28,9 @@ class LoggerFactory {
     static reconfigure(opts) {
         this.applyOptions(opts);
         const { stream, ...other } = this.opts;
-        this._globalPino = (0, pino_1.default)(other, stream);
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        this._globalPino = requirePino()(other, stream);
     }
-    /**
-     * Under the hood every logger instance will use this
-     * static instance. Motivation for this is that it's much
-     * easier to substitute the instance when configuration is
-     * changed.
-     *
-     * Downside is that the idea is not composable with child
-     * loggers (which are no used anywhere yet)
-     */
-    static _globalPino = (0, pino_1.default)({
-        level: defaults_1.DEFAULT_LEVEL,
-    });
-    // eslint-disable-next-line unicorn/prefer-event-target
-    static events = new node_events_1.default();
     /**
      * Этот метод должен быть вызван после того, как подключен instrumentation-pino.
      * Пакет instrumentation-pino модифицирует require. Согласно предполагаемому автором
@@ -54,7 +46,7 @@ class LoggerFactory {
     static applyInstrumentations(logHookFunction) {
         const { stream, ...other } = this.opts;
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        this._globalPino = require('pino')({
+        this._globalPino = requirePino()({
             ...other,
             /**
              * Функция которая позволяет добавить дополнительные данные в логи Pino
@@ -81,10 +73,25 @@ class LoggerFactory {
                 : {},
         }, stream);
     }
+    // eslint-disable-next-line unicorn/prefer-event-target
+    static events = new node_events_1.default();
+    /**
+     * Under the hood every logger instance will use this
+     * static instance. Motivation for this is that it's much
+     * easier to substitute the instance when configuration is
+     * changed.
+     *
+     * Downside is that the idea is not composable with child
+     * loggers (which are no used anywhere yet)
+     */
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    static _globalPino = requirePino()({
+        level: defaults_1.DEFAULT_LEVEL,
+    });
     static opts = {
         level: defaults_1.DEFAULT_LEVEL,
         redact: [],
-        stream: pino_1.default.destination(),
+        stream: requirePino().destination(),
     };
     static onMessage(handler) {
         this.events.on('msg', handler);
@@ -93,7 +100,7 @@ class LoggerFactory {
         return new implementations_1.PinoLogger(() => this._globalPino, (level, data) => this.events.emit('msg', level, data), context);
     }
     static applyOptions(opts) {
-        const { redact, level, stream = pino_1.default.destination() } = opts || {};
+        const { redact, level, stream = requirePino().destination() } = opts || {};
         Object.assign(this.opts, { redact, level: level ?? defaults_1.DEFAULT_LEVEL, stream });
     }
 }

package/dist/logger.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.factory.js","sourceRoot":"","sources":["../src/logger.factory.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAuC;AAEvC,gDAAwB;AAExB,yCAA2C;AAC3C,uDAA+C;AAS/C;;;GAGG;AACH,MAAa,aAAa;IACxB;;;;;;OAMG;IACH,MAAM,CAAC,WAAW,CAAC,IAA4B;QAC7C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAExB,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvC,IAAI,CAAC,WAAW,GAAG,IAAA,cAAI,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;;OAQG;IACK,MAAM,CAAC,WAAW,GAAS,IAAA,cAAI,EAAC;QACtC,KAAK,EAAE,wBAAa;KACrB,CAAC,CAAC;IAEH,uDAAuD;IAC/C,MAAM,CAAC,MAAM,GAAG,IAAI,qBAAY,EAAE,CAAC;IAE3C;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,qBAAqB,CAC1B,eAAqC;QAErC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvC,8DAA8D;QAC9D,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAChC;YACE,GAAG,KAAK;YACR;;eAEG;YACH,KAAK,EAAE,eAAe;gBACpB,CAAC,CAAC;oBACE;;;uBAGG;oBACH,SAAS,EAAE,UACT,SAAgB;oBAChB,wDAAwD;oBACxD,MAAgB;wBAEhB,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;4BAC1B,MAAM,IAAI,GAAM,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;4BACxC,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;4BAE/B,eAAe,CAAC,IAAI,CAAC,CAAC;4BAEtB,wDAAwD;4BACxD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;wBACxD,CAAC;wBACD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBACvC,CAAC;iBACF;gBACH,CAAC,CAAC,EAAE;SACP,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,IAAI,GAAkB;QACnC,KAAK,EAAE,wBAAa;QACpB,MAAM,EAAE,EAAE;QACV,MAAM,EAAE,cAAI,CAAC,WAAW,EAAE;KAC3B,CAAC;IAEF,MAAM,CAAC,SAAS,CAAC,OAAkB;QACjC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAuB;QACnC,OAAO,IAAI,4BAAU,CACnB,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EACtB,CAAC,KAAe,EAAE,IAAa,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EACxE,OAAO,CACR,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,IAA4B;QACtD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAI,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QAElE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,wBAAa,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9E,CAAC;;AA3GH,sCA4GC"}
+{"version":3,"file":"logger.factory.js","sourceRoot":"","sources":["../src/logger.factory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/logging",
-  "version": "4.2.5-next.0",
+  "version": "4.3.0-next.1",
   "description": "Base framework independent logging functionality",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -15,7 +15,7 @@
     "rxjs": "^7.8.1"
   },
   "peerDependencies": {
-    "@rsdk/common": "^4.2.5-next.0"
+    "@rsdk/common": "^4.3.0-next.1"
   },
-  "gitHead": "3fd1ccaa4a982d914736c13b87dc9bfe03cd229d"
+  "gitHead": "da58041323f3145aa436e02774d36d44606c1217"
 }

package/src/logger.factory.ts

@@ -1,6 +1,6 @@
 import EventEmitter from 'node:events';
+import type _pino from 'pino';
 import type { Logger as Pino } from 'pino';
-import pino from 'pino';
 
 import { DEFAULT_LEVEL } from './defaults';
 import { PinoLogger } from './implementations';
@@ -12,6 +12,13 @@ import type {
   OnMessage,
 } from './types';
 
+/**
+ * ATTENTION: require('pino') тут не просто так, в общем они нужны для корректной работы хуков из `@opentelemetry/instrumentation-pino`
+ */
+const requirePino = (): typeof _pino => {
+  return require('pino');
+};
+
 /**
  * TODO: Дополнить доку
  * Фабрика является статической потому что
@@ -29,25 +36,10 @@ export class LoggerFactory {
 
     const { stream, ...other } = this.opts;
 
-    this._globalPino = pino(other, stream);
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    this._globalPino = requirePino()(other, stream);
   }
 
-  /**
-   * Under the hood every logger instance will use this
-   * static instance. Motivation for this is that it's much
-   * easier to substitute the instance when configuration is
-   * changed.
-   *
-   * Downside is that the idea is not composable with child
-   * loggers (which are no used anywhere yet)
-   */
-  private static _globalPino: Pino = pino({
-    level: DEFAULT_LEVEL,
-  });
-
-  // eslint-disable-next-line unicorn/prefer-event-target
-  private static events = new EventEmitter();
-
   /**
    * Этот метод должен быть вызван после того, как подключен instrumentation-pino.
    * Пакет instrumentation-pino модифицирует require. Согласно предполагаемому автором
@@ -66,7 +58,7 @@ export class LoggerFactory {
     const { stream, ...other } = this.opts;
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    this._globalPino = require('pino')(
+    this._globalPino = requirePino()(
       {
         ...other,
         /**
@@ -101,10 +93,27 @@ export class LoggerFactory {
     );
   }
 
+  // eslint-disable-next-line unicorn/prefer-event-target
+  private static events = new EventEmitter();
+
+  /**
+   * Under the hood every logger instance will use this
+   * static instance. Motivation for this is that it's much
+   * easier to substitute the instance when configuration is
+   * changed.
+   *
+   * Downside is that the idea is not composable with child
+   * loggers (which are no used anywhere yet)
+   */
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  private static _globalPino: Pino = requirePino()({
+    level: DEFAULT_LEVEL,
+  });
+
   private static opts: LoggerOptions = {
     level: DEFAULT_LEVEL,
     redact: [],
-    stream: pino.destination(),
+    stream: requirePino().destination(),
   };
 
   static onMessage(handler: OnMessage): void {
@@ -120,7 +129,7 @@ export class LoggerFactory {
   }
 
   private static applyOptions(opts: Partial<LoggerOptions>): void {
-    const { redact, level, stream = pino.destination() } = opts || {};
+    const { redact, level, stream = requirePino().destination() } = opts || {};
 
     Object.assign(this.opts, { redact, level: level ?? DEFAULT_LEVEL, stream });
   }