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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [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)
7
+
8
+ ### Bug Fixes
9
+
10
+ * **db:** added queued initialization db context ([#169](https://github.com/R-Vision/rsdk/issues/169)) ([ea481ed](https://github.com/R-Vision/rsdk/commit/ea481edce9bbc7bd702fc046a37fb5a5580a88dd))
11
+
6
12
  ## [4.0.1-next.1](https://github.com/R-Vision/rsdk/compare/v4.0.0...v4.0.1-next.1) (2023-12-06)
7
13
 
8
14
  **Note:** Version bump only for package @rsdk/core
@@ -16,7 +16,7 @@ export declare class TracingModule {
16
16
  private readonly config;
17
17
  constructor(logger: ILogger, instrumentations: InstrumentationService, sdk: NodeSDK, config: TracingModuleConfig);
18
18
  static forRoot(options: TracingModuleOptions): DynamicModule;
19
- private static createSDKProvider;
20
19
  onModuleInit(): Promise<void>;
20
+ private static createSDKProvider;
21
21
  beforeApplicationShutdown(): Promise<void>;
22
22
  }
@@ -58,6 +58,26 @@ let TracingModule = TracingModule_1 = class TracingModule {
58
58
  ],
59
59
  };
60
60
  }
61
+ // Можно добавить включение и выключение при изменении конфига.
62
+ async onModuleInit() {
63
+ this.logger.debug('Injecting request-metadata storage...');
64
+ this.instrumentations.injectWrapRequestMetadataInjector();
65
+ if (!this.config.enabled) {
66
+ this.logger.info('Tracing is disabled');
67
+ return;
68
+ }
69
+ this.logger.info('Tracing is enabled');
70
+ this.logger.debug('Starting Open Telemetry SDK...');
71
+ this.sdk.start();
72
+ this.logger.debug('Instrumenting nest.js entities...');
73
+ this.instrumentations.injectWrapTraceInjector();
74
+ this.logger.debug('Attaching log messages to spans...');
75
+ logging_1.LoggerFactory.applyInstrumentations();
76
+ logging_1.LoggerFactory.onMessage((level, msg) => {
77
+ const span = api_1.trace.getSpan(api_1.context.active());
78
+ span?.addEvent('log', { ...msg, level });
79
+ });
80
+ }
61
81
  static createSDKProvider(options) {
62
82
  return {
63
83
  provide: sdk_node_1.NodeSDK,
@@ -90,26 +110,6 @@ let TracingModule = TracingModule_1 = class TracingModule {
90
110
  },
91
111
  };
92
112
  }
93
- // Можно добавить включение и выключение при изменении конфига.
94
- async onModuleInit() {
95
- this.logger.debug('Injecting request-metadata storage...');
96
- this.instrumentations.injectWrapRequestMetadataInjector();
97
- if (!this.config.enabled) {
98
- this.logger.info('Tracing is disabled');
99
- return;
100
- }
101
- this.logger.info('Tracing is enabled');
102
- this.logger.debug('Starting Open Telemetry SDK...');
103
- this.sdk.start();
104
- this.logger.debug('Instrumenting nest.js entities...');
105
- this.instrumentations.injectWrapTraceInjector();
106
- this.logger.debug('Attaching log messages to spans...');
107
- logging_1.LoggerFactory.applyInstrumentations();
108
- logging_1.LoggerFactory.onMessage((level, msg) => {
109
- const span = api_1.trace.getSpan(api_1.context.active());
110
- span?.addEvent('log', { ...msg, level });
111
- });
112
- }
113
113
  async beforeApplicationShutdown() {
114
114
  this.logger.info('Shutting down Open Telemetry SDK...');
115
115
  await this.sdk.shutdown();
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/core",
3
- "version": "4.0.1-next.1",
3
+ "version": "4.0.1-next.2",
4
4
  "description": "Nestjs based microservice chassis",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -32,18 +32,18 @@
32
32
  "@nestjs/common": "^10.0.0",
33
33
  "@nestjs/core": "^10.0.0",
34
34
  "@nestjs/microservices": "^10.0.0",
35
- "@rsdk/autodoc.protocol": "^4.0.1-next.1",
36
- "@rsdk/common": "^4.0.1-next.1",
37
- "@rsdk/common.nestjs": "^4.0.1-next.1",
38
- "@rsdk/common.node": "^4.0.1-next.1",
39
- "@rsdk/decorators": "^4.0.1-next.1",
40
- "@rsdk/logging": "^4.0.1-next.1",
41
- "@rsdk/metadata": "^4.0.1-next.1",
42
- "@rsdk/nest-tools": "^4.0.1-next.1",
35
+ "@rsdk/autodoc.protocol": "^4.0.1-next.2",
36
+ "@rsdk/common": "^4.0.1-next.2",
37
+ "@rsdk/common.nestjs": "^4.0.1-next.2",
38
+ "@rsdk/common.node": "^4.0.1-next.2",
39
+ "@rsdk/decorators": "^4.0.1-next.2",
40
+ "@rsdk/logging": "^4.0.1-next.2",
41
+ "@rsdk/metadata": "^4.0.1-next.2",
42
+ "@rsdk/nest-tools": "^4.0.1-next.2",
43
43
  "axios": "^1.1.3",
44
44
  "pino": "^8.16.1",
45
45
  "reflect-metadata": "^0.1.13",
46
46
  "rxjs": "^7.0.0"
47
47
  },
48
- "gitHead": "9dcbaf369400a27c0b29fce9c7f319c5b81c9594"
48
+ "gitHead": "f48f893ffc6bccdfd5a0b703cc377a3a770581ff"
49
49
  }
@@ -55,6 +55,34 @@ export class TracingModule {
55
55
  };
56
56
  }
57
57
 
58
+ // Можно добавить включение и выключение при изменении конфига.
59
+ async onModuleInit(): Promise<void> {
60
+ this.logger.debug('Injecting request-metadata storage...');
61
+ this.instrumentations.injectWrapRequestMetadataInjector();
62
+
63
+ if (!this.config.enabled) {
64
+ this.logger.info('Tracing is disabled');
65
+
66
+ return;
67
+ }
68
+
69
+ this.logger.info('Tracing is enabled');
70
+
71
+ this.logger.debug('Starting Open Telemetry SDK...');
72
+ this.sdk.start();
73
+
74
+ this.logger.debug('Instrumenting nest.js entities...');
75
+ this.instrumentations.injectWrapTraceInjector();
76
+
77
+ this.logger.debug('Attaching log messages to spans...');
78
+ LoggerFactory.applyInstrumentations();
79
+ LoggerFactory.onMessage((level, msg) => {
80
+ const span = trace.getSpan(context.active());
81
+
82
+ span?.addEvent('log', { ...msg, level });
83
+ });
84
+ }
85
+
58
86
  private static createSDKProvider(options: TracingModuleOptions): Provider {
59
87
  return {
60
88
  provide: NodeSDK,
@@ -93,34 +121,6 @@ export class TracingModule {
93
121
  };
94
122
  }
95
123
 
96
- // Можно добавить включение и выключение при изменении конфига.
97
- async onModuleInit(): Promise<void> {
98
- this.logger.debug('Injecting request-metadata storage...');
99
- this.instrumentations.injectWrapRequestMetadataInjector();
100
-
101
- if (!this.config.enabled) {
102
- this.logger.info('Tracing is disabled');
103
-
104
- return;
105
- }
106
-
107
- this.logger.info('Tracing is enabled');
108
-
109
- this.logger.debug('Starting Open Telemetry SDK...');
110
- this.sdk.start();
111
-
112
- this.logger.debug('Instrumenting nest.js entities...');
113
- this.instrumentations.injectWrapTraceInjector();
114
-
115
- this.logger.debug('Attaching log messages to spans...');
116
- LoggerFactory.applyInstrumentations();
117
- LoggerFactory.onMessage((level, msg) => {
118
- const span = trace.getSpan(context.active());
119
-
120
- span?.addEvent('log', { ...msg, level });
121
- });
122
- }
123
-
124
124
  async beforeApplicationShutdown(): Promise<void> {
125
125
  this.logger.info('Shutting down Open Telemetry SDK...');
126
126
  await this.sdk.shutdown();