@rsdk/core 5.13.0-next.0 → 5.13.0-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.
@@ -13,6 +13,11 @@ export declare class LoggerInitializingModule implements OnApplicationShutdown {
13
13
  private buildDelivery;
14
14
  private buildTransportOptions;
15
15
  /**
16
+ * OTEL-таргет оборачивается в pipeline `[time-transform → otel]`: трансформ
17
+ * приводит поле `time` к числовому epoch ms, которого требует OTLP (иначе при
18
+ * дефолтном isoTime записи молча отбрасываются), не затрагивая формат времени
19
+ * остальных таргетов.
20
+ *
16
21
  * `otlp-logger` (через который работает pino-opentelemetry-transport) НЕ
17
22
  * читает ключи `endpoint`/`serviceName`: endpoint задаётся через
18
23
  * exporterOptions.url, а имя сервиса — через resourceAttributes/loggerName.
@@ -16,8 +16,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
16
  exports.LoggerInitializingModule = void 0;
17
17
  const common_1 = require("@nestjs/common");
18
18
  const logging_1 = require("@rsdk/logging");
19
+ const node_path_1 = __importDefault(require("node:path"));
19
20
  const pino_1 = __importDefault(require("pino"));
20
21
  const logging_config_1 = require("./logging.config");
22
+ /**
23
+ * Абсолютный путь к скомпилированному pipeline-трансформу (рядом в dist).
24
+ * Воркер pino грузит таргет по пути, поэтому ссылаемся на .js, а не на модуль.
25
+ */
26
+ const OTEL_TIME_TRANSFORM = node_path_1.default.join(__dirname, 'otel-time.transform.js');
21
27
  let LoggerInitializingModule = class LoggerInitializingModule {
22
28
  static { LoggerInitializingModule_1 = this; }
23
29
  config;
@@ -80,6 +86,11 @@ let LoggerInitializingModule = class LoggerInitializingModule {
80
86
  return { targets };
81
87
  }
82
88
  /**
89
+ * OTEL-таргет оборачивается в pipeline `[time-transform → otel]`: трансформ
90
+ * приводит поле `time` к числовому epoch ms, которого требует OTLP (иначе при
91
+ * дефолтном isoTime записи молча отбрасываются), не затрагивая формат времени
92
+ * остальных таргетов.
93
+ *
83
94
  * `otlp-logger` (через который работает pino-opentelemetry-transport) НЕ
84
95
  * читает ключи `endpoint`/`serviceName`: endpoint задаётся через
85
96
  * exporterOptions.url, а имя сервиса — через resourceAttributes/loggerName.
@@ -112,9 +123,11 @@ let LoggerInitializingModule = class LoggerInitializingModule {
112
123
  };
113
124
  }
114
125
  return {
115
- target: 'pino-opentelemetry-transport',
116
- options,
117
126
  level: config.level,
127
+ pipeline: [
128
+ { target: OTEL_TIME_TRANSFORM },
129
+ { target: 'pino-opentelemetry-transport', options },
130
+ ],
118
131
  };
119
132
  }
120
133
  buildHttpTarget(url, config) {
@@ -1 +1 @@
1
- {"version":3,"file":"logger-initializing.module.js","sourceRoot":"","sources":["../../src/logging/logger-initializing.module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logger-initializing.module.js","sourceRoot":"","sources":["../../src/logging/logger-initializing.module.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ import { Transform } from 'node:stream';
2
+ /**
3
+ * Pipeline-трансформ перед pino-opentelemetry-transport: приводит поле `time`
4
+ * к числу (epoch ms), если оно пришло строкой (например, при дефолтном
5
+ * LOG_TIMESTAMP_FORMAT=isoTime). OTLP ожидает числовой timestamp, иначе запись
6
+ * молча отбрасывается. Трансформ применяется только к OTEL-ветке — stdout и
7
+ * прочие транспорты сохраняют свой человекочитаемый формат времени.
8
+ */
9
+ export default function buildOtelTimeTransform(): Promise<Transform>;
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.default = buildOtelTimeTransform;
7
+ const node_stream_1 = require("node:stream");
8
+ const pino_abstract_transport_1 = __importDefault(require("pino-abstract-transport"));
9
+ /**
10
+ * Pipeline-трансформ перед pino-opentelemetry-transport: приводит поле `time`
11
+ * к числу (epoch ms), если оно пришло строкой (например, при дефолтном
12
+ * LOG_TIMESTAMP_FORMAT=isoTime). OTLP ожидает числовой timestamp, иначе запись
13
+ * молча отбрасывается. Трансформ применяется только к OTEL-ветке — stdout и
14
+ * прочие транспорты сохраняют свой человекочитаемый формат времени.
15
+ */
16
+ function buildOtelTimeTransform() {
17
+ return (0, pino_abstract_transport_1.default)((source) => {
18
+ const transform = new node_stream_1.Transform({
19
+ objectMode: true,
20
+ autoDestroy: true,
21
+ transform(chunk, _encoding, callback) {
22
+ if (typeof chunk.time === 'string') {
23
+ const epochMs = Date.parse(chunk.time);
24
+ if (!Number.isNaN(epochMs)) {
25
+ chunk.time = epochMs;
26
+ }
27
+ }
28
+ callback(null, `${JSON.stringify(chunk)}\n`);
29
+ },
30
+ });
31
+ (0, node_stream_1.pipeline)(source, transform, () => { });
32
+ return transform;
33
+ }, { enablePipelining: true });
34
+ }
35
+ //# sourceMappingURL=otel-time.transform.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"otel-time.transform.js","sourceRoot":"","sources":["../../src/logging/otel-time.transform.ts"],"names":[],"mappings":";;;;;AAUA,yCA6BC;AAvCD,6CAAkD;AAClD,sFAA4C;AAE5C;;;;;;GAMG;AACH,SAAwB,sBAAsB;IAC5C,OAAO,IAAA,iCAAK,EACV,CAAC,MAAM,EAAE,EAAE;QACT,MAAM,SAAS,GAAG,IAAI,uBAAS,CAAC;YAC9B,UAAU,EAAE,IAAI;YAChB,WAAW,EAAE,IAAI;YACjB,SAAS,CACP,KAA8B,EAC9B,SAAyB,EACzB,QAAuD;gBAEvD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;wBAC3B,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC;oBACvB,CAAC;gBACH,CAAC;gBAED,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;SACF,CAAC,CAAC;QAEH,IAAA,sBAAQ,EAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAEtC,OAAO,SAAS,CAAC;IACnB,CAAC,EACD,EAAE,gBAAgB,EAAE,IAAI,EAAE,CACM,CAAC;AACrC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/core",
3
- "version": "5.13.0-next.0",
3
+ "version": "5.13.0-next.2",
4
4
  "description": "Nestjs based microservice chassis",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -17,6 +17,7 @@
17
17
  "dotenv": "^16.0.0",
18
18
  "lodash": "^4.17.21",
19
19
  "pino": "^8.0.0 || ^9.0.0",
20
+ "pino-abstract-transport": "^2.0.0",
20
21
  "prom-client": "^14.2.0"
21
22
  },
22
23
  "peerDependencies": {
@@ -53,5 +54,5 @@
53
54
  "optional": true
54
55
  }
55
56
  },
56
- "gitHead": "6efbb4a745c7e9cf44c5c71b6365ffb290820894"
57
+ "gitHead": "76633c63b1f1bd667f95c22f5f5fa1b6210016ab"
57
58
  }
@@ -47,12 +47,23 @@ function capture(config: LoggingConfig): Delivery {
47
47
  return spy.mock.calls[0][0] as Delivery;
48
48
  }
49
49
 
50
- function targetOf(
51
- delivery: Delivery,
52
- name: string,
53
- ): TransportTargetOptions | undefined {
54
- return delivery.transport?.targets?.find(
55
- (t: TransportTargetOptions) => t.target === name,
50
+ function targetOf(delivery: Delivery, name: string): Delivery | undefined {
51
+ return delivery.transport?.targets?.find((t: Delivery) => t.target === name);
52
+ }
53
+
54
+ /** OTEL-таргет — это pipeline [time-transform → pino-opentelemetry-transport]. */
55
+ function otelPipeline(delivery: Delivery): Delivery | undefined {
56
+ return delivery.transport?.targets?.find((t: Delivery) =>
57
+ t.pipeline?.some(
58
+ (s: Delivery) => s.target === 'pino-opentelemetry-transport',
59
+ ),
60
+ );
61
+ }
62
+
63
+ /** Стейдж OTEL-экспортёра внутри pipeline. */
64
+ function otelStage(delivery: Delivery): Delivery | undefined {
65
+ return otelPipeline(delivery)?.pipeline?.find(
66
+ (s: Delivery) => s.target === 'pino-opentelemetry-transport',
56
67
  );
57
68
  }
58
69
 
@@ -105,12 +116,21 @@ describe('LoggerInitializingModule — выбор доставки', () => {
105
116
  expect(file?.level).toBe(LogLevel.info);
106
117
  });
107
118
 
108
- it('otelEnabled=true → transport (stdout + otel)', () => {
119
+ it('otelEnabled=true → transport (stdout + otel-pipeline)', () => {
109
120
  const d = capture(makeConfig({ otelEnabled: true }));
110
121
 
111
122
  expect(d.stream).toBeUndefined();
112
123
  expect(targetOf(d, 'pino/file')).toBeDefined();
113
- expect(targetOf(d, 'pino-opentelemetry-transport')).toBeDefined();
124
+ expect(otelStage(d)).toBeDefined();
125
+ });
126
+
127
+ it('OTEL обёрнут в pipeline [time-transform → otel]', () => {
128
+ const d = capture(makeConfig({ otelEnabled: true }));
129
+ const pipeline = otelPipeline(d)!.pipeline as Delivery[];
130
+
131
+ expect(pipeline).toHaveLength(2);
132
+ expect(pipeline[0].target).toMatch(/otel-time\.transform\.js$/);
133
+ expect(pipeline[1].target).toBe('pino-opentelemetry-transport');
114
134
  });
115
135
 
116
136
  it('httpEndpoint задан → transport (stdout + http)', () => {
@@ -132,7 +152,7 @@ describe('LoggerInitializingModule — выбор доставки', () => {
132
152
 
133
153
  expect(d.transport.targets).toHaveLength(3);
134
154
  expect(targetOf(d, 'pino/file')).toBeDefined();
135
- expect(targetOf(d, 'pino-opentelemetry-transport')).toBeDefined();
155
+ expect(otelStage(d)).toBeDefined();
136
156
  expect(targetOf(d, 'pino-http-transport')).toBeDefined();
137
157
  });
138
158
  });
@@ -140,8 +160,7 @@ describe('LoggerInitializingModule — выбор доставки', () => {
140
160
  describe('OTEL target', () => {
141
161
  it('минимальный: без endpoint/protocol/serviceName', () => {
142
162
  const d = capture(makeConfig({ otelEnabled: true }));
143
- const otel = targetOf(d, 'pino-opentelemetry-transport')!;
144
- const opts = otel.options as any;
163
+ const opts = otelStage(d)!.options as any;
145
164
 
146
165
  expect(opts.logRecordProcessorOptions.recordProcessorType).toBe('batch');
147
166
  expect(opts.logRecordProcessorOptions.exporterOptions).toEqual({});
@@ -158,7 +177,7 @@ describe('LoggerInitializingModule — выбор доставки', () => {
158
177
  otelServiceName: 'my-svc',
159
178
  }),
160
179
  );
161
- const opts = targetOf(d, 'pino-opentelemetry-transport')!.options as any;
180
+ const opts = otelStage(d)!.options as any;
162
181
  const exporter = opts.logRecordProcessorOptions.exporterOptions;
163
182
  const url = 'http://collector:4318/';
164
183
 
@@ -177,9 +196,8 @@ describe('LoggerInitializingModule — выбор доставки', () => {
177
196
  otelEndpoint: new URL('http://collector:4318'),
178
197
  }),
179
198
  );
180
- const exporter = (
181
- targetOf(d, 'pino-opentelemetry-transport')!.options as any
182
- ).logRecordProcessorOptions.exporterOptions;
199
+ const exporter = (otelStage(d)!.options as any).logRecordProcessorOptions
200
+ .exporterOptions;
183
201
 
184
202
  expect(exporter.protocol).toBeUndefined();
185
203
  expect(exporter.protobufExporterOptions).toEqual({
@@ -2,13 +2,21 @@ import type { OnApplicationShutdown } from '@nestjs/common';
2
2
  import { Module } from '@nestjs/common';
3
3
  import type { LoggerOptions } from '@rsdk/logging';
4
4
  import { LoggerFactory } from '@rsdk/logging';
5
+ import path from 'node:path';
5
6
  import pino, {
6
7
  type TransportMultiOptions,
8
+ type TransportPipelineOptions,
7
9
  type TransportTargetOptions,
8
10
  } from 'pino';
9
11
 
10
12
  import { LoggingConfig } from './logging.config';
11
13
 
14
+ /**
15
+ * Абсолютный путь к скомпилированному pipeline-трансформу (рядом в dist).
16
+ * Воркер pino грузит таргет по пути, поэтому ссылаемся на .js, а не на модуль.
17
+ */
18
+ const OTEL_TIME_TRANSFORM = path.join(__dirname, 'otel-time.transform.js');
19
+
12
20
  @Module({})
13
21
  export class LoggerInitializingModule implements OnApplicationShutdown {
14
22
  private static logger = LoggerFactory.create(LoggerInitializingModule);
@@ -59,7 +67,7 @@ export class LoggerInitializingModule implements OnApplicationShutdown {
59
67
  }
60
68
 
61
69
  private buildTransportOptions(config: LoggingConfig): TransportMultiOptions {
62
- const targets: TransportTargetOptions[] = [
70
+ const targets: (TransportTargetOptions | TransportPipelineOptions)[] = [
63
71
  {
64
72
  target: 'pino/file',
65
73
  options: {
@@ -84,11 +92,16 @@ export class LoggerInitializingModule implements OnApplicationShutdown {
84
92
  }
85
93
 
86
94
  /**
95
+ * OTEL-таргет оборачивается в pipeline `[time-transform → otel]`: трансформ
96
+ * приводит поле `time` к числовому epoch ms, которого требует OTLP (иначе при
97
+ * дефолтном isoTime записи молча отбрасываются), не затрагивая формат времени
98
+ * остальных таргетов.
99
+ *
87
100
  * `otlp-logger` (через который работает pino-opentelemetry-transport) НЕ
88
101
  * читает ключи `endpoint`/`serviceName`: endpoint задаётся через
89
102
  * exporterOptions.url, а имя сервиса — через resourceAttributes/loggerName.
90
103
  */
91
- private buildOtelTarget(config: LoggingConfig): TransportTargetOptions {
104
+ private buildOtelTarget(config: LoggingConfig): TransportPipelineOptions {
92
105
  const exporterOptions: Record<string, unknown> = {};
93
106
 
94
107
  // Без явного протокола otlp-logger резолвит его из стандартного
@@ -122,9 +135,11 @@ export class LoggerInitializingModule implements OnApplicationShutdown {
122
135
  }
123
136
 
124
137
  return {
125
- target: 'pino-opentelemetry-transport',
126
- options,
127
138
  level: config.level,
139
+ pipeline: [
140
+ { target: OTEL_TIME_TRANSFORM },
141
+ { target: 'pino-opentelemetry-transport', options },
142
+ ],
128
143
  };
129
144
  }
130
145
 
@@ -0,0 +1,59 @@
1
+ import type { Transform } from 'node:stream';
2
+
3
+ import buildOtelTimeTransform from './otel-time.transform';
4
+
5
+ /** Прогоняет NDJSON-строки через трансформ и возвращает распарсенный вывод. */
6
+ async function run(lines: object[]): Promise<Record<string, unknown>[]> {
7
+ const stream: Transform = await buildOtelTimeTransform();
8
+
9
+ const collected = new Promise<Record<string, unknown>[]>((resolve) => {
10
+ let out = '';
11
+
12
+ stream.on('data', (chunk) => (out += chunk));
13
+ stream.on('end', () =>
14
+ resolve(
15
+ out
16
+ .trim()
17
+ .split('\n')
18
+ .filter(Boolean)
19
+ .map((line) => JSON.parse(line)),
20
+ ),
21
+ );
22
+ });
23
+
24
+ for (const line of lines) {
25
+ stream.write(`${JSON.stringify(line)}\n`);
26
+ }
27
+ stream.end();
28
+
29
+ return collected;
30
+ }
31
+
32
+ describe('otel-time.transform', () => {
33
+ it('конвертирует строковый ISO time в epoch ms', async () => {
34
+ const iso = '2026-06-24T19:04:21.991Z';
35
+ const [record] = await run([{ level: 30, time: iso, msg: 'x' }]);
36
+
37
+ expect(record.time).toBe(Date.parse(iso));
38
+ expect(typeof record.time).toBe('number');
39
+ });
40
+
41
+ it('не трогает уже числовой time', async () => {
42
+ const [record] = await run([{ level: 30, time: 1782327861991, msg: 'x' }]);
43
+
44
+ expect(record.time).toBe(1782327861991);
45
+ });
46
+
47
+ it('не падает на отсутствии time', async () => {
48
+ const [record] = await run([{ level: 30, msg: 'x' }]);
49
+
50
+ expect('time' in record).toBe(false);
51
+ expect(record.msg).toBe('x');
52
+ });
53
+
54
+ it('оставляет невалидную строку как есть', async () => {
55
+ const [record] = await run([{ level: 30, time: 'not-a-date', msg: 'x' }]);
56
+
57
+ expect(record.time).toBe('not-a-date');
58
+ });
59
+ });
@@ -0,0 +1,40 @@
1
+ import { pipeline, Transform } from 'node:stream';
2
+ import build from 'pino-abstract-transport';
3
+
4
+ /**
5
+ * Pipeline-трансформ перед pino-opentelemetry-transport: приводит поле `time`
6
+ * к числу (epoch ms), если оно пришло строкой (например, при дефолтном
7
+ * LOG_TIMESTAMP_FORMAT=isoTime). OTLP ожидает числовой timestamp, иначе запись
8
+ * молча отбрасывается. Трансформ применяется только к OTEL-ветке — stdout и
9
+ * прочие транспорты сохраняют свой человекочитаемый формат времени.
10
+ */
11
+ export default function buildOtelTimeTransform(): Promise<Transform> {
12
+ return build(
13
+ (source) => {
14
+ const transform = new Transform({
15
+ objectMode: true,
16
+ autoDestroy: true,
17
+ transform(
18
+ chunk: Record<string, unknown>,
19
+ _encoding: BufferEncoding,
20
+ callback: (error?: Error | null, data?: string) => void,
21
+ ): void {
22
+ if (typeof chunk.time === 'string') {
23
+ const epochMs = Date.parse(chunk.time);
24
+
25
+ if (!Number.isNaN(epochMs)) {
26
+ chunk.time = epochMs;
27
+ }
28
+ }
29
+
30
+ callback(null, `${JSON.stringify(chunk)}\n`);
31
+ },
32
+ });
33
+
34
+ pipeline(source, transform, () => {});
35
+
36
+ return transform;
37
+ },
38
+ { enablePipelining: true },
39
+ ) as unknown as Promise<Transform>;
40
+ }