@rsdk/core 4.0.1-next.0 → 4.0.1-next.2

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.0.1-next.2](https://github.com/R-Vision/rsdk/compare/v4.0.1-next.1...v4.0.1-next.2) (2023-12-07)
+
+### Bug Fixes
+
+* **db:** added queued initialization db context ([#169](https://github.com/R-Vision/rsdk/issues/169)) ([ea481ed](https://github.com/R-Vision/rsdk/commit/ea481edce9bbc7bd702fc046a37fb5a5580a88dd))
+
+## [4.0.1-next.1](https://github.com/R-Vision/rsdk/compare/v4.0.0...v4.0.1-next.1) (2023-12-06)
+
+**Note:** Version bump only for package @rsdk/core
+
 ## [4.0.1-next.0](https://github.com/R-Vision/rsdk/compare/v4.0.0...v4.0.1-next.0) (2023-12-06)
 
 **Note:** Version bump only for package @rsdk/core

package/dist/tracing/auto-instrumentations.config.d.ts

@@ -0,0 +1 @@
+export declare const autoInstumentationOptions: any[];

package/dist/tracing/auto-instrumentations.config.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoInstumentationOptions = void 0;
+const auto_instrumentations_node_1 = require("@opentelemetry/auto-instrumentations-node");
+const node_http_1 = require("node:http");
+const request_metadata_storage_1 = require("./services/request-metadata.storage");
+exports.autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoInstrumentations)({
+    '@opentelemetry/instrumentation-aws-sdk': {
+        responseHook: (span, { response }) => {
+            if (response.request.commandInput?.Bucket) {
+                span.setAttribute('s3.bucket.name', response.request.commandInput?.Bucket);
+            }
+        },
+    },
+    '@opentelemetry/instrumentation-graphql': {
+        allowValues: true,
+    },
+    '@opentelemetry/instrumentation-http': {
+        requestHook: (span, request) => {
+            if (request instanceof node_http_1.IncomingMessage) {
+                if (request.method && request.url) {
+                    span.updateName(`${request.method} ${request.url}`);
+                }
+            }
+            else if (request instanceof node_http_1.ClientRequest &&
+                request.req.method &&
+                request.req.url) {
+                span.updateName(`${request.req.method} ${request.req.url}`);
+            }
+        },
+    },
+    '@opentelemetry/instrumentation-pg': {
+        enhancedDatabaseReporting: true,
+    },
+    '@opentelemetry/instrumentation-pino': {
+        enabled: true,
+        logHook: (_span, record) => {
+            record['request_id'] =
+                request_metadata_storage_1.RequestMetadataStorage.getInstance()?.getRequestMetadata().requestId;
+        },
+    },
+});
+//# sourceMappingURL=auto-instrumentations.config.js.map

package/dist/tracing/auto-instrumentations.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-instrumentations.config.js","sourceRoot":"","sources":["../../src/tracing/auto-instrumentations.config.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,yCAA2D;AAE3D,kFAA6E;AAEhE,QAAA,yBAAyB,GAAU,IAAA,wDAA2B,EAAC;IAC1E,wCAAwC,EAAE;QACxC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;YACnC,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;KACF;IACD,wCAAwC,EAAE;QACxC,WAAW,EAAE,IAAI;KAClB;IACD,qCAAqC,EAAE;QACrC,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAC7B,IAAI,OAAO,YAAY,2BAAe,EAAE,CAAC;gBACvC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;iBAAM,IACL,OAAO,YAAY,yBAAa;gBAChC,OAAO,CAAC,GAAG,CAAC,MAAM;gBAClB,OAAO,CAAC,GAAG,CAAC,GAAG,EACf,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;KACF;IACD,mCAAmC,EAAE;QACnC,yBAAyB,EAAE,IAAI;KAChC;IACD,qCAAqC,EAAE;QACrC,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzB,MAAM,CAAC,YAAY,CAAC;gBAClB,iDAAsB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,CAAC,SAAS,CAAC;QACzE,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/tracing/services/request-metadata.storage.d.ts

@@ -18,7 +18,7 @@ export declare class RequestMetadataStorage {
     /**
      * Получает новое значение из контекста
      */
-    getRequestMetadata(): Promise<RequestMetadata>;
+    getRequestMetadata(): RequestMetadata;
     /**
      * Запускает переданную фунцию в контексте
      * @template TResult

package/dist/tracing/services/request-metadata.storage.js

@@ -37,7 +37,7 @@ let RequestMetadataStorage = class RequestMetadataStorage {
     /**
      * Получает новое значение из контекста
      */
-    async getRequestMetadata() {
+    getRequestMetadata() {
         return (RequestMetadataStorage_1.instance?.asyncLocalStorage.getStore()
             ?.requestMetadata ?? {
             requestId: undefined,

package/dist/tracing/services/request-metadata.storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-metadata.storage.js","sourceRoot":"","sources":["../../../src/tracing/services/request-metadata.storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAqD;AAMrD;;;;GAIG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;;IACjC;;;OAGG;IACK,MAAM,CAAC,QAAQ,CAAqC;IAEpD,iBAAiB,GAAG,IAAI,oCAAiB,EAE7C,CAAC;IAEL;QACE,IAAI,CAAC,wBAAsB,CAAC,QAAQ,EAAE,CAAC;YACrC,wBAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,wBAAsB,CAAC,QAAQ,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,kBAAkB;QACtB,OAAO,CACL,wBAAsB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE;YAC3D,EAAE,eAAe,IAAI;YACrB,SAAS,EAAE,SAAS;SACrB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,GAAG,CACD,eAAgC,EAChC,EAA+B,EAC/B,GAAG,IAAW;QAEd,OAAO,CACL,wBAAsB,EAAE,QAAQ,EAAE,iBAAiB,CAAC,GAAG,CACrD,EAAE,eAAe,EAAE,EACnB,EAAE,EACF,GAAG,IAAI,CACR,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CACjB,CAAC;IACJ,CAAC;CACF,CAAA;AAvDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;;GACA,sBAAsB,CAuDlC"}
+{"version":3,"file":"request-metadata.storage.js","sourceRoot":"","sources":["../../../src/tracing/services/request-metadata.storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uDAAqD;AAMrD;;;;GAIG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;;IACjC;;;OAGG;IACK,MAAM,CAAC,QAAQ,CAAqC;IAEpD,iBAAiB,GAAG,IAAI,oCAAiB,EAE7C,CAAC;IAEL;QACE,IAAI,CAAC,wBAAsB,CAAC,QAAQ,EAAE,CAAC;YACrC,wBAAsB,CAAC,QAAQ,GAAG,IAAI,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,wBAAsB,CAAC,QAAQ,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,CACL,wBAAsB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE;YAC3D,EAAE,eAAe,IAAI;YACrB,SAAS,EAAE,SAAS;SACrB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,GAAG,CACD,eAAgC,EAChC,EAA+B,EAC/B,GAAG,IAAW;QAEd,OAAO,CACL,wBAAsB,EAAE,QAAQ,EAAE,iBAAiB,CAAC,GAAG,CACrD,EAAE,eAAe,EAAE,EACnB,EAAE,EACF,GAAG,IAAI,CACR,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,CACjB,CAAC;IACJ,CAAC;CACF,CAAA;AAvDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;;GACA,sBAAsB,CAuDlC"}

package/dist/tracing/tracing.module.d.ts

@@ -16,7 +16,7 @@ export declare class TracingModule {
     private readonly config;
     constructor(logger: ILogger, instrumentations: InstrumentationService, sdk: NodeSDK, config: TracingModuleConfig);
     static forRoot(options: TracingModuleOptions): DynamicModule;
-    private static createSDKProvider;
     onModuleInit(): Promise<void>;
+    private static createSDKProvider;
     beforeApplicationShutdown(): Promise<void>;
 }

package/dist/tracing/tracing.module.js

@@ -18,7 +18,9 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const api_1 = require("@opentelemetry/api");
 const context_async_hooks_1 = require("@opentelemetry/context-async-hooks");
+const core_2 = require("@opentelemetry/core");
 const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
+const propagator_b3_1 = require("@opentelemetry/propagator-b3");
 const resources_1 = require("@opentelemetry/resources");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
 const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
@@ -26,6 +28,7 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const logging_1 = require("@rsdk/logging");
 const logging_2 = require("../logging");
 const active_span_module_1 = require("./active-span.module");
+const auto_instrumentations_config_1 = require("./auto-instrumentations.config");
 const request_metadata_module_1 = require("./request-metadata.module");
 const services_1 = require("./services");
 const tracing_config_1 = require("./tracing.config");
@@ -55,6 +58,26 @@ let TracingModule = TracingModule_1 = class TracingModule {
             ],
         };
     }
+    // Можно добавить включение и выключение при изменении конфига.
+    async onModuleInit() {
+        this.logger.debug('Injecting request-metadata storage...');
+        this.instrumentations.injectWrapRequestMetadataInjector();
+        if (!this.config.enabled) {
+            this.logger.info('Tracing is disabled');
+            return;
+        }
+        this.logger.info('Tracing is enabled');
+        this.logger.debug('Starting Open Telemetry SDK...');
+        this.sdk.start();
+        this.logger.debug('Instrumenting nest.js entities...');
+        this.instrumentations.injectWrapTraceInjector();
+        this.logger.debug('Attaching log messages to spans...');
+        logging_1.LoggerFactory.applyInstrumentations();
+        logging_1.LoggerFactory.onMessage((level, msg) => {
+            const span = api_1.trace.getSpan(api_1.context.active());
+            span?.addEvent('log', { ...msg, level });
+        });
+    }
     static createSDKProvider(options) {
         return {
             provide: sdk_node_1.NodeSDK,
@@ -70,33 +93,23 @@ let TracingModule = TracingModule_1 = class TracingModule {
                 return new sdk_node_1.NodeSDK({
                     autoDetectResources: true,
                     contextManager: new context_async_hooks_1.AsyncLocalStorageContextManager(),
+                    instrumentations: [auto_instrumentations_config_1.autoInstumentationOptions],
                     resource: new resources_1.Resource({
                         [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: options.appName,
                     }),
                     spanProcessor: processor,
+                    textMapPropagator: new core_2.CompositePropagator({
+                        propagators: [
+                            new propagator_b3_1.B3Propagator(),
+                            new propagator_b3_1.B3Propagator({
+                                injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
+                            }),
+                        ],
+                    }),
                 });
             },
         };
     }
-    // Можно добавить включение и выключение при изменении конфига.
-    async onModuleInit() {
-        this.logger.debug('Injecting request-metadata storage...');
-        this.instrumentations.injectWrapRequestMetadataInjector();
-        if (!this.config.enabled) {
-            this.logger.info('Tracing is disabled');
-            return;
-        }
-        this.logger.info('Tracing is enabled');
-        this.logger.debug('Starting Open Telemetry SDK...');
-        await this.sdk.start();
-        this.logger.debug('Instrumenting nest.js entities...');
-        this.instrumentations.injectWrapTraceInjector();
-        this.logger.debug('Attaching log messages to spans...');
-        logging_1.LoggerFactory.onMessage((level, msg) => {
-            const span = api_1.trace.getSpan(api_1.context.active());
-            span?.addEvent('log', { ...msg, level });
-        });
-    }
     async beforeApplicationShutdown() {
         this.logger.info('Shutting down Open Telemetry SDK...');
         await this.sdk.shutdown();

package/dist/tracing/tracing.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "4.0.1-next.0",
+  "version": "4.0.1-next.2",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.4.1",
+    "@opentelemetry/auto-instrumentations-node": "0.36.1",
     "@opentelemetry/context-async-hooks": "1.13.0",
     "@opentelemetry/core": "1.13.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.39.1",
@@ -31,18 +32,18 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@rsdk/autodoc.protocol": "^4.0.1-next.0",
-    "@rsdk/common": "^4.0.1-next.0",
-    "@rsdk/common.nestjs": "^4.0.1-next.0",
-    "@rsdk/common.node": "^4.0.1-next.0",
-    "@rsdk/decorators": "^4.0.1-next.0",
-    "@rsdk/logging": "^4.0.1-next.0",
-    "@rsdk/metadata": "^4.0.1-next.0",
-    "@rsdk/nest-tools": "^4.0.1-next.0",
+    "@rsdk/autodoc.protocol": "^4.0.1-next.2",
+    "@rsdk/common": "^4.0.1-next.2",
+    "@rsdk/common.nestjs": "^4.0.1-next.2",
+    "@rsdk/common.node": "^4.0.1-next.2",
+    "@rsdk/decorators": "^4.0.1-next.2",
+    "@rsdk/logging": "^4.0.1-next.2",
+    "@rsdk/metadata": "^4.0.1-next.2",
+    "@rsdk/nest-tools": "^4.0.1-next.2",
     "axios": "^1.1.3",
     "pino": "^8.16.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "772c1ca796c9a5b279274d6a6fb1a356e64aa71f"
+  "gitHead": "f48f893ffc6bccdfd5a0b703cc377a3a770581ff"
 }

package/src/tracing/auto-instrumentations.config.ts

@@ -0,0 +1,45 @@
+import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
+import { ClientRequest, IncomingMessage } from 'node:http';
+
+import { RequestMetadataStorage } from './services/request-metadata.storage';
+
+export const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
+  '@opentelemetry/instrumentation-aws-sdk': {
+    responseHook: (span, { response }) => {
+      if (response.request.commandInput?.Bucket) {
+        span.setAttribute(
+          's3.bucket.name',
+          response.request.commandInput?.Bucket,
+        );
+      }
+    },
+  },
+  '@opentelemetry/instrumentation-graphql': {
+    allowValues: true,
+  },
+  '@opentelemetry/instrumentation-http': {
+    requestHook: (span, request) => {
+      if (request instanceof IncomingMessage) {
+        if (request.method && request.url) {
+          span.updateName(`${request.method} ${request.url}`);
+        }
+      } else if (
+        request instanceof ClientRequest &&
+        request.req.method &&
+        request.req.url
+      ) {
+        span.updateName(`${request.req.method} ${request.req.url}`);
+      }
+    },
+  },
+  '@opentelemetry/instrumentation-pg': {
+    enhancedDatabaseReporting: true,
+  },
+  '@opentelemetry/instrumentation-pino': {
+    enabled: true,
+    logHook: (_span, record) => {
+      record['request_id'] =
+        RequestMetadataStorage.getInstance()?.getRequestMetadata().requestId;
+    },
+  },
+});

package/src/tracing/services/request-metadata.storage.ts

@@ -35,7 +35,7 @@ export class RequestMetadataStorage {
   /**
    * Получает новое значение из контекста
    */
-  async getRequestMetadata(): Promise<RequestMetadata> {
+  getRequestMetadata(): RequestMetadata {
     return (
       RequestMetadataStorage.instance?.asyncLocalStorage.getStore()
         ?.requestMetadata ?? {

package/src/tracing/tracing.module.ts

@@ -3,7 +3,9 @@ import { Module } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
 import { context, trace } from '@opentelemetry/api';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
+import { CompositePropagator } from '@opentelemetry/core';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
 import { Resource } from '@opentelemetry/resources';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import type { SpanExporter } from '@opentelemetry/sdk-trace-base';
@@ -17,6 +19,7 @@ import { ILogger, LoggerFactory } from '@rsdk/logging';
 import { InjectLogger } from '../logging';
 
 import { ActiveSpanModule } from './active-span.module';
+import { autoInstumentationOptions } from './auto-instrumentations.config';
 import { RequestMetadataModule } from './request-metadata.module';
 import { InstrumentationService } from './services';
 import { TracingModuleConfig } from './tracing.config';
@@ -52,6 +55,34 @@ export class TracingModule {
     };
   }
 
+  // Можно добавить включение и выключение при изменении конфига.
+  async onModuleInit(): Promise<void> {
+    this.logger.debug('Injecting request-metadata storage...');
+    this.instrumentations.injectWrapRequestMetadataInjector();
+
+    if (!this.config.enabled) {
+      this.logger.info('Tracing is disabled');
+
+      return;
+    }
+
+    this.logger.info('Tracing is enabled');
+
+    this.logger.debug('Starting Open Telemetry SDK...');
+    this.sdk.start();
+
+    this.logger.debug('Instrumenting nest.js entities...');
+    this.instrumentations.injectWrapTraceInjector();
+
+    this.logger.debug('Attaching log messages to spans...');
+    LoggerFactory.applyInstrumentations();
+    LoggerFactory.onMessage((level, msg) => {
+      const span = trace.getSpan(context.active());
+
+      span?.addEvent('log', { ...msg, level });
+    });
+  }
+
   private static createSDKProvider(options: TracingModuleOptions): Provider {
     return {
       provide: NodeSDK,
@@ -72,42 +103,24 @@ export class TracingModule {
         return new NodeSDK({
           autoDetectResources: true,
           contextManager: new AsyncLocalStorageContextManager(),
+          instrumentations: [autoInstumentationOptions],
           resource: new Resource({
             [SemanticResourceAttributes.SERVICE_NAME]: options.appName,
           }),
           spanProcessor: processor,
+          textMapPropagator: new CompositePropagator({
+            propagators: [
+              new B3Propagator(),
+              new B3Propagator({
+                injectEncoding: B3InjectEncoding.MULTI_HEADER,
+              }),
+            ],
+          }),
         });
       },
     };
   }
 
-  // Можно добавить включение и выключение при изменении конфига.
-  async onModuleInit(): Promise<void> {
-    this.logger.debug('Injecting request-metadata storage...');
-    this.instrumentations.injectWrapRequestMetadataInjector();
-
-    if (!this.config.enabled) {
-      this.logger.info('Tracing is disabled');
-
-      return;
-    }
-
-    this.logger.info('Tracing is enabled');
-
-    this.logger.debug('Starting Open Telemetry SDK...');
-    await this.sdk.start();
-
-    this.logger.debug('Instrumenting nest.js entities...');
-    this.instrumentations.injectWrapTraceInjector();
-
-    this.logger.debug('Attaching log messages to spans...');
-    LoggerFactory.onMessage((level, msg) => {
-      const span = trace.getSpan(context.active());
-
-      span?.addEvent('log', { ...msg, level });
-    });
-  }
-
   async beforeApplicationShutdown(): Promise<void> {
     this.logger.info('Shutting down Open Telemetry SDK...');
     await this.sdk.shutdown();