@rsdk/core 6.0.0-next.29 → 6.0.0-next.30
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/index.d.ts +2 -0
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/tracing/extract-tracing-headers.d.ts +9 -0
- package/dist/tracing/extract-tracing-headers.js +22 -0
- package/dist/tracing/extract-tracing-headers.js.map +1 -0
- package/dist/tracing/tracing.enricher.d.ts +15 -0
- package/dist/tracing/tracing.enricher.js +42 -0
- package/dist/tracing/tracing.enricher.js.map +1 -0
- package/dist/tracing/tracing.interceptor.js +2 -11
- package/dist/tracing/tracing.interceptor.js.map +1 -1
- package/dist/tracing/tracing.module.d.ts +5 -0
- package/dist/tracing/tracing.module.js +24 -0
- package/dist/tracing/tracing.module.js.map +1 -1
- package/dist/types/plugins.d.ts +6 -0
- package/dist/types/plugins.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +3 -0
- package/src/tracing/extract-tracing-headers.ts +27 -0
- package/src/tracing/tracing.enricher.ts +28 -0
- package/src/tracing/tracing.interceptor.ts +2 -14
- package/src/tracing/tracing.module.ts +30 -0
- package/src/types/plugins.ts +7 -0
package/dist/index.d.ts
CHANGED
|
@@ -3,6 +3,8 @@ export { APP_SCOPE } from './app-metadata/app-metadata.const';
|
|
|
3
3
|
export { Manifest } from './manifest/manifest';
|
|
4
4
|
export { ProtocolDetector } from './transport/protocol.detector';
|
|
5
5
|
export { TracingHeaderMappings, Span, NoSpan } from './tracing';
|
|
6
|
+
export { IngressContext, CONTEXT_ENRICHERS } from '@rsdk/actx';
|
|
7
|
+
export type { ContextEnricher, ContextCarrier } from '@rsdk/actx';
|
|
6
8
|
export { FileSystemCheckOptions, FileSystemIndicator, PingCheckOptions, PingIndicator, } from './health/indicators.abstract';
|
|
7
9
|
export { HealthChecksService } from './health/health.service';
|
|
8
10
|
export { CheckSummary } from './health/types';
|
package/dist/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.FsPathParser = exports.TimespanParser = exports.UrlParser = exports.StringParser = exports.SizeParser = exports.NumberParser = exports.JsonParser = exports.IntParser = exports.EnumParser = exports.BoolParser = exports.ArrayParser = exports.TracingHeaders = exports.RequestIdGenStrategy = exports.generateDefault = exports.withPrefix = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.LogLevel = exports.InjectLogger = exports.ExceptionsSeverityToLogLevel = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.NoSpan = exports.Span = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
|
|
17
|
+
exports.FsPathParser = exports.TimespanParser = exports.UrlParser = exports.StringParser = exports.SizeParser = exports.NumberParser = exports.JsonParser = exports.IntParser = exports.EnumParser = exports.BoolParser = exports.ArrayParser = exports.TracingHeaders = exports.RequestIdGenStrategy = exports.generateDefault = exports.withPrefix = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.LogLevel = exports.InjectLogger = exports.ExceptionsSeverityToLogLevel = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.CONTEXT_ENRICHERS = exports.IngressContext = exports.NoSpan = exports.Span = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
|
|
18
18
|
require("./unhandled-rejection.handler");
|
|
19
19
|
var app_metadata_const_1 = require("./app-metadata/app-metadata.const");
|
|
20
20
|
Object.defineProperty(exports, "APP_SCOPE", { enumerable: true, get: function () { return app_metadata_const_1.APP_SCOPE; } });
|
|
@@ -25,6 +25,9 @@ Object.defineProperty(exports, "ProtocolDetector", { enumerable: true, get: func
|
|
|
25
25
|
var tracing_1 = require("./tracing");
|
|
26
26
|
Object.defineProperty(exports, "Span", { enumerable: true, get: function () { return tracing_1.Span; } });
|
|
27
27
|
Object.defineProperty(exports, "NoSpan", { enumerable: true, get: function () { return tracing_1.NoSpan; } });
|
|
28
|
+
var actx_1 = require("@rsdk/actx");
|
|
29
|
+
Object.defineProperty(exports, "IngressContext", { enumerable: true, get: function () { return actx_1.IngressContext; } });
|
|
30
|
+
Object.defineProperty(exports, "CONTEXT_ENRICHERS", { enumerable: true, get: function () { return actx_1.CONTEXT_ENRICHERS; } });
|
|
28
31
|
var indicators_abstract_1 = require("./health/indicators.abstract");
|
|
29
32
|
Object.defineProperty(exports, "FileSystemIndicator", { enumerable: true, get: function () { return indicators_abstract_1.FileSystemIndicator; } });
|
|
30
33
|
Object.defineProperty(exports, "PingIndicator", { enumerable: true, get: function () { return indicators_abstract_1.PingIndicator; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,qCAAgE;AAAhC,+FAAA,IAAI,OAAA;AAAE,iGAAA,MAAM,OAAA;AAE5C,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAKmB;AAJjB,uHAAA,4BAA4B,OAAA;AAC5B,uGAAA,YAAY,OAAA;AAEZ,mGAAA,QAAQ,OAAA;AAGV,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAElD,qCAKmB;AAJjB,qGAAA,UAAU,OAAA;AACV,0GAAA,eAAe,OAAA;AACf,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AAGhB;;GAEG;AAEH,uCAkCsB;AAjCpB,6CAA6C;AAC7C,mDAAmD;AACnD,qGAAA,WAAW,OAAA;AAEX,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAKZ,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAEZ,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,wGAAA,cAAc,OAAA;AAGhB,iDAI2B;AAHzB,2DAA2D;AAC3D,wDAAwD;AACxD,2GAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,qCAAgE;AAAhC,+FAAA,IAAI,OAAA;AAAE,iGAAA,MAAM,OAAA;AAE5C,mCAA+D;AAAtD,sGAAA,cAAc,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAG1C,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAKmB;AAJjB,uHAAA,4BAA4B,OAAA;AAC5B,uGAAA,YAAY,OAAA;AAEZ,mGAAA,QAAQ,OAAA;AAGV,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAElD,qCAKmB;AAJjB,qGAAA,UAAU,OAAA;AACV,0GAAA,eAAe,OAAA;AACf,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AAGhB;;GAEG;AAEH,uCAkCsB;AAjCpB,6CAA6C;AAC7C,mDAAmD;AACnD,qGAAA,WAAW,OAAA;AAEX,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAKZ,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAEZ,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,wGAAA,cAAc,OAAA;AAGhB,iDAI2B;AAHzB,2DAA2D;AAC3D,wDAAwD;AACxD,2GAAA,YAAY,OAAA"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { GenericHeaders } from '../types';
|
|
2
|
+
import type { TracingHeaderMappings } from './types';
|
|
3
|
+
/**
|
|
4
|
+
* Отбирает из заголовков транспорта только трассируемые, согласно
|
|
5
|
+
* сконфигурированным маппингам. Для каждого маппинга берётся первое
|
|
6
|
+
* непустое значение среди его алиасов и кладётся под канонический ключ
|
|
7
|
+
* (первый алиас).
|
|
8
|
+
*/
|
|
9
|
+
export declare const extractTracingHeaders: (headers: GenericHeaders, mappings: TracingHeaderMappings[]) => Record<string, string>;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.extractTracingHeaders = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Отбирает из заголовков транспорта только трассируемые, согласно
|
|
6
|
+
* сконфигурированным маппингам. Для каждого маппинга берётся первое
|
|
7
|
+
* непустое значение среди его алиасов и кладётся под канонический ключ
|
|
8
|
+
* (первый алиас).
|
|
9
|
+
*/
|
|
10
|
+
const extractTracingHeaders = (headers, mappings) => {
|
|
11
|
+
const result = {};
|
|
12
|
+
for (const aliases of mappings) {
|
|
13
|
+
const key = aliases[0];
|
|
14
|
+
const value = aliases.map((alias) => headers.get(alias)).find((x) => x);
|
|
15
|
+
if (value) {
|
|
16
|
+
result[key] = value;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
exports.extractTracingHeaders = extractTracingHeaders;
|
|
22
|
+
//# sourceMappingURL=extract-tracing-headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extract-tracing-headers.js","sourceRoot":"","sources":["../../src/tracing/extract-tracing-headers.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,OAAuB,EACvB,QAAiC,EACT,EAAE;IAC1B,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAExE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ContextEnricher } from '@rsdk/actx';
|
|
2
|
+
import type { GenericHeaders } from '../types';
|
|
3
|
+
import type { TracingHeaderMappings } from './types';
|
|
4
|
+
/**
|
|
5
|
+
* Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
|
|
6
|
+
* по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
|
|
7
|
+
* чтобы инструментация логгера подмешала их во все сообщения.
|
|
8
|
+
*
|
|
9
|
+
* Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
|
|
10
|
+
*/
|
|
11
|
+
export declare class TracingEnricher implements ContextEnricher {
|
|
12
|
+
private readonly mappings;
|
|
13
|
+
constructor(mappings: TracingHeaderMappings[]);
|
|
14
|
+
enrich(carrier: GenericHeaders): void;
|
|
15
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.TracingEnricher = void 0;
|
|
16
|
+
const common_1 = require("@nestjs/common");
|
|
17
|
+
const constants_1 = require("./constants");
|
|
18
|
+
const extract_tracing_headers_1 = require("./extract-tracing-headers");
|
|
19
|
+
const tracing_actx_1 = require("./tracing.actx");
|
|
20
|
+
/**
|
|
21
|
+
* Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
|
|
22
|
+
* по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
|
|
23
|
+
* чтобы инструментация логгера подмешала их во все сообщения.
|
|
24
|
+
*
|
|
25
|
+
* Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
|
|
26
|
+
*/
|
|
27
|
+
let TracingEnricher = class TracingEnricher {
|
|
28
|
+
mappings;
|
|
29
|
+
constructor(mappings) {
|
|
30
|
+
this.mappings = mappings;
|
|
31
|
+
}
|
|
32
|
+
enrich(carrier) {
|
|
33
|
+
tracing_actx_1.TracingHeaders.set((0, extract_tracing_headers_1.extractTracingHeaders)(carrier, this.mappings));
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
exports.TracingEnricher = TracingEnricher;
|
|
37
|
+
exports.TracingEnricher = TracingEnricher = __decorate([
|
|
38
|
+
(0, common_1.Injectable)(),
|
|
39
|
+
__param(0, (0, common_1.Inject)(constants_1.HEADER_MAPPINGS)),
|
|
40
|
+
__metadata("design:paramtypes", [Array])
|
|
41
|
+
], TracingEnricher);
|
|
42
|
+
//# sourceMappingURL=tracing.enricher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tracing.enricher.js","sourceRoot":"","sources":["../../src/tracing/tracing.enricher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAKpD,2CAA8C;AAC9C,uEAAkE;AAClE,iDAAgD;AAGhD;;;;;;GAMG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAGP;IAFnB,YAEmB,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IACjD,CAAC;IAEJ,MAAM,CAAC,OAAuB;QAC5B,6BAAc,CAAC,GAAG,CAAC,IAAA,+CAAqB,EAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AATY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,2BAAe,CAAC,CAAA;;GAFf,eAAe,CAS3B"}
|
|
@@ -18,6 +18,7 @@ const exceptions_1 = require("../exceptions");
|
|
|
18
18
|
const logging_1 = require("../logging");
|
|
19
19
|
const protocol_detector_1 = require("../transport/protocol.detector");
|
|
20
20
|
const constants_1 = require("./constants");
|
|
21
|
+
const extract_tracing_headers_1 = require("./extract-tracing-headers");
|
|
21
22
|
const request_id_1 = require("./request-id");
|
|
22
23
|
const tracing_actx_1 = require("./tracing.actx");
|
|
23
24
|
const tracing_config_1 = require("./tracing.config");
|
|
@@ -54,17 +55,7 @@ let TracingInterceptor = class TracingInterceptor {
|
|
|
54
55
|
return next.handle();
|
|
55
56
|
}
|
|
56
57
|
extractHeaders(ctx, extractor) {
|
|
57
|
-
|
|
58
|
-
for (const aliases of this.mappings) {
|
|
59
|
-
const key = aliases[0];
|
|
60
|
-
const value = aliases
|
|
61
|
-
.map((x) => extractor.extractHeaders(ctx).get(x))
|
|
62
|
-
.find((x) => x);
|
|
63
|
-
if (value) {
|
|
64
|
-
headers[key] = value;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
return headers;
|
|
58
|
+
return (0, extract_tracing_headers_1.extractTracingHeaders)(extractor.extractHeaders(ctx), this.mappings);
|
|
68
59
|
}
|
|
69
60
|
generateRequestId(ctx, protocol) {
|
|
70
61
|
const generate = (0, request_id_1.getStrategy)(ctx.getClass()) ?? request_id_1.generateDefault;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAAoD;AAGpD,8CAAkD;AAClD,wCAAmD;AACnD,sEAAkE;AAGlE,2CAAiE;AACjE,6CAA4D;AAC5D,iDAAgD;AAChD,qDAAiD;AAGjD;;;GAGG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAGe;IACT;IACW;IAC3B;IACA;IANnB,YAE4C,MAAe,EACxB,QAAiC,EACtB,UAA2C,EACtE,QAA0B,EAC1B,MAAqB;QAJI,WAAM,GAAN,MAAM,CAAS;QACxB,aAAQ,GAAR,QAAQ,CAAyB;QACtB,eAAU,GAAV,UAAU,CAAiC;QACtE,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,WAAM,GAAN,MAAM,CAAe;IAErC,CAAC;IAEJ,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,8BAAiB,CACzB,sCAAsC,QAAQ,EAAE,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEpD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;YACzD,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9D,6BAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc,CACpB,GAAqB,EACrB,SAA6B;QAE7B,
|
|
1
|
+
{"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAAoD;AAGpD,8CAAkD;AAClD,wCAAmD;AACnD,sEAAkE;AAGlE,2CAAiE;AACjE,uEAAkE;AAClE,6CAA4D;AAC5D,iDAAgD;AAChD,qDAAiD;AAGjD;;;GAGG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAGe;IACT;IACW;IAC3B;IACA;IANnB,YAE4C,MAAe,EACxB,QAAiC,EACtB,UAA2C,EACtE,QAA0B,EAC1B,MAAqB;QAJI,WAAM,GAAN,MAAM,CAAS;QACxB,aAAQ,GAAR,QAAQ,CAAyB;QACtB,eAAU,GAAV,UAAU,CAAiC;QACtE,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,WAAM,GAAN,MAAM,CAAe;IAErC,CAAC;IAEJ,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,8BAAiB,CACzB,sCAAsC,QAAQ,EAAE,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEpD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;YACzD,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9D,6BAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc,CACpB,GAAqB,EACrB,SAA6B;QAE7B,OAAO,IAAA,+CAAqB,EAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAEO,iBAAiB,CAAC,GAAqB,EAAE,QAAgB;QAC/D,MAAM,QAAQ,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,4BAAe,CAAC;QAEhE,OAAO,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AA/CY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,sBAAY,EAAC,kBAAkB,CAAC,CAAA;IAChC,WAAA,IAAA,eAAM,EAAC,2BAAe,CAAC,CAAA;IACvB,WAAA,IAAA,eAAM,EAAC,6BAAiB,CAAC,CAAA;oDAA8B,GAAG;QAChC,oCAAgB;QAClB,8BAAa;GAP7B,kBAAkB,CA+C9B"}
|
|
@@ -11,6 +11,11 @@ export declare class TracingModule implements OnModuleInit {
|
|
|
11
11
|
private context;
|
|
12
12
|
constructor(logger: ILogger);
|
|
13
13
|
static forRoot({ tracing, plugins, transports, }: PlatformOptions): DynamicModule;
|
|
14
|
+
/**
|
|
15
|
+
* Собирает список `ContextEnricher` для `IngressContext`: встроенный
|
|
16
|
+
* трейсинг + обогатители из плагинов.
|
|
17
|
+
*/
|
|
18
|
+
private static createContextEnrichersProvider;
|
|
14
19
|
/**
|
|
15
20
|
* Creates a provider for header mappings configuration.
|
|
16
21
|
* Combines default headers, plugin-provided headers and additional custom mappings
|
|
@@ -49,12 +49,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
49
49
|
exports.TracingModule = void 0;
|
|
50
50
|
const common_1 = require("@nestjs/common");
|
|
51
51
|
const core_1 = require("@nestjs/core");
|
|
52
|
+
const actx_1 = require("@rsdk/actx");
|
|
52
53
|
const common_2 = require("@rsdk/common");
|
|
53
54
|
const logging_1 = require("@rsdk/logging");
|
|
54
55
|
const logging_2 = require("../logging");
|
|
55
56
|
const constants_1 = require("./constants");
|
|
56
57
|
const tracing_actx_1 = require("./tracing.actx");
|
|
57
58
|
const tracing_config_1 = require("./tracing.config");
|
|
59
|
+
const tracing_enricher_1 = require("./tracing.enricher");
|
|
58
60
|
const tracing_interceptor_1 = require("./tracing.interceptor");
|
|
59
61
|
let TracingModule = TracingModule_1 = class TracingModule {
|
|
60
62
|
logger;
|
|
@@ -71,6 +73,28 @@ let TracingModule = TracingModule_1 = class TracingModule {
|
|
|
71
73
|
{ provide: core_1.APP_INTERCEPTOR, useClass: tracing_interceptor_1.TracingInterceptor },
|
|
72
74
|
this.createHeaderExtractorsProvider(transports, plugins),
|
|
73
75
|
this.createHeaderMappingsProvider(tracing, plugins),
|
|
76
|
+
tracing_enricher_1.TracingEnricher,
|
|
77
|
+
this.createContextEnrichersProvider(plugins),
|
|
78
|
+
actx_1.IngressContext,
|
|
79
|
+
],
|
|
80
|
+
exports: [actx_1.IngressContext],
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Собирает список `ContextEnricher` для `IngressContext`: встроенный
|
|
85
|
+
* трейсинг + обогатители из плагинов.
|
|
86
|
+
*/
|
|
87
|
+
static createContextEnrichersProvider(plugins) {
|
|
88
|
+
const fromPlugins = [];
|
|
89
|
+
for (const plugin of plugins ?? []) {
|
|
90
|
+
fromPlugins.push(...(plugin.contextEnrichers?.() ?? []));
|
|
91
|
+
}
|
|
92
|
+
return {
|
|
93
|
+
provide: actx_1.CONTEXT_ENRICHERS,
|
|
94
|
+
inject: [tracing_enricher_1.TracingEnricher],
|
|
95
|
+
useFactory: (tracing) => [
|
|
96
|
+
tracing,
|
|
97
|
+
...fromPlugins,
|
|
74
98
|
],
|
|
75
99
|
};
|
|
76
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,2CAAwC;AACxC,uCAA+C;
|
|
1
|
+
{"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}
|
package/dist/types/plugins.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { DynamicModule, MiddlewareConsumer } from '@nestjs/common';
|
|
2
|
+
import type { ContextEnricher } from '@rsdk/actx';
|
|
2
3
|
import type { Constructor } from '@rsdk/common';
|
|
3
4
|
import type { ResourceExtractor } from '@rsdk/metadata';
|
|
4
5
|
import type { TracingHeaderMappings } from '../tracing';
|
|
@@ -52,4 +53,9 @@ export interface PlatformAppPlugin<T extends AppropriateTransports = Appropriate
|
|
|
52
53
|
* Additional header mappings
|
|
53
54
|
*/
|
|
54
55
|
additionalTracingHeaders?(): TracingHeaderMappings[];
|
|
56
|
+
/**
|
|
57
|
+
* Additional context enrichers applied at non-NestJS ingress points
|
|
58
|
+
* (pull consumers, queues, redis/postgres, cron) via `IngressContext`.
|
|
59
|
+
*/
|
|
60
|
+
contextEnrichers?(): ContextEnricher[];
|
|
55
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/types/plugins.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/types/plugins.ts"],"names":[],"mappings":";;;AAkBO,MAAM,sBAAsB,GAAG,CACpC,CAAoB,EACyB,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC;AAFjE,QAAA,sBAAsB,0BAE2C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "6.0.0-next.
|
|
3
|
+
"version": "6.0.0-next.30",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"optional": true
|
|
51
51
|
}
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "b3508ef34ae639383ce55056f597f2783303bd9f"
|
|
54
54
|
}
|
package/src/index.ts
CHANGED
|
@@ -8,6 +8,9 @@ export { ProtocolDetector } from './transport/protocol.detector';
|
|
|
8
8
|
|
|
9
9
|
export { TracingHeaderMappings, Span, NoSpan } from './tracing';
|
|
10
10
|
|
|
11
|
+
export { IngressContext, CONTEXT_ENRICHERS } from '@rsdk/actx';
|
|
12
|
+
export type { ContextEnricher, ContextCarrier } from '@rsdk/actx';
|
|
13
|
+
|
|
11
14
|
export {
|
|
12
15
|
FileSystemCheckOptions,
|
|
13
16
|
FileSystemIndicator,
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { GenericHeaders } from '../types';
|
|
2
|
+
|
|
3
|
+
import type { TracingHeaderMappings } from './types';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Отбирает из заголовков транспорта только трассируемые, согласно
|
|
7
|
+
* сконфигурированным маппингам. Для каждого маппинга берётся первое
|
|
8
|
+
* непустое значение среди его алиасов и кладётся под канонический ключ
|
|
9
|
+
* (первый алиас).
|
|
10
|
+
*/
|
|
11
|
+
export const extractTracingHeaders = (
|
|
12
|
+
headers: GenericHeaders,
|
|
13
|
+
mappings: TracingHeaderMappings[],
|
|
14
|
+
): Record<string, string> => {
|
|
15
|
+
const result: Record<string, string> = {};
|
|
16
|
+
|
|
17
|
+
for (const aliases of mappings) {
|
|
18
|
+
const key = aliases[0];
|
|
19
|
+
const value = aliases.map((alias) => headers.get(alias)).find((x) => x);
|
|
20
|
+
|
|
21
|
+
if (value) {
|
|
22
|
+
result[key] = value;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
return result;
|
|
27
|
+
};
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Inject, Injectable } from '@nestjs/common';
|
|
2
|
+
import type { ContextEnricher } from '@rsdk/actx';
|
|
3
|
+
|
|
4
|
+
import type { GenericHeaders } from '../types';
|
|
5
|
+
|
|
6
|
+
import { HEADER_MAPPINGS } from './constants';
|
|
7
|
+
import { extractTracingHeaders } from './extract-tracing-headers';
|
|
8
|
+
import { TracingHeaders } from './tracing.actx';
|
|
9
|
+
import type { TracingHeaderMappings } from './types';
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
|
|
13
|
+
* по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
|
|
14
|
+
* чтобы инструментация логгера подмешала их во все сообщения.
|
|
15
|
+
*
|
|
16
|
+
* Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
|
|
17
|
+
*/
|
|
18
|
+
@Injectable()
|
|
19
|
+
export class TracingEnricher implements ContextEnricher {
|
|
20
|
+
constructor(
|
|
21
|
+
@Inject(HEADER_MAPPINGS)
|
|
22
|
+
private readonly mappings: TracingHeaderMappings[],
|
|
23
|
+
) {}
|
|
24
|
+
|
|
25
|
+
enrich(carrier: GenericHeaders): void {
|
|
26
|
+
TracingHeaders.set(extractTracingHeaders(carrier, this.mappings));
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -12,6 +12,7 @@ import { ProtocolDetector } from '../transport/protocol.detector';
|
|
|
12
12
|
import type { WithGenericHeaders } from '../types';
|
|
13
13
|
|
|
14
14
|
import { HEADER_EXTRACTORS, HEADER_MAPPINGS } from './constants';
|
|
15
|
+
import { extractTracingHeaders } from './extract-tracing-headers';
|
|
15
16
|
import { generateDefault, getStrategy } from './request-id';
|
|
16
17
|
import { TracingHeaders } from './tracing.actx';
|
|
17
18
|
import { TracingConfig } from './tracing.config';
|
|
@@ -61,20 +62,7 @@ export class TracingInterceptor implements NestInterceptor {
|
|
|
61
62
|
ctx: ExecutionContext,
|
|
62
63
|
extractor: WithGenericHeaders,
|
|
63
64
|
): Record<string, string> {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
for (const aliases of this.mappings) {
|
|
67
|
-
const key = aliases[0];
|
|
68
|
-
const value = aliases
|
|
69
|
-
.map((x) => extractor.extractHeaders(ctx).get(x))
|
|
70
|
-
.find((x) => x);
|
|
71
|
-
|
|
72
|
-
if (value) {
|
|
73
|
-
headers[key] = value;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
return headers;
|
|
65
|
+
return extractTracingHeaders(extractor.extractHeaders(ctx), this.mappings);
|
|
78
66
|
}
|
|
79
67
|
|
|
80
68
|
private generateRequestId(ctx: ExecutionContext, protocol: string): string {
|
|
@@ -7,6 +7,8 @@ import type {
|
|
|
7
7
|
import { Module } from '@nestjs/common';
|
|
8
8
|
import { APP_INTERCEPTOR } from '@nestjs/core';
|
|
9
9
|
import type { ContextAPI, TraceAPI } from '@opentelemetry/api';
|
|
10
|
+
import type { ContextEnricher } from '@rsdk/actx';
|
|
11
|
+
import { CONTEXT_ENRICHERS, IngressContext } from '@rsdk/actx';
|
|
10
12
|
import { text } from '@rsdk/common';
|
|
11
13
|
import { ILogger, LoggerFactory } from '@rsdk/logging';
|
|
12
14
|
|
|
@@ -20,6 +22,7 @@ import {
|
|
|
20
22
|
} from './constants';
|
|
21
23
|
import { TracingHeaders } from './tracing.actx';
|
|
22
24
|
import { TracingConfig } from './tracing.config';
|
|
25
|
+
import { TracingEnricher } from './tracing.enricher';
|
|
23
26
|
import { TracingInterceptor } from './tracing.interceptor';
|
|
24
27
|
import type { TracingHeaderMappings } from './types';
|
|
25
28
|
|
|
@@ -46,6 +49,33 @@ export class TracingModule implements OnModuleInit {
|
|
|
46
49
|
{ provide: APP_INTERCEPTOR, useClass: TracingInterceptor },
|
|
47
50
|
this.createHeaderExtractorsProvider(transports, plugins),
|
|
48
51
|
this.createHeaderMappingsProvider(tracing, plugins),
|
|
52
|
+
TracingEnricher,
|
|
53
|
+
this.createContextEnrichersProvider(plugins),
|
|
54
|
+
IngressContext,
|
|
55
|
+
],
|
|
56
|
+
exports: [IngressContext],
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Собирает список `ContextEnricher` для `IngressContext`: встроенный
|
|
62
|
+
* трейсинг + обогатители из плагинов.
|
|
63
|
+
*/
|
|
64
|
+
private static createContextEnrichersProvider(
|
|
65
|
+
plugins: PlatformOptions['plugins'],
|
|
66
|
+
): FactoryProvider {
|
|
67
|
+
const fromPlugins: ContextEnricher[] = [];
|
|
68
|
+
|
|
69
|
+
for (const plugin of plugins ?? []) {
|
|
70
|
+
fromPlugins.push(...(plugin.contextEnrichers?.() ?? []));
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return {
|
|
74
|
+
provide: CONTEXT_ENRICHERS,
|
|
75
|
+
inject: [TracingEnricher],
|
|
76
|
+
useFactory: (tracing: TracingEnricher): ContextEnricher[] => [
|
|
77
|
+
tracing,
|
|
78
|
+
...fromPlugins,
|
|
49
79
|
],
|
|
50
80
|
};
|
|
51
81
|
}
|
package/src/types/plugins.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { DynamicModule, MiddlewareConsumer } from '@nestjs/common';
|
|
2
|
+
import type { ContextEnricher } from '@rsdk/actx';
|
|
2
3
|
import type { Constructor } from '@rsdk/common';
|
|
3
4
|
import type { ResourceExtractor } from '@rsdk/metadata';
|
|
4
5
|
|
|
@@ -75,4 +76,10 @@ export interface PlatformAppPlugin<
|
|
|
75
76
|
* Additional header mappings
|
|
76
77
|
*/
|
|
77
78
|
additionalTracingHeaders?(): TracingHeaderMappings[];
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Additional context enrichers applied at non-NestJS ingress points
|
|
82
|
+
* (pull consumers, queues, redis/postgres, cron) via `IngressContext`.
|
|
83
|
+
*/
|
|
84
|
+
contextEnrichers?(): ContextEnricher[];
|
|
78
85
|
}
|