@rsdk/core 5.15.0-next.5 → 5.15.0-next.7
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/dist/logging/logger-initializing.module.js +3 -2
- package/dist/logging/logger-initializing.module.js.map +1 -1
- package/dist/logging/otel-logs.transport.d.ts +12 -0
- package/dist/logging/otel-logs.transport.js +39 -0
- package/dist/logging/otel-logs.transport.js.map +1 -0
- package/package.json +2 -2
- package/src/logging/logger-factory.lifecycle.spec.ts +21 -0
- package/src/logging/logger-initializing.module.spec.ts +7 -8
- package/src/logging/logger-initializing.module.ts +3 -2
- package/src/logging/otel-logs.transport.spec.ts +76 -0
- package/src/logging/otel-logs.transport.ts +41 -0
|
@@ -20,10 +20,11 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
20
20
|
const pino_1 = __importDefault(require("pino"));
|
|
21
21
|
const logging_config_1 = require("./logging.config");
|
|
22
22
|
/**
|
|
23
|
-
*
|
|
23
|
+
* Абсолютные пути к скомпилированным шагам OTEL-pipeline (рядом в dist).
|
|
24
24
|
* Воркер pino грузит таргет по пути, поэтому ссылаемся на .js, а не на модуль.
|
|
25
25
|
*/
|
|
26
26
|
const OTEL_TIME_TRANSFORM = node_path_1.default.join(__dirname, 'otel-time.transform.js');
|
|
27
|
+
const OTEL_LOGS_TRANSPORT = node_path_1.default.join(__dirname, 'otel-logs.transport.js');
|
|
27
28
|
let LoggerInitializingModule = class LoggerInitializingModule {
|
|
28
29
|
static { LoggerInitializingModule_1 = this; }
|
|
29
30
|
config;
|
|
@@ -126,7 +127,7 @@ let LoggerInitializingModule = class LoggerInitializingModule {
|
|
|
126
127
|
level: config.level,
|
|
127
128
|
pipeline: [
|
|
128
129
|
{ target: OTEL_TIME_TRANSFORM },
|
|
129
|
-
{ target:
|
|
130
|
+
{ target: OTEL_LOGS_TRANSPORT, options },
|
|
130
131
|
],
|
|
131
132
|
};
|
|
132
133
|
}
|
|
@@ -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,12 @@
|
|
|
1
|
+
import { Writable } from 'node:stream';
|
|
2
|
+
import createOtelTransport from 'pino-opentelemetry-transport';
|
|
3
|
+
type OtelTransportOptions = Parameters<typeof createOtelTransport>[0];
|
|
4
|
+
/**
|
|
5
|
+
* Последний шаг OTEL-pipeline вместо pino-opentelemetry-transport. pino
|
|
6
|
+
* считает pipeline закрытым по 'finish' последнего шага, а транспорт
|
|
7
|
+
* отправляет последний батч позже, в асинхронном close. thread-stream по
|
|
8
|
+
* закрытию pipeline сразу завершает воркер, и логи перед остановкой
|
|
9
|
+
* терялись. Обертка завершается только после 'close' транспорта.
|
|
10
|
+
*/
|
|
11
|
+
export default function buildOtelLogsTransport(options: OtelTransportOptions): Promise<Writable>;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,39 @@
|
|
|
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 = buildOtelLogsTransport;
|
|
7
|
+
const node_stream_1 = require("node:stream");
|
|
8
|
+
const pino_opentelemetry_transport_1 = __importDefault(require("pino-opentelemetry-transport"));
|
|
9
|
+
/**
|
|
10
|
+
* Последний шаг OTEL-pipeline вместо pino-opentelemetry-transport. pino
|
|
11
|
+
* считает pipeline закрытым по 'finish' последнего шага, а транспорт
|
|
12
|
+
* отправляет последний батч позже, в асинхронном close. thread-stream по
|
|
13
|
+
* закрытию pipeline сразу завершает воркер, и логи перед остановкой
|
|
14
|
+
* терялись. Обертка завершается только после 'close' транспорта.
|
|
15
|
+
*/
|
|
16
|
+
async function buildOtelLogsTransport(options) {
|
|
17
|
+
const transport = await (0, pino_opentelemetry_transport_1.default)(options);
|
|
18
|
+
const stream = new node_stream_1.Writable({
|
|
19
|
+
write(chunk, _encoding, callback) {
|
|
20
|
+
if (transport.write(chunk)) {
|
|
21
|
+
callback();
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
transport.once('drain', () => callback());
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
final(callback) {
|
|
28
|
+
if (transport.closed) {
|
|
29
|
+
callback();
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
transport.once('close', () => callback());
|
|
33
|
+
transport.end();
|
|
34
|
+
},
|
|
35
|
+
});
|
|
36
|
+
transport.on('error', (error) => stream.destroy(error));
|
|
37
|
+
return stream;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=otel-logs.transport.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-logs.transport.js","sourceRoot":"","sources":["../../src/logging/otel-logs.transport.ts"],"names":[],"mappings":";;;;;AAYA,yCA4BC;AAxCD,6CAAuC;AACvC,gGAA+D;AAI/D;;;;;;GAMG;AACY,KAAK,UAAU,sBAAsB,CAClD,OAA6B;IAE7B,MAAM,SAAS,GAAG,MAAM,IAAA,sCAAmB,EAAC,OAAO,CAAC,CAAC;IAErD,MAAM,MAAM,GAAG,IAAI,sBAAQ,CAAC;QAC1B,KAAK,CAAC,KAAa,EAAE,SAAS,EAAE,QAAQ;YACtC,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,QAAQ,EAAE,CAAC;YACb,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,KAAK,CAAC,QAAQ;YACZ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,QAAQ,EAAE,CAAC;gBAEX,OAAO;YACT,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1C,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;KACF,CAAC,CAAC;IAEH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAExD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "5.15.0-next.
|
|
3
|
+
"version": "5.15.0-next.7",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -54,5 +54,5 @@
|
|
|
54
54
|
"optional": true
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "2178d5a4b05b6d2663202712ab364e83f5177cbd"
|
|
58
58
|
}
|
|
@@ -88,4 +88,25 @@ describe('LoggerFactory — жизненный цикл worker-транспор
|
|
|
88
88
|
|
|
89
89
|
expect(created.end).toHaveBeenCalled();
|
|
90
90
|
});
|
|
91
|
+
|
|
92
|
+
it('на shutdown держит процесс, пока воркер не закрылся', async () => {
|
|
93
|
+
LoggerFactory.reconfigure({ ...base, transport: transport(1) });
|
|
94
|
+
const created = transportSpy.mock.results[0].value;
|
|
95
|
+
const setTimeoutSpy = jest.spyOn(globalThis, 'setTimeout');
|
|
96
|
+
const clearTimeoutSpy = jest.spyOn(globalThis, 'clearTimeout');
|
|
97
|
+
|
|
98
|
+
const shutdown = LoggerFactory.shutdown(1000);
|
|
99
|
+
const timer = setTimeoutSpy.mock.results[0].value as NodeJS.Timeout;
|
|
100
|
+
|
|
101
|
+
expect(timer.hasRef()).toBe(true);
|
|
102
|
+
expect(created.end).toHaveBeenCalled();
|
|
103
|
+
|
|
104
|
+
const [, onClose] = created.on.mock.calls.find(
|
|
105
|
+
([event]: [string]) => event === 'close',
|
|
106
|
+
);
|
|
107
|
+
onClose();
|
|
108
|
+
await shutdown;
|
|
109
|
+
|
|
110
|
+
expect(clearTimeoutSpy).toHaveBeenCalledWith(timer);
|
|
111
|
+
});
|
|
91
112
|
});
|
|
@@ -51,20 +51,19 @@ function targetOf(delivery: Delivery, name: string): Delivery | undefined {
|
|
|
51
51
|
return delivery.transport?.targets?.find((t: Delivery) => t.target === name);
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
|
|
54
|
+
const isOtelStage = (s: Delivery): boolean =>
|
|
55
|
+
/otel-logs\.transport\.js$/.test(s.target);
|
|
56
|
+
|
|
57
|
+
/** OTEL-таргет — это pipeline [time-transform → otel-logs.transport]. */
|
|
55
58
|
function otelPipeline(delivery: Delivery): Delivery | undefined {
|
|
56
59
|
return delivery.transport?.targets?.find((t: Delivery) =>
|
|
57
|
-
t.pipeline?.some(
|
|
58
|
-
(s: Delivery) => s.target === 'pino-opentelemetry-transport',
|
|
59
|
-
),
|
|
60
|
+
t.pipeline?.some(isOtelStage),
|
|
60
61
|
);
|
|
61
62
|
}
|
|
62
63
|
|
|
63
64
|
/** Стейдж OTEL-экспортёра внутри pipeline. */
|
|
64
65
|
function otelStage(delivery: Delivery): Delivery | undefined {
|
|
65
|
-
return otelPipeline(delivery)?.pipeline?.find(
|
|
66
|
-
(s: Delivery) => s.target === 'pino-opentelemetry-transport',
|
|
67
|
-
);
|
|
66
|
+
return otelPipeline(delivery)?.pipeline?.find(isOtelStage);
|
|
68
67
|
}
|
|
69
68
|
|
|
70
69
|
describe('LoggerInitializingModule — выбор доставки', () => {
|
|
@@ -130,7 +129,7 @@ describe('LoggerInitializingModule — выбор доставки', () => {
|
|
|
130
129
|
|
|
131
130
|
expect(pipeline).toHaveLength(2);
|
|
132
131
|
expect(pipeline[0].target).toMatch(/otel-time\.transform\.js$/);
|
|
133
|
-
expect(pipeline[1].target).
|
|
132
|
+
expect(pipeline[1].target).toMatch(/otel-logs\.transport\.js$/);
|
|
134
133
|
});
|
|
135
134
|
|
|
136
135
|
it('httpEndpoint задан → transport (stdout + http)', () => {
|
|
@@ -12,10 +12,11 @@ import pino, {
|
|
|
12
12
|
import { LoggingConfig } from './logging.config';
|
|
13
13
|
|
|
14
14
|
/**
|
|
15
|
-
*
|
|
15
|
+
* Абсолютные пути к скомпилированным шагам OTEL-pipeline (рядом в dist).
|
|
16
16
|
* Воркер pino грузит таргет по пути, поэтому ссылаемся на .js, а не на модуль.
|
|
17
17
|
*/
|
|
18
18
|
const OTEL_TIME_TRANSFORM = path.join(__dirname, 'otel-time.transform.js');
|
|
19
|
+
const OTEL_LOGS_TRANSPORT = path.join(__dirname, 'otel-logs.transport.js');
|
|
19
20
|
|
|
20
21
|
@Module({})
|
|
21
22
|
export class LoggerInitializingModule implements OnApplicationShutdown {
|
|
@@ -138,7 +139,7 @@ export class LoggerInitializingModule implements OnApplicationShutdown {
|
|
|
138
139
|
level: config.level,
|
|
139
140
|
pipeline: [
|
|
140
141
|
{ target: OTEL_TIME_TRANSFORM },
|
|
141
|
-
{ target:
|
|
142
|
+
{ target: OTEL_LOGS_TRANSPORT, options },
|
|
142
143
|
],
|
|
143
144
|
};
|
|
144
145
|
}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { once } from 'node:events';
|
|
2
|
+
import { Writable } from 'node:stream';
|
|
3
|
+
import createOtelTransport from 'pino-opentelemetry-transport';
|
|
4
|
+
|
|
5
|
+
import buildOtelLogsTransport from './otel-logs.transport';
|
|
6
|
+
|
|
7
|
+
jest.mock('pino-opentelemetry-transport', () => jest.fn());
|
|
8
|
+
|
|
9
|
+
const options = { loggerName: 'app', serviceVersion: '1.0.0' };
|
|
10
|
+
const noop = (): void => {};
|
|
11
|
+
|
|
12
|
+
/** Транспорт, который закрывается, только когда тест вызовет release. */
|
|
13
|
+
function fakeTransport(): {
|
|
14
|
+
stream: Writable;
|
|
15
|
+
written: string[];
|
|
16
|
+
release: () => void;
|
|
17
|
+
} {
|
|
18
|
+
const written: string[] = [];
|
|
19
|
+
let release = noop;
|
|
20
|
+
|
|
21
|
+
const stream = new Writable({
|
|
22
|
+
write(chunk: Buffer, _encoding, callback): void {
|
|
23
|
+
written.push(chunk.toString());
|
|
24
|
+
callback();
|
|
25
|
+
},
|
|
26
|
+
final(callback): void {
|
|
27
|
+
release = (): void => callback();
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
return { stream, written, release: () => release() };
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
describe('otel-logs.transport', () => {
|
|
35
|
+
it('передает опции в pino-opentelemetry-transport', async () => {
|
|
36
|
+
const fake = fakeTransport();
|
|
37
|
+
|
|
38
|
+
jest.mocked(createOtelTransport).mockResolvedValue(fake.stream as any);
|
|
39
|
+
await buildOtelLogsTransport(options);
|
|
40
|
+
|
|
41
|
+
expect(createOtelTransport).toHaveBeenCalledWith(options);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it('завершается только после close транспорта', async () => {
|
|
45
|
+
const fake = fakeTransport();
|
|
46
|
+
|
|
47
|
+
jest.mocked(createOtelTransport).mockResolvedValue(fake.stream as any);
|
|
48
|
+
|
|
49
|
+
const stream = await buildOtelLogsTransport(options);
|
|
50
|
+
const finished = jest.fn();
|
|
51
|
+
|
|
52
|
+
stream.on('finish', finished);
|
|
53
|
+
stream.end('{"msg":"x"}\n');
|
|
54
|
+
await new Promise(setImmediate);
|
|
55
|
+
|
|
56
|
+
expect(fake.written).toEqual(['{"msg":"x"}\n']);
|
|
57
|
+
expect(finished).not.toHaveBeenCalled();
|
|
58
|
+
|
|
59
|
+
fake.release();
|
|
60
|
+
await once(stream, 'finish');
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('пробрасывает ошибку транспорта', async () => {
|
|
64
|
+
const fake = fakeTransport();
|
|
65
|
+
|
|
66
|
+
jest.mocked(createOtelTransport).mockResolvedValue(fake.stream as any);
|
|
67
|
+
|
|
68
|
+
const stream = await buildOtelLogsTransport(options);
|
|
69
|
+
const error = new Error('export failed');
|
|
70
|
+
|
|
71
|
+
fake.stream.destroy(error);
|
|
72
|
+
const [received] = await once(stream, 'error');
|
|
73
|
+
|
|
74
|
+
expect(received).toBe(error);
|
|
75
|
+
});
|
|
76
|
+
});
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { Writable } from 'node:stream';
|
|
2
|
+
import createOtelTransport from 'pino-opentelemetry-transport';
|
|
3
|
+
|
|
4
|
+
type OtelTransportOptions = Parameters<typeof createOtelTransport>[0];
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Последний шаг OTEL-pipeline вместо pino-opentelemetry-transport. pino
|
|
8
|
+
* считает pipeline закрытым по 'finish' последнего шага, а транспорт
|
|
9
|
+
* отправляет последний батч позже, в асинхронном close. thread-stream по
|
|
10
|
+
* закрытию pipeline сразу завершает воркер, и логи перед остановкой
|
|
11
|
+
* терялись. Обертка завершается только после 'close' транспорта.
|
|
12
|
+
*/
|
|
13
|
+
export default async function buildOtelLogsTransport(
|
|
14
|
+
options: OtelTransportOptions,
|
|
15
|
+
): Promise<Writable> {
|
|
16
|
+
const transport = await createOtelTransport(options);
|
|
17
|
+
|
|
18
|
+
const stream = new Writable({
|
|
19
|
+
write(chunk: Buffer, _encoding, callback): void {
|
|
20
|
+
if (transport.write(chunk)) {
|
|
21
|
+
callback();
|
|
22
|
+
} else {
|
|
23
|
+
transport.once('drain', () => callback());
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
final(callback): void {
|
|
27
|
+
if (transport.closed) {
|
|
28
|
+
callback();
|
|
29
|
+
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
transport.once('close', () => callback());
|
|
34
|
+
transport.end();
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
transport.on('error', (error) => stream.destroy(error));
|
|
39
|
+
|
|
40
|
+
return stream;
|
|
41
|
+
}
|