@rsdk/core 4.2.0-next.0 → 4.2.0-next.1
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 +6 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/platform.module.js +6 -1
- package/dist/platform.module.js.map +1 -1
- package/dist/tracing/auto-instrumentations.config.js +2 -3
- package/dist/tracing/auto-instrumentations.config.js.map +1 -1
- package/dist/tracing/grpc.headers.d.ts +11 -0
- package/dist/tracing/grpc.headers.js +24 -0
- package/dist/tracing/grpc.headers.js.map +1 -0
- package/dist/tracing/http.headers.d.ts +11 -0
- package/dist/tracing/http.headers.js +22 -0
- package/dist/tracing/http.headers.js.map +1 -0
- package/dist/tracing/index.d.ts +0 -1
- package/dist/tracing/index.js +0 -1
- package/dist/tracing/index.js.map +1 -1
- package/dist/tracing/open-telemetry.interceptor.d.ts +5 -0
- package/dist/tracing/open-telemetry.interceptor.js +83 -0
- package/dist/tracing/open-telemetry.interceptor.js.map +1 -0
- package/dist/tracing/request-metadata.module.js +1 -5
- package/dist/tracing/request-metadata.module.js.map +1 -1
- package/dist/tracing/services/instrumentation.service.d.ts +0 -1
- package/dist/tracing/services/instrumentation.service.js +0 -7
- package/dist/tracing/services/instrumentation.service.js.map +1 -1
- package/dist/tracing/services/request-id.provider.d.ts +11 -0
- package/dist/tracing/services/request-id.provider.js +13 -0
- package/dist/tracing/services/request-id.provider.js.map +1 -0
- package/dist/tracing/services/trace.injector.d.ts +4 -4
- package/dist/tracing/services/trace.injector.js +1 -132
- package/dist/tracing/services/trace.injector.js.map +1 -1
- package/dist/tracing/tracing.interceptor.d.ts +6 -5
- package/dist/tracing/tracing.interceptor.js +92 -7
- package/dist/tracing/tracing.interceptor.js.map +1 -1
- package/dist/tracing/tracing.module.d.ts +2 -2
- package/dist/tracing/tracing.module.js +8 -9
- package/dist/tracing/tracing.module.js.map +1 -1
- package/package.json +11 -10
- package/src/index.ts +1 -3
- package/src/platform.module.ts +7 -1
- package/src/tracing/auto-instrumentations.config.ts +2 -3
- package/src/tracing/grpc.headers.ts +29 -0
- package/src/tracing/http.headers.ts +32 -0
- package/src/tracing/index.ts +0 -1
- package/src/tracing/open-telemetry.interceptor.ts +114 -0
- package/src/tracing/request-metadata.module.ts +1 -6
- package/src/tracing/services/instrumentation.service.ts +0 -11
- package/src/tracing/services/request-id.provider.ts +21 -0
- package/src/tracing/services/trace.injector.ts +4 -170
- package/src/tracing/tracing.interceptor.ts +131 -5
- package/src/tracing/tracing.module.ts +10 -12
- package/dist/tracing/services/request-metadata.injector.d.ts +0 -6
- package/dist/tracing/services/request-metadata.injector.js +0 -123
- package/dist/tracing/services/request-metadata.injector.js.map +0 -1
- package/dist/tracing/services/request-metadata.storage.d.ts +0 -32
- package/dist/tracing/services/request-metadata.storage.js +0 -64
- package/dist/tracing/services/request-metadata.storage.js.map +0 -1
- package/src/tracing/services/request-metadata.injector.ts +0 -157
- package/src/tracing/services/request-metadata.storage.ts +0 -69
|
@@ -1 +0,0 @@
|
|
|
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,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"}
|
|
@@ -1,157 +0,0 @@
|
|
|
1
|
-
import type { ExecutionContext } from '@nestjs/common';
|
|
2
|
-
import { redecorate } from '@rsdk/decorators';
|
|
3
|
-
import { LoggerFactory } from '@rsdk/logging';
|
|
4
|
-
import assert from 'node:assert';
|
|
5
|
-
import { randomUUID } from 'node:crypto';
|
|
6
|
-
|
|
7
|
-
import { Constants, X_REQUEST_ID } from '../constants';
|
|
8
|
-
|
|
9
|
-
import { RequestMetadataStorage } from './request-metadata.storage';
|
|
10
|
-
|
|
11
|
-
const logger = LoggerFactory.create('RequestMetadataInjector');
|
|
12
|
-
|
|
13
|
-
export class RequestMetadataInjector {
|
|
14
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
15
|
-
static wrap(
|
|
16
|
-
cls: any,
|
|
17
|
-
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
18
|
-
original: Function,
|
|
19
|
-
): void {
|
|
20
|
-
/**
|
|
21
|
-
* Означает, что данный метод уже обёрнут
|
|
22
|
-
*/
|
|
23
|
-
if (RequestMetadataInjector.isWrapped(original)) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
logger.trace(`Wrapping method: ${cls.constructor.name}.${original.name}()`);
|
|
28
|
-
|
|
29
|
-
const wrapped = RequestMetadataInjector.createWrapper(original);
|
|
30
|
-
|
|
31
|
-
redecorate(original, wrapped);
|
|
32
|
-
|
|
33
|
-
cls[original.name] = wrapped;
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Отмечает метод, как обёрнутый (чтобы избежать повторного оборачивания)
|
|
37
|
-
*/
|
|
38
|
-
RequestMetadataInjector.setWrapped(wrapped);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
private static createWrapper(original: any): any {
|
|
42
|
-
return {
|
|
43
|
-
[original.name](...args: any[]): any {
|
|
44
|
-
const executionContext: ExecutionContext = args[0];
|
|
45
|
-
|
|
46
|
-
/**
|
|
47
|
-
* Переменный для хранения значений
|
|
48
|
-
*/
|
|
49
|
-
let requestId: string | undefined;
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* Переменная для хранения Request/виртуального Request
|
|
53
|
-
*/
|
|
54
|
-
let req: any;
|
|
55
|
-
|
|
56
|
-
/**
|
|
57
|
-
* В зависимости от типа контекста запускаем парсинг переданной Metadata
|
|
58
|
-
*/
|
|
59
|
-
if (executionContext.getType() === 'rpc') {
|
|
60
|
-
const metadata = executionContext.switchToRpc().getContext();
|
|
61
|
-
/**
|
|
62
|
-
* Если мы пришли в GRPC и у нас есть методы для работы с Metadata
|
|
63
|
-
* то мы конвертируем Metadata в некий виртуальный request с заголовками (заголовки выбраны как общий стандарт проброса мета информации)
|
|
64
|
-
*/
|
|
65
|
-
if (metadata?.get) {
|
|
66
|
-
req = {
|
|
67
|
-
headers: {
|
|
68
|
-
/**
|
|
69
|
-
* Пробрасываем текущий ид запроса
|
|
70
|
-
*/
|
|
71
|
-
...(metadata.get(X_REQUEST_ID).length > 0
|
|
72
|
-
? {
|
|
73
|
-
[X_REQUEST_ID]: metadata.get(X_REQUEST_ID)[0],
|
|
74
|
-
}
|
|
75
|
-
: {}),
|
|
76
|
-
},
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
if (executionContext.getType() === 'http') {
|
|
82
|
-
req = executionContext.switchToHttp().getRequest();
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
if (executionContext.getType<string>() === 'graphql') {
|
|
86
|
-
req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
|
|
87
|
-
|
|
88
|
-
if (req.connectionInitReceived) {
|
|
89
|
-
/**
|
|
90
|
-
* При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
|
|
91
|
-
* и мы перегоняем эти данные в request заголовки
|
|
92
|
-
*/
|
|
93
|
-
req.headers = {
|
|
94
|
-
...req?.headers,
|
|
95
|
-
...Object.entries(req?.connectionParams?.headers || {}).reduce(
|
|
96
|
-
(acc, [key, value]) => {
|
|
97
|
-
acc[key] = value;
|
|
98
|
-
return acc;
|
|
99
|
-
},
|
|
100
|
-
<Record<string, unknown>>{},
|
|
101
|
-
),
|
|
102
|
-
};
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
if (req?.headers) {
|
|
107
|
-
/**
|
|
108
|
-
* Мы приводим все ключи заголовков к одному **lower_case** регистру, так как у разных транспортов разные регистры в именовании ключей для заголовков
|
|
109
|
-
*/
|
|
110
|
-
req.headers = {
|
|
111
|
-
...Object.entries(req.headers).reduce(
|
|
112
|
-
(acc, [key, value]) => {
|
|
113
|
-
acc[key.toLowerCase()] =
|
|
114
|
-
req.headers[key.toLowerCase()] || value;
|
|
115
|
-
return acc;
|
|
116
|
-
},
|
|
117
|
-
<Record<string, unknown>>{},
|
|
118
|
-
),
|
|
119
|
-
};
|
|
120
|
-
|
|
121
|
-
/**
|
|
122
|
-
* Идентификатор запроса, если не передали то генерируем рандомный
|
|
123
|
-
*/
|
|
124
|
-
requestId = req.headers[X_REQUEST_ID] || randomUUID();
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
return (
|
|
128
|
-
RequestMetadataStorage.getInstance()?.run({ requestId }, async () => {
|
|
129
|
-
return original.apply(this, args);
|
|
130
|
-
}) ?? original.apply(this, args)
|
|
131
|
-
);
|
|
132
|
-
},
|
|
133
|
-
}[original.name];
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
private static isWrapped(prototype: object): boolean {
|
|
137
|
-
assert.ok(prototype);
|
|
138
|
-
|
|
139
|
-
return Reflect.hasMetadata(
|
|
140
|
-
Constants.REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE,
|
|
141
|
-
prototype,
|
|
142
|
-
);
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
private static setWrapped(prototype: object): void {
|
|
146
|
-
assert.ok(prototype);
|
|
147
|
-
|
|
148
|
-
// Value doesn't matter
|
|
149
|
-
const NOOP = 1;
|
|
150
|
-
|
|
151
|
-
Reflect.defineMetadata(
|
|
152
|
-
Constants.REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE,
|
|
153
|
-
NOOP,
|
|
154
|
-
prototype,
|
|
155
|
-
);
|
|
156
|
-
}
|
|
157
|
-
}
|
|
@@ -1,69 +0,0 @@
|
|
|
1
|
-
import { Injectable } from '@nestjs/common';
|
|
2
|
-
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
3
|
-
|
|
4
|
-
export type RequestMetadata = {
|
|
5
|
-
requestId: string | undefined;
|
|
6
|
-
};
|
|
7
|
-
|
|
8
|
-
/**
|
|
9
|
-
* Обертка вокруг `AsyncLocalStorage`
|
|
10
|
-
* В теории можно запустить с пустым `payload`, для того чтобы добавлять
|
|
11
|
-
* значения в процессе
|
|
12
|
-
*/
|
|
13
|
-
@Injectable()
|
|
14
|
-
export class RequestMetadataStorage {
|
|
15
|
-
/**
|
|
16
|
-
* Так как этот сервис используется в разных местах, чтобы не усложнять существующий код путем проксирования модулей и сервисов
|
|
17
|
-
* после создания ложим инстанс в эту статик переменную
|
|
18
|
-
*/
|
|
19
|
-
private static instance: RequestMetadataStorage | undefined;
|
|
20
|
-
|
|
21
|
-
private asyncLocalStorage = new AsyncLocalStorage<{
|
|
22
|
-
requestMetadata: RequestMetadata;
|
|
23
|
-
}>();
|
|
24
|
-
|
|
25
|
-
constructor() {
|
|
26
|
-
if (!RequestMetadataStorage.instance) {
|
|
27
|
-
RequestMetadataStorage.instance = this;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
static getInstance(): RequestMetadataStorage | undefined {
|
|
32
|
-
return RequestMetadataStorage.instance;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
/**
|
|
36
|
-
* Получает новое значение из контекста
|
|
37
|
-
*/
|
|
38
|
-
getRequestMetadata(): RequestMetadata {
|
|
39
|
-
return (
|
|
40
|
-
RequestMetadataStorage.instance?.asyncLocalStorage.getStore()
|
|
41
|
-
?.requestMetadata ?? {
|
|
42
|
-
requestId: undefined,
|
|
43
|
-
}
|
|
44
|
-
);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
/**
|
|
48
|
-
* Запускает переданную фунцию в контексте
|
|
49
|
-
* @template TResult
|
|
50
|
-
* @template TArgs
|
|
51
|
-
* @param context Контекст исполнения (данные)
|
|
52
|
-
* @param fn Функция для запуска
|
|
53
|
-
* @param args Аргументы функции
|
|
54
|
-
* @returns Результат выполнения функции
|
|
55
|
-
*/
|
|
56
|
-
run<TResult, TArgs extends any[]>(
|
|
57
|
-
requestMetadata: RequestMetadata,
|
|
58
|
-
fn: (...args: TArgs) => TResult,
|
|
59
|
-
...args: TArgs
|
|
60
|
-
): TResult {
|
|
61
|
-
return (
|
|
62
|
-
RequestMetadataStorage?.instance?.asyncLocalStorage.run(
|
|
63
|
-
{ requestMetadata },
|
|
64
|
-
fn,
|
|
65
|
-
...args,
|
|
66
|
-
) ?? fn(...args)
|
|
67
|
-
);
|
|
68
|
-
}
|
|
69
|
-
}
|