@rsdk/cli.cmd.start 5.15.0-next.6 → 5.15.0-next.8

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.
Files changed (38) hide show
  1. package/dist/opentelemetry/exporter.d.ts +8 -0
  2. package/dist/opentelemetry/exporter.js +69 -0
  3. package/dist/opentelemetry/exporter.js.map +1 -0
  4. package/dist/opentelemetry/opentelemetry.init.js +38 -7
  5. package/dist/opentelemetry/opentelemetry.init.js.map +1 -1
  6. package/dist/opentelemetry/prom-metrics.type.d.ts +2 -0
  7. package/dist/opentelemetry/prom-metrics.type.js +3 -0
  8. package/dist/opentelemetry/prom-metrics.type.js.map +1 -0
  9. package/dist/otel-convertors/counter.convertor.d.ts +6 -0
  10. package/dist/otel-convertors/counter.convertor.js +25 -0
  11. package/dist/otel-convertors/counter.convertor.js.map +1 -0
  12. package/dist/otel-convertors/data-points.d.ts +4 -0
  13. package/dist/otel-convertors/data-points.js +15 -0
  14. package/dist/otel-convertors/data-points.js.map +1 -0
  15. package/dist/otel-convertors/gauge.convertor.d.ts +6 -0
  16. package/dist/otel-convertors/gauge.convertor.js +24 -0
  17. package/dist/otel-convertors/gauge.convertor.js.map +1 -0
  18. package/dist/otel-convertors/histogram.convertor.d.ts +6 -0
  19. package/dist/otel-convertors/histogram.convertor.js +81 -0
  20. package/dist/otel-convertors/histogram.convertor.js.map +1 -0
  21. package/dist/otel-convertors/index.d.ts +4 -0
  22. package/dist/otel-convertors/index.js +21 -0
  23. package/dist/otel-convertors/index.js.map +1 -0
  24. package/dist/otel-convertors/summary.convertor.d.ts +6 -0
  25. package/dist/otel-convertors/summary.convertor.js +69 -0
  26. package/dist/otel-convertors/summary.convertor.js.map +1 -0
  27. package/jest.config.js +1 -0
  28. package/package.json +2 -2
  29. package/src/opentelemetry/exporter.spec.ts +220 -0
  30. package/src/opentelemetry/exporter.ts +88 -0
  31. package/src/opentelemetry/opentelemetry.init.ts +49 -7
  32. package/src/opentelemetry/prom-metrics.type.ts +9 -0
  33. package/src/otel-convertors/counter.convertor.ts +34 -0
  34. package/src/otel-convertors/data-points.ts +19 -0
  35. package/src/otel-convertors/gauge.convertor.ts +33 -0
  36. package/src/otel-convertors/histogram.convertor.ts +121 -0
  37. package/src/otel-convertors/index.ts +4 -0
  38. package/src/otel-convertors/summary.convertor.ts +86 -0
@@ -0,0 +1,8 @@
1
+ import type { CollectionResult, MetricProducer } from '@opentelemetry/sdk-metrics';
2
+ import { type Registry } from 'prom-client';
3
+ export declare class PromClientMetricProducer implements MetricProducer {
4
+ private readonly registry;
5
+ constructor(registry: () => Registry);
6
+ collect(): Promise<CollectionResult>;
7
+ private convertPromMetricsToOtel;
8
+ }
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PromClientMetricProducer = void 0;
4
+ const core_1 = require("@opentelemetry/core");
5
+ const resources_1 = require("@opentelemetry/resources");
6
+ const otel_convertors_1 = require("../otel-convertors");
7
+ // prom-client не хранит время старта серий, все они считаются со старта процесса
8
+ const PROCESS_START_TIME = (0, core_1.millisToHrTime)(Date.now() - process.uptime() * 1000);
9
+ class PromClientMetricProducer {
10
+ registry;
11
+ constructor(registry) {
12
+ this.registry = registry;
13
+ }
14
+ async collect() {
15
+ const metrics = [];
16
+ const errors = [];
17
+ try {
18
+ const promMetrics = await this.registry().getMetricsAsJSON();
19
+ const endTime = (0, core_1.millisToHrTime)(Date.now());
20
+ for (const pm of promMetrics) {
21
+ try {
22
+ metrics.push(...this.convertPromMetricsToOtel(pm, endTime));
23
+ }
24
+ catch (error) {
25
+ errors.push(error);
26
+ }
27
+ }
28
+ }
29
+ catch (error) {
30
+ // если бросить, reader не отправит и метрики SDK: он собирает их в одном Promise.all
31
+ errors.push(error);
32
+ }
33
+ return {
34
+ resourceMetrics: {
35
+ // SDK игнорирует ресурс producer и подставляет свой
36
+ resource: resources_1.Resource.empty(),
37
+ scopeMetrics: [
38
+ {
39
+ scope: { name: 'prom-client' },
40
+ metrics: metrics.filter((m) => m.dataPoints.length > 0),
41
+ },
42
+ ],
43
+ },
44
+ errors,
45
+ };
46
+ }
47
+ convertPromMetricsToOtel(promMetrics, endTime) {
48
+ switch (promMetrics.type) {
49
+ case 'counter':
50
+ return [
51
+ otel_convertors_1.CounterConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
52
+ ];
53
+ case 'gauge':
54
+ return [
55
+ otel_convertors_1.GaugeConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
56
+ ];
57
+ case 'histogram':
58
+ return [
59
+ otel_convertors_1.HistogramConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
60
+ ];
61
+ case 'summary':
62
+ return otel_convertors_1.SummaryConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime);
63
+ default:
64
+ return [];
65
+ }
66
+ }
67
+ }
68
+ exports.PromClientMetricProducer = PromClientMetricProducer;
69
+ //# sourceMappingURL=exporter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"exporter.js","sourceRoot":"","sources":["../../src/opentelemetry/exporter.ts"],"names":[],"mappings":";;;AACA,8CAAqD;AACrD,wDAAoD;AAQpD,wDAK4B;AAI5B,iFAAiF;AACjF,MAAM,kBAAkB,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;AAEhF,MAAa,wBAAwB;IACN;IAA7B,YAA6B,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAAG,CAAC;IAEzD,KAAK,CAAC,OAAO;QACX,MAAM,OAAO,GAAiB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,gBAAgB,EAAE,CAAC;YAC7D,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAE3C,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;gBAC7B,IAAI,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC9D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,qFAAqF;YACrF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QAED,OAAO;YACL,eAAe,EAAE;gBACf,oDAAoD;gBACpD,QAAQ,EAAE,oBAAQ,CAAC,KAAK,EAAE;gBAC1B,YAAY,EAAE;oBACZ;wBACE,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;wBAC9B,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;qBACxD;iBACF;aACF;YACD,MAAM;SACP,CAAC;IACJ,CAAC;IAEO,wBAAwB,CAC9B,WAAiC,EACjC,OAAe;QAEf,QAAQ,WAAW,CAAC,IAAyB,EAAE,CAAC;YAC9C,KAAK,SAAS;gBACZ,OAAO;oBACL,kCAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC;iBAClE,CAAC;YACJ,KAAK,OAAO;gBACV,OAAO;oBACL,gCAAc,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC;iBAChE,CAAC;YACJ,KAAK,WAAW;gBACd,OAAO;oBACL,oCAAkB,CAAC,MAAM,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC;iBACpE,CAAC;YACJ,KAAK,SAAS;gBACZ,OAAO,kCAAgB,CAAC,MAAM,CAC5B,WAAW,EACX,kBAAkB,EAClB,OAAO,CACR,CAAC;YACJ;gBACE,OAAO,EAAE,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAjED,4DAiEC"}
@@ -17,6 +17,7 @@ const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
17
17
  const node_http_1 = require("node:http");
18
18
  const node_path_1 = __importDefault(require("node:path"));
19
19
  const node_process_1 = require("node:process");
20
+ const exporter_1 = require("./exporter");
20
21
  const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
21
22
  if (otelDiagLogLevel) {
22
23
  console.log('telemetry diag enabled:', otelDiagLogLevel);
@@ -71,6 +72,8 @@ const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoIn
71
72
  },
72
73
  '@opentelemetry/instrumentation-pino': {
73
74
  enabled: true,
75
+ // логи отправляет transport (LOG_OTEL_ENABLED), иначе они дублируются
76
+ disableLogSending: true,
74
77
  logHook(_span, record) {
75
78
  record['resource.service.name'] = otelServiceName;
76
79
  },
@@ -83,6 +86,8 @@ const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoIn
83
86
  },
84
87
  });
85
88
  const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
89
+ // без него transport отправляет логи с service.name=unknown_service
90
+ process.env.LOG_OTEL_SERVICE_NAME ??= otelServiceName;
86
91
  const textMapPropagator = new core_1.CompositePropagator({
87
92
  propagators: [
88
93
  new propagator_b3_1.B3Propagator(),
@@ -95,10 +100,26 @@ const resource = new resources_1.Resource({
95
100
  [semantic_conventions_1.ATTR_SERVICE_NAME]: otelServiceName,
96
101
  [semantic_conventions_1.ATTR_SERVICE_VERSION]: manifestData.version,
97
102
  });
103
+ // registry берем у prom-client из @rsdk/core приложения: у копии из CLI он свой
104
+ const appMetricsRegistry = () => {
105
+ const corePath = require.resolve('@rsdk/core', { paths: [(0, node_process_1.cwd)()] });
106
+ const promClientPath = require.resolve('prom-client', {
107
+ paths: [node_path_1.default.dirname(corePath)],
108
+ });
109
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
110
+ return require(promClientPath).register;
111
+ };
112
+ // NodeSDK читает OTEL_METRIC_EXPORT_* только для своего reader'а, а этот создан вручную
113
+ const envMillis = (name) => Number.parseInt(process.env[name] ?? '') || undefined;
114
+ const exportIntervalMillis = envMillis('OTEL_METRIC_EXPORT_INTERVAL');
115
+ const exportTimeoutMillis = envMillis('OTEL_METRIC_EXPORT_TIMEOUT');
98
116
  const traceExporter = new exporter_trace_otlp_http_1.OTLPTraceExporter();
99
117
  const metricExporter = new exporter_metrics_otlp_http_1.OTLPMetricExporter();
100
118
  const metricReader = new sdk_metrics_1.PeriodicExportingMetricReader({
101
119
  exporter: metricExporter,
120
+ ...(exportIntervalMillis === undefined ? {} : { exportIntervalMillis }),
121
+ ...(exportTimeoutMillis === undefined ? {} : { exportTimeoutMillis }),
122
+ metricProducers: [new exporter_1.PromClientMetricProducer(appMetricsRegistry)],
102
123
  });
103
124
  const sdk = new sdk_node_1.NodeSDK({
104
125
  serviceName: otelServiceName,
@@ -118,21 +139,31 @@ const sdk = new sdk_node_1.NodeSDK({
118
139
  sdk.start();
119
140
  console.log('Tracing sdk started');
120
141
  const signals = ['SIGTERM', 'SIGINT'];
121
- const listener = async () => {
142
+ let sdkShutdown;
143
+ const shutdownSdk = async (signal) => {
122
144
  try {
123
- console.log('[SIGTERM] Tracing terminating...');
145
+ console.log(`[${signal}] Tracing terminating...`);
124
146
  await sdk.shutdown();
125
147
  console.log('Tracing terminated');
126
148
  }
127
149
  catch (error) {
128
150
  console.log('Error terminating tracing', error);
129
- // eslint-disable-next-line unicorn/no-process-exit
130
- process.exit(1);
131
151
  }
132
- finally {
133
- // eslint-disable-next-line unicorn/no-process-exit
134
- process.exit(0);
152
+ };
153
+ // Процесс завершает Nest (enableShutdownHooks): после своих хуков он повторяет
154
+ // сигнал. process.exit здесь оборвал бы эти хуки, поэтому только останавливаем
155
+ // SDK и снимаем обработчик, чтобы повторный сигнал завершил процесс
156
+ const listener = (signal) => {
157
+ if (!sdkShutdown) {
158
+ sdkShutdown = shutdownSdk(signal).then(() => {
159
+ for (const s of signals)
160
+ process.removeListener(s, listener);
161
+ });
162
+ if (process.listenerCount(signal) > 1)
163
+ return;
135
164
  }
165
+ // сигнал повторил Nest раньше, чем остановился SDK, или Nest нет
166
+ void sdkShutdown.then(() => process.kill(process.pid, signal));
136
167
  };
137
168
  for (const signal of signals) {
138
169
  process.on(signal, listener);
@@ -1 +1 @@
1
- {"version":3,"file":"opentelemetry.init.js","sourceRoot":"","sources":["../../src/opentelemetry/opentelemetry.init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"opentelemetry.init.js","sourceRoot":"","sources":["../../src/opentelemetry/opentelemetry.init.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { type MetricObjectWithValues, type MetricValue, type MetricValueWithName } from 'prom-client';
2
+ export type PromMetricWithValues = MetricObjectWithValues<MetricValue<string>> | MetricObjectWithValues<MetricValueWithName<string>>;
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=prom-metrics.type.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prom-metrics.type.js","sourceRoot":"","sources":["../../src/opentelemetry/prom-metrics.type.ts"],"names":[],"mappings":""}
@@ -0,0 +1,6 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { SumMetricData } from '@opentelemetry/sdk-metrics';
3
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
4
+ export declare class CounterConvertor {
5
+ static toOtel(promMetrics: PromMetricWithValues, startTime: HrTime, endTime: HrTime): SumMetricData;
6
+ }
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CounterConvertor = void 0;
4
+ const api_1 = require("@opentelemetry/api");
5
+ const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
6
+ const data_points_1 = require("./data-points");
7
+ class CounterConvertor {
8
+ static toOtel(promMetrics, startTime, endTime) {
9
+ return {
10
+ descriptor: {
11
+ name: promMetrics.name,
12
+ description: promMetrics.help,
13
+ unit: '',
14
+ type: sdk_metrics_1.InstrumentType.COUNTER,
15
+ valueType: api_1.ValueType.DOUBLE,
16
+ },
17
+ dataPoints: (0, data_points_1.toDataPoints)(promMetrics.values, startTime, endTime),
18
+ dataPointType: sdk_metrics_1.DataPointType.SUM,
19
+ isMonotonic: true,
20
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
21
+ };
22
+ }
23
+ }
24
+ exports.CounterConvertor = CounterConvertor;
25
+ //# sourceMappingURL=counter.convertor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"counter.convertor.js","sourceRoot":"","sources":["../../src/otel-convertors/counter.convertor.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAE/C,4DAIoC;AAIpC,+CAA6C;AAE7C,MAAa,gBAAgB;IAC3B,MAAM,CAAC,MAAM,CACX,WAAiC,EACjC,SAAiB,EACjB,OAAe;QAEf,OAAO;YACL,UAAU,EAAE;gBACV,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,4BAAc,CAAC,OAAO;gBAC5B,SAAS,EAAE,eAAS,CAAC,MAAM;aAC5B;YACD,UAAU,EAAE,IAAA,0BAAY,EAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC;YAChE,aAAa,EAAE,2BAAa,CAAC,GAAG;YAChC,WAAW,EAAE,IAAI;YACjB,sBAAsB,EAAE,oCAAsB,CAAC,UAAU;SAC1D,CAAC;IACJ,CAAC;CACF;AApBD,4CAoBC"}
@@ -0,0 +1,4 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { DataPoint } from '@opentelemetry/sdk-metrics';
3
+ import type { MetricValue } from 'prom-client';
4
+ export declare function toDataPoints(values: readonly MetricValue<string>[], startTime: HrTime, endTime: HrTime): DataPoint<number>[];
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.toDataPoints = toDataPoints;
4
+ // OTLP JSON сериализует NaN и Infinity как null, такие точки отбрасываем
5
+ function toDataPoints(values, startTime, endTime) {
6
+ return values
7
+ .filter((v) => Number.isFinite(v.value))
8
+ .map((v) => ({
9
+ attributes: v.labels,
10
+ value: v.value,
11
+ startTime,
12
+ endTime,
13
+ }));
14
+ }
15
+ //# sourceMappingURL=data-points.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"data-points.js","sourceRoot":"","sources":["../../src/otel-convertors/data-points.ts"],"names":[],"mappings":";;AAKA,oCAaC;AAdD,yEAAyE;AACzE,SAAgB,YAAY,CAC1B,MAAsC,EACtC,SAAiB,EACjB,OAAe;IAEf,OAAO,MAAM;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,UAAU,EAAE,CAAC,CAAC,MAAM;QACpB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,SAAS;QACT,OAAO;KACR,CAAC,CAAC,CAAC;AACR,CAAC"}
@@ -0,0 +1,6 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { GaugeMetricData } from '@opentelemetry/sdk-metrics';
3
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
4
+ export declare class GaugeConvertor {
5
+ static toOtel(promMetrics: PromMetricWithValues, startTime: HrTime, endTime: HrTime): GaugeMetricData;
6
+ }
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.GaugeConvertor = void 0;
4
+ const api_1 = require("@opentelemetry/api");
5
+ const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
6
+ const data_points_1 = require("./data-points");
7
+ class GaugeConvertor {
8
+ static toOtel(promMetrics, startTime, endTime) {
9
+ return {
10
+ descriptor: {
11
+ name: promMetrics.name,
12
+ description: promMetrics.help,
13
+ unit: '',
14
+ type: sdk_metrics_1.InstrumentType.GAUGE,
15
+ valueType: api_1.ValueType.DOUBLE,
16
+ },
17
+ dataPoints: (0, data_points_1.toDataPoints)(promMetrics.values, startTime, endTime),
18
+ dataPointType: sdk_metrics_1.DataPointType.GAUGE,
19
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
20
+ };
21
+ }
22
+ }
23
+ exports.GaugeConvertor = GaugeConvertor;
24
+ //# sourceMappingURL=gauge.convertor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"gauge.convertor.js","sourceRoot":"","sources":["../../src/otel-convertors/gauge.convertor.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAE/C,4DAIoC;AAIpC,+CAA6C;AAE7C,MAAa,cAAc;IACzB,MAAM,CAAC,MAAM,CACX,WAAiC,EACjC,SAAiB,EACjB,OAAe;QAEf,OAAO;YACL,UAAU,EAAE;gBACV,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,4BAAc,CAAC,KAAK;gBAC1B,SAAS,EAAE,eAAS,CAAC,MAAM;aAC5B;YACD,UAAU,EAAE,IAAA,0BAAY,EAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC;YAChE,aAAa,EAAE,2BAAa,CAAC,KAAK;YAClC,sBAAsB,EAAE,oCAAsB,CAAC,UAAU;SAC1D,CAAC;IACJ,CAAC;CACF;AAnBD,wCAmBC"}
@@ -0,0 +1,6 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { HistogramMetricData } from '@opentelemetry/sdk-metrics';
3
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
4
+ export declare class HistogramConvertor {
5
+ static toOtel(promMetrics: PromMetricWithValues, startTime: HrTime, endTime: HrTime): HistogramMetricData;
6
+ }
@@ -0,0 +1,81 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.HistogramConvertor = void 0;
4
+ const api_1 = require("@opentelemetry/api");
5
+ const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
6
+ const BUCKET_SUFFIX = '_bucket';
7
+ const SUM_SUFFIX = '_sum';
8
+ const COUNT_SUFFIX = '_count';
9
+ class HistogramConvertor {
10
+ static toOtel(promMetrics, startTime, endTime) {
11
+ // prom-client отдает histogram плоским списком: бакеты с меткой le, _sum и _count
12
+ const seriesByLabels = new Map();
13
+ for (const rec of promMetrics.values) {
14
+ const { le, ...labels } = rec.labels;
15
+ const key = JSON.stringify(labels);
16
+ let series = seriesByLabels.get(key);
17
+ if (!series) {
18
+ series = { labels, buckets: new Map() };
19
+ seriesByLabels.set(key, series);
20
+ }
21
+ switch (rec.metricName) {
22
+ case promMetrics.name + BUCKET_SUFFIX: {
23
+ const bound = le === '+Inf' ? Number.POSITIVE_INFINITY : Number(le);
24
+ if (!Number.isNaN(bound))
25
+ series.buckets.set(bound, rec.value);
26
+ break;
27
+ }
28
+ case promMetrics.name + SUM_SUFFIX:
29
+ series.sum = rec.value;
30
+ break;
31
+ case promMetrics.name + COUNT_SUFFIX:
32
+ series.count = rec.value;
33
+ break;
34
+ // No default
35
+ }
36
+ }
37
+ const dataPoints = [];
38
+ for (const series of seriesByLabels.values()) {
39
+ const boundaries = [...series.buckets.keys()]
40
+ .filter((b) => Number.isFinite(b))
41
+ .sort((a, b) => a - b);
42
+ // в prom-client бакеты кумулятивные, в OTLP нужен счетчик каждого бакета
43
+ const counts = [];
44
+ let prev = 0;
45
+ for (const bound of boundaries) {
46
+ const cumulative = series.buckets.get(bound) ?? prev;
47
+ counts.push(cumulative - prev);
48
+ prev = cumulative;
49
+ }
50
+ const total = series.count ?? series.buckets.get(Number.POSITIVE_INFINITY) ?? prev;
51
+ counts.push(total - prev);
52
+ dataPoints.push({
53
+ attributes: series.labels,
54
+ startTime,
55
+ endTime,
56
+ value: {
57
+ count: total,
58
+ // NaN и Infinity не сериализуются в OTLP JSON
59
+ ...(series.sum !== undefined && Number.isFinite(series.sum)
60
+ ? { sum: series.sum }
61
+ : {}),
62
+ buckets: { boundaries, counts },
63
+ },
64
+ });
65
+ }
66
+ return {
67
+ descriptor: {
68
+ name: promMetrics.name,
69
+ description: promMetrics.help,
70
+ unit: '',
71
+ type: sdk_metrics_1.InstrumentType.HISTOGRAM,
72
+ valueType: api_1.ValueType.DOUBLE,
73
+ },
74
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
75
+ dataPointType: sdk_metrics_1.DataPointType.HISTOGRAM,
76
+ dataPoints,
77
+ };
78
+ }
79
+ }
80
+ exports.HistogramConvertor = HistogramConvertor;
81
+ //# sourceMappingURL=histogram.convertor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"histogram.convertor.js","sourceRoot":"","sources":["../../src/otel-convertors/histogram.convertor.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ export * from './counter.convertor';
2
+ export * from './gauge.convertor';
3
+ export * from './histogram.convertor';
4
+ export * from './summary.convertor';
@@ -0,0 +1,21 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./counter.convertor"), exports);
18
+ __exportStar(require("./gauge.convertor"), exports);
19
+ __exportStar(require("./histogram.convertor"), exports);
20
+ __exportStar(require("./summary.convertor"), exports);
21
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/otel-convertors/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,oDAAkC;AAClC,wDAAsC;AACtC,sDAAoC"}
@@ -0,0 +1,6 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { MetricData } from '@opentelemetry/sdk-metrics';
3
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
4
+ export declare class SummaryConvertor {
5
+ static toOtel(promMetrics: PromMetricWithValues, startTime: HrTime, endTime: HrTime): MetricData[];
6
+ }
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.SummaryConvertor = void 0;
4
+ const api_1 = require("@opentelemetry/api");
5
+ const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
6
+ const data_points_1 = require("./data-points");
7
+ // В sdk-metrics нет типа Summary: квантили уходят как gauge, _sum и _count как sum
8
+ class SummaryConvertor {
9
+ static toOtel(promMetrics, startTime, endTime) {
10
+ // prom-client отдает summary плоским списком: квантили с меткой quantile,
11
+ // а _sum и _count отдельными записями с metricName
12
+ const quantileValues = [];
13
+ const sumValues = [];
14
+ const countValues = [];
15
+ for (const v of promMetrics.values) {
16
+ if (v.metricName === `${promMetrics.name}_sum`) {
17
+ sumValues.push(v);
18
+ }
19
+ else if (v.metricName === `${promMetrics.name}_count`) {
20
+ countValues.push(v);
21
+ }
22
+ else {
23
+ quantileValues.push(v);
24
+ }
25
+ }
26
+ const quantiles = {
27
+ descriptor: {
28
+ name: promMetrics.name,
29
+ description: promMetrics.help,
30
+ unit: '',
31
+ type: sdk_metrics_1.InstrumentType.GAUGE,
32
+ valueType: api_1.ValueType.DOUBLE,
33
+ },
34
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
35
+ dataPointType: sdk_metrics_1.DataPointType.GAUGE,
36
+ dataPoints: (0, data_points_1.toDataPoints)(quantileValues, startTime, endTime),
37
+ };
38
+ // наблюдения могут быть отрицательными, поэтому _sum не монотонный
39
+ const sum = {
40
+ descriptor: {
41
+ name: `${promMetrics.name}_sum`,
42
+ description: `${promMetrics.help} (sum)`,
43
+ unit: '',
44
+ type: sdk_metrics_1.InstrumentType.UP_DOWN_COUNTER,
45
+ valueType: api_1.ValueType.DOUBLE,
46
+ },
47
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
48
+ dataPointType: sdk_metrics_1.DataPointType.SUM,
49
+ isMonotonic: false,
50
+ dataPoints: (0, data_points_1.toDataPoints)(sumValues, startTime, endTime),
51
+ };
52
+ const count = {
53
+ descriptor: {
54
+ name: `${promMetrics.name}_count`,
55
+ description: `${promMetrics.help} (count)`,
56
+ unit: '',
57
+ type: sdk_metrics_1.InstrumentType.COUNTER,
58
+ valueType: api_1.ValueType.DOUBLE,
59
+ },
60
+ aggregationTemporality: sdk_metrics_1.AggregationTemporality.CUMULATIVE,
61
+ dataPointType: sdk_metrics_1.DataPointType.SUM,
62
+ isMonotonic: true,
63
+ dataPoints: (0, data_points_1.toDataPoints)(countValues, startTime, endTime),
64
+ };
65
+ return [quantiles, sum, count];
66
+ }
67
+ }
68
+ exports.SummaryConvertor = SummaryConvertor;
69
+ //# sourceMappingURL=summary.convertor.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"summary.convertor.js","sourceRoot":"","sources":["../../src/otel-convertors/summary.convertor.ts"],"names":[],"mappings":";;;AACA,4CAA+C;AAM/C,4DAIoC;AAKpC,+CAA6C;AAE7C,mFAAmF;AACnF,MAAa,gBAAgB;IAC3B,MAAM,CAAC,MAAM,CACX,WAAiC,EACjC,SAAiB,EACjB,OAAe;QAEf,0EAA0E;QAC1E,mDAAmD;QACnD,MAAM,cAAc,GAA0B,EAAE,CAAC;QACjD,MAAM,SAAS,GAA0B,EAAE,CAAC;QAC5C,MAAM,WAAW,GAA0B,EAAE,CAAC;QAE9C,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,MAAuC,EAAE,CAAC;YACpE,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,WAAW,CAAC,IAAI,MAAM,EAAE,CAAC;gBAC/C,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,WAAW,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACxD,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAoB;YACjC,UAAU,EAAE;gBACV,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,WAAW,EAAE,WAAW,CAAC,IAAI;gBAC7B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,4BAAc,CAAC,KAAK;gBAC1B,SAAS,EAAE,eAAS,CAAC,MAAM;aAC5B;YACD,sBAAsB,EAAE,oCAAsB,CAAC,UAAU;YACzD,aAAa,EAAE,2BAAa,CAAC,KAAK;YAClC,UAAU,EAAE,IAAA,0BAAY,EAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;SAC7D,CAAC;QAEF,mEAAmE;QACnE,MAAM,GAAG,GAAkB;YACzB,UAAU,EAAE;gBACV,IAAI,EAAE,GAAG,WAAW,CAAC,IAAI,MAAM;gBAC/B,WAAW,EAAE,GAAG,WAAW,CAAC,IAAI,QAAQ;gBACxC,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,4BAAc,CAAC,eAAe;gBACpC,SAAS,EAAE,eAAS,CAAC,MAAM;aAC5B;YACD,sBAAsB,EAAE,oCAAsB,CAAC,UAAU;YACzD,aAAa,EAAE,2BAAa,CAAC,GAAG;YAChC,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,IAAA,0BAAY,EAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC;SACxD,CAAC;QAEF,MAAM,KAAK,GAAkB;YAC3B,UAAU,EAAE;gBACV,IAAI,EAAE,GAAG,WAAW,CAAC,IAAI,QAAQ;gBACjC,WAAW,EAAE,GAAG,WAAW,CAAC,IAAI,UAAU;gBAC1C,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,4BAAc,CAAC,OAAO;gBAC5B,SAAS,EAAE,eAAS,CAAC,MAAM;aAC5B;YACD,sBAAsB,EAAE,oCAAsB,CAAC,UAAU;YACzD,aAAa,EAAE,2BAAa,CAAC,GAAG;YAChC,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAA,0BAAY,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC;SAC1D,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;CACF;AAlED,4CAkEC"}
package/jest.config.js ADDED
@@ -0,0 +1 @@
1
+ module.exports = require('@rsdk/jest/jest.config');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/cli.cmd.start",
3
- "version": "5.15.0-next.6",
3
+ "version": "5.15.0-next.8",
4
4
  "description": "Start command for rsdk cli",
5
5
  "main": "dist/index.js",
6
6
  "bin": {
@@ -80,5 +80,5 @@
80
80
  "optional": true
81
81
  }
82
82
  },
83
- "gitHead": "02b2a6b9b7aa58419075323fce9d20846c920b6d"
83
+ "gitHead": "3da629f7dbb0db6a2bfe04f31b510ab3a3d5fd0c"
84
84
  }
@@ -0,0 +1,220 @@
1
+ import type {
2
+ GaugeMetricData,
3
+ Histogram as OtelHistogram,
4
+ HistogramMetricData,
5
+ MetricData,
6
+ SumMetricData,
7
+ } from '@opentelemetry/sdk-metrics';
8
+ import {
9
+ AggregationTemporality,
10
+ DataPointType,
11
+ InstrumentType,
12
+ } from '@opentelemetry/sdk-metrics';
13
+ import { Counter, Gauge, Histogram, Registry, Summary } from 'prom-client';
14
+
15
+ import { PromClientMetricProducer } from './exporter';
16
+
17
+ async function collect(
18
+ registry: Registry,
19
+ ): Promise<{ metrics: MetricData[]; errors: unknown[] }> {
20
+ const { resourceMetrics, errors } = await new PromClientMetricProducer(
21
+ () => registry,
22
+ ).collect();
23
+
24
+ return { metrics: resourceMetrics.scopeMetrics[0]?.metrics ?? [], errors };
25
+ }
26
+
27
+ function byName<T extends MetricData>(metrics: MetricData[], name: string): T {
28
+ const metric = metrics.find((m) => m.descriptor.name === name);
29
+
30
+ if (!metric) throw new Error(`metric ${name} not found`);
31
+
32
+ return metric as T;
33
+ }
34
+
35
+ describe('PromClientMetricProducer', () => {
36
+ let registry: Registry;
37
+
38
+ beforeEach(() => {
39
+ registry = new Registry();
40
+ });
41
+
42
+ it('конвертирует counter в монотонный кумулятивный sum', async () => {
43
+ const counter = new Counter({
44
+ name: 'calls_total',
45
+ help: 'calls',
46
+ labelNames: ['route'],
47
+ registers: [registry],
48
+ });
49
+
50
+ counter.inc({ route: '/a' }, 2);
51
+ counter.inc({ route: '/b' });
52
+
53
+ const { metrics, errors } = await collect(registry);
54
+ const sum = byName<SumMetricData>(metrics, 'calls_total');
55
+
56
+ expect(errors).toEqual([]);
57
+ expect(sum.descriptor).toMatchObject({
58
+ description: 'calls',
59
+ type: InstrumentType.COUNTER,
60
+ });
61
+ expect(sum.dataPointType).toBe(DataPointType.SUM);
62
+ expect(sum.isMonotonic).toBe(true);
63
+ expect(sum.aggregationTemporality).toBe(AggregationTemporality.CUMULATIVE);
64
+ expect(sum.dataPoints.map((p) => [p.attributes, p.value])).toEqual([
65
+ [{ route: '/a' }, 2],
66
+ [{ route: '/b' }, 1],
67
+ ]);
68
+ });
69
+
70
+ it('отбрасывает точки gauge с NaN и Infinity', async () => {
71
+ const gauge = new Gauge({
72
+ name: 'latency',
73
+ help: 'latency',
74
+ labelNames: ['kind'],
75
+ registers: [registry],
76
+ });
77
+
78
+ gauge.set({ kind: 'ok' }, 5);
79
+ gauge.set({ kind: 'nan' }, Number.NaN);
80
+ gauge.set({ kind: 'inf' }, Number.POSITIVE_INFINITY);
81
+
82
+ const { metrics } = await collect(registry);
83
+ const otel = byName<GaugeMetricData>(metrics, 'latency');
84
+
85
+ expect(otel.dataPointType).toBe(DataPointType.GAUGE);
86
+ expect(otel.dataPoints.map((p) => [p.attributes, p.value])).toEqual([
87
+ [{ kind: 'ok' }, 5],
88
+ ]);
89
+ });
90
+
91
+ it('не экспортирует метрику, у которой не осталось точек', async () => {
92
+ new Gauge({ name: 'empty', help: 'empty', registers: [registry] }).set(
93
+ Number.NaN,
94
+ );
95
+
96
+ const { metrics } = await collect(registry);
97
+
98
+ expect(metrics).toEqual([]);
99
+ });
100
+
101
+ it('переводит кумулятивные бакеты histogram в счетчики бакетов', async () => {
102
+ const histogram = new Histogram({
103
+ name: 'duration',
104
+ help: 'duration',
105
+ labelNames: ['route'],
106
+ buckets: [1, 5, 10],
107
+ registers: [registry],
108
+ });
109
+
110
+ for (const v of [0.5, 3, 4, 7, 20]) histogram.observe({ route: '/a' }, v);
111
+ histogram.observe({ route: '/b' }, 2);
112
+
113
+ const { metrics } = await collect(registry);
114
+ const otel = byName<HistogramMetricData>(metrics, 'duration');
115
+ const [a, b] = otel.dataPoints;
116
+
117
+ expect(metrics.map((m) => m.descriptor.name)).toEqual(['duration']);
118
+ expect(otel.dataPointType).toBe(DataPointType.HISTOGRAM);
119
+ expect(otel.dataPoints).toHaveLength(2);
120
+ expect(a.attributes).toEqual({ route: '/a' });
121
+ expect(a.value).toEqual<OtelHistogram>({
122
+ count: 5,
123
+ sum: 34.5,
124
+ buckets: { boundaries: [1, 5, 10], counts: [1, 2, 1, 1] },
125
+ });
126
+ expect(b.attributes).toEqual({ route: '/b' });
127
+ expect(b.value.buckets.counts).toEqual([0, 1, 0, 0]);
128
+ });
129
+
130
+ it('раскладывает summary на квантили, _sum и _count', async () => {
131
+ const summary = new Summary({
132
+ name: 'request',
133
+ help: 'request',
134
+ labelNames: ['route'],
135
+ percentiles: [0.5, 0.9],
136
+ registers: [registry],
137
+ });
138
+
139
+ for (const v of [1, 2, 3]) summary.observe({ route: '/a' }, v);
140
+
141
+ const { metrics } = await collect(registry);
142
+ const quantiles = byName<GaugeMetricData>(metrics, 'request');
143
+ const sum = byName<SumMetricData>(metrics, 'request_sum');
144
+ const count = byName<SumMetricData>(metrics, 'request_count');
145
+
146
+ expect(quantiles.dataPointType).toBe(DataPointType.GAUGE);
147
+ expect(quantiles.dataPoints.map((p) => p.attributes)).toEqual([
148
+ { quantile: 0.5, route: '/a' },
149
+ { quantile: 0.9, route: '/a' },
150
+ ]);
151
+
152
+ expect(sum.isMonotonic).toBe(false);
153
+ expect(sum.dataPoints.map((p) => [p.attributes, p.value])).toEqual([
154
+ [{ route: '/a' }, 6],
155
+ ]);
156
+
157
+ expect(count.isMonotonic).toBe(true);
158
+ expect(count.dataPoints.map((p) => [p.attributes, p.value])).toEqual([
159
+ [{ route: '/a' }, 3],
160
+ ]);
161
+ });
162
+
163
+ it('добавляет default labels registry', async () => {
164
+ registry.setDefaultLabels({ app: 'example' });
165
+ new Counter({ name: 'c_total', help: 'c', registers: [registry] }).inc();
166
+
167
+ const { metrics } = await collect(registry);
168
+
169
+ expect(metrics[0].dataPoints[0].attributes).toEqual({ app: 'example' });
170
+ });
171
+
172
+ it('ставит всем точкам одно время сбора', async () => {
173
+ new Counter({ name: 'a_total', help: 'a', registers: [registry] }).inc();
174
+ new Gauge({ name: 'b', help: 'b', registers: [registry] }).set(1);
175
+
176
+ const { metrics } = await collect(registry);
177
+ const [first, second] = metrics.map((m) => m.dataPoints[0]);
178
+
179
+ expect(first.endTime).toEqual(second.endTime);
180
+ expect(first.startTime).toEqual(second.startTime);
181
+ expect(first.startTime[0]).toBeLessThanOrEqual(first.endTime[0]);
182
+ });
183
+
184
+ it('не бросает, если сбор метрик в registry упал', async () => {
185
+ new Gauge({
186
+ name: 'broken',
187
+ help: 'broken',
188
+ registers: [registry],
189
+ collect(): void {
190
+ throw new Error('collect failed');
191
+ },
192
+ });
193
+
194
+ const { metrics, errors } = await collect(registry);
195
+
196
+ expect(metrics).toEqual([]);
197
+ expect(errors).toEqual([new Error('collect failed')]);
198
+ });
199
+
200
+ it('экспортирует остальные метрики, если одна не сконвертировалась', async () => {
201
+ const counter = new Counter({
202
+ name: 'ok_total',
203
+ help: 'ok',
204
+ registers: [],
205
+ });
206
+
207
+ counter.inc();
208
+ const fakeRegistry = {
209
+ getMetricsAsJSON: async () => [
210
+ { name: 'broken', help: 'broken', type: 'histogram', values: null },
211
+ await counter.get(),
212
+ ],
213
+ } as unknown as Registry;
214
+
215
+ const { metrics, errors } = await collect(fakeRegistry);
216
+
217
+ expect(metrics.map((m) => m.descriptor.name)).toEqual(['ok_total']);
218
+ expect(errors).toHaveLength(1);
219
+ });
220
+ });
@@ -0,0 +1,88 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import { millisToHrTime } from '@opentelemetry/core';
3
+ import { Resource } from '@opentelemetry/resources';
4
+ import type {
5
+ CollectionResult,
6
+ MetricData,
7
+ MetricProducer,
8
+ } from '@opentelemetry/sdk-metrics';
9
+ import { type Registry } from 'prom-client';
10
+
11
+ import {
12
+ CounterConvertor,
13
+ GaugeConvertor,
14
+ HistogramConvertor,
15
+ SummaryConvertor,
16
+ } from '../otel-convertors';
17
+
18
+ import type { PromMetricWithValues } from './prom-metrics.type';
19
+
20
+ // prom-client не хранит время старта серий, все они считаются со старта процесса
21
+ const PROCESS_START_TIME = millisToHrTime(Date.now() - process.uptime() * 1000);
22
+
23
+ export class PromClientMetricProducer implements MetricProducer {
24
+ constructor(private readonly registry: () => Registry) {}
25
+
26
+ async collect(): Promise<CollectionResult> {
27
+ const metrics: MetricData[] = [];
28
+ const errors: unknown[] = [];
29
+
30
+ try {
31
+ const promMetrics = await this.registry().getMetricsAsJSON();
32
+ const endTime = millisToHrTime(Date.now());
33
+
34
+ for (const pm of promMetrics) {
35
+ try {
36
+ metrics.push(...this.convertPromMetricsToOtel(pm, endTime));
37
+ } catch (error) {
38
+ errors.push(error);
39
+ }
40
+ }
41
+ } catch (error) {
42
+ // если бросить, reader не отправит и метрики SDK: он собирает их в одном Promise.all
43
+ errors.push(error);
44
+ }
45
+
46
+ return {
47
+ resourceMetrics: {
48
+ // SDK игнорирует ресурс producer и подставляет свой
49
+ resource: Resource.empty(),
50
+ scopeMetrics: [
51
+ {
52
+ scope: { name: 'prom-client' },
53
+ metrics: metrics.filter((m) => m.dataPoints.length > 0),
54
+ },
55
+ ],
56
+ },
57
+ errors,
58
+ };
59
+ }
60
+
61
+ private convertPromMetricsToOtel(
62
+ promMetrics: PromMetricWithValues,
63
+ endTime: HrTime,
64
+ ): MetricData[] {
65
+ switch (promMetrics.type as unknown as string) {
66
+ case 'counter':
67
+ return [
68
+ CounterConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
69
+ ];
70
+ case 'gauge':
71
+ return [
72
+ GaugeConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
73
+ ];
74
+ case 'histogram':
75
+ return [
76
+ HistogramConvertor.toOtel(promMetrics, PROCESS_START_TIME, endTime),
77
+ ];
78
+ case 'summary':
79
+ return SummaryConvertor.toOtel(
80
+ promMetrics,
81
+ PROCESS_START_TIME,
82
+ endTime,
83
+ );
84
+ default:
85
+ return [];
86
+ }
87
+ }
88
+ }
@@ -23,6 +23,9 @@ import {
23
23
  import { ClientRequest, IncomingMessage } from 'node:http';
24
24
  import path from 'node:path';
25
25
  import { cwd } from 'node:process';
26
+ import type { Registry } from 'prom-client';
27
+
28
+ import { PromClientMetricProducer } from './exporter';
26
29
 
27
30
  const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
28
31
  if (otelDiagLogLevel) {
@@ -85,6 +88,9 @@ const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
85
88
  },
86
89
  '@opentelemetry/instrumentation-pino': {
87
90
  enabled: true,
91
+
92
+ // логи отправляет transport (LOG_OTEL_ENABLED), иначе они дублируются
93
+ disableLogSending: true,
88
94
  logHook(_span: Span, record: Record<string, any>) {
89
95
  record['resource.service.name'] = otelServiceName;
90
96
  },
@@ -99,6 +105,9 @@ const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
99
105
 
100
106
  const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
101
107
 
108
+ // без него transport отправляет логи с service.name=unknown_service
109
+ process.env.LOG_OTEL_SERVICE_NAME ??= otelServiceName;
110
+
102
111
  const textMapPropagator = new CompositePropagator({
103
112
  propagators: [
104
113
  new B3Propagator(),
@@ -113,10 +122,30 @@ const resource = new Resource({
113
122
  [ATTR_SERVICE_VERSION]: manifestData.version,
114
123
  });
115
124
 
125
+ // registry берем у prom-client из @rsdk/core приложения: у копии из CLI он свой
126
+ const appMetricsRegistry = (): Registry => {
127
+ const corePath = require.resolve('@rsdk/core', { paths: [cwd()] });
128
+ const promClientPath = require.resolve('prom-client', {
129
+ paths: [path.dirname(corePath)],
130
+ });
131
+
132
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
133
+ return require(promClientPath).register;
134
+ };
135
+
136
+ // NodeSDK читает OTEL_METRIC_EXPORT_* только для своего reader'а, а этот создан вручную
137
+ const envMillis = (name: string): number | undefined =>
138
+ Number.parseInt(process.env[name] ?? '') || undefined;
139
+ const exportIntervalMillis = envMillis('OTEL_METRIC_EXPORT_INTERVAL');
140
+ const exportTimeoutMillis = envMillis('OTEL_METRIC_EXPORT_TIMEOUT');
141
+
116
142
  const traceExporter = new OTLPTraceExporter();
117
143
  const metricExporter = new OTLPMetricExporter();
118
144
  const metricReader = new PeriodicExportingMetricReader({
119
145
  exporter: metricExporter,
146
+ ...(exportIntervalMillis === undefined ? {} : { exportIntervalMillis }),
147
+ ...(exportTimeoutMillis === undefined ? {} : { exportTimeoutMillis }),
148
+ metricProducers: [new PromClientMetricProducer(appMetricsRegistry)],
120
149
  });
121
150
 
122
151
  const sdk = new NodeSDK({
@@ -140,21 +169,34 @@ console.log('Tracing sdk started');
140
169
 
141
170
  const signals = ['SIGTERM', 'SIGINT'] as const;
142
171
 
143
- const listener: any = async () => {
172
+ let sdkShutdown: Promise<void> | undefined;
173
+
174
+ const shutdownSdk = async (signal: NodeJS.Signals): Promise<void> => {
144
175
  try {
145
- console.log('[SIGTERM] Tracing terminating...');
176
+ console.log(`[${signal}] Tracing terminating...`);
146
177
  await sdk.shutdown();
147
178
  console.log('Tracing terminated');
148
179
  } catch (error) {
149
180
  console.log('Error terminating tracing', error);
150
- // eslint-disable-next-line unicorn/no-process-exit
151
- process.exit(1);
152
- } finally {
153
- // eslint-disable-next-line unicorn/no-process-exit
154
- process.exit(0);
155
181
  }
156
182
  };
157
183
 
184
+ // Процесс завершает Nest (enableShutdownHooks): после своих хуков он повторяет
185
+ // сигнал. process.exit здесь оборвал бы эти хуки, поэтому только останавливаем
186
+ // SDK и снимаем обработчик, чтобы повторный сигнал завершил процесс
187
+ const listener = (signal: NodeJS.Signals): void => {
188
+ if (!sdkShutdown) {
189
+ sdkShutdown = shutdownSdk(signal).then(() => {
190
+ for (const s of signals) process.removeListener(s, listener);
191
+ });
192
+
193
+ if (process.listenerCount(signal) > 1) return;
194
+ }
195
+
196
+ // сигнал повторил Nest раньше, чем остановился SDK, или Nest нет
197
+ void sdkShutdown.then(() => process.kill(process.pid, signal));
198
+ };
199
+
158
200
  for (const signal of signals) {
159
201
  process.on(signal, listener);
160
202
  }
@@ -0,0 +1,9 @@
1
+ import {
2
+ type MetricObjectWithValues,
3
+ type MetricValue,
4
+ type MetricValueWithName,
5
+ } from 'prom-client';
6
+
7
+ export type PromMetricWithValues =
8
+ | MetricObjectWithValues<MetricValue<string>>
9
+ | MetricObjectWithValues<MetricValueWithName<string>>;
@@ -0,0 +1,34 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import { ValueType } from '@opentelemetry/api';
3
+ import type { SumMetricData } from '@opentelemetry/sdk-metrics';
4
+ import {
5
+ AggregationTemporality,
6
+ DataPointType,
7
+ InstrumentType,
8
+ } from '@opentelemetry/sdk-metrics';
9
+
10
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
11
+
12
+ import { toDataPoints } from './data-points';
13
+
14
+ export class CounterConvertor {
15
+ static toOtel(
16
+ promMetrics: PromMetricWithValues,
17
+ startTime: HrTime,
18
+ endTime: HrTime,
19
+ ): SumMetricData {
20
+ return {
21
+ descriptor: {
22
+ name: promMetrics.name,
23
+ description: promMetrics.help,
24
+ unit: '',
25
+ type: InstrumentType.COUNTER,
26
+ valueType: ValueType.DOUBLE,
27
+ },
28
+ dataPoints: toDataPoints(promMetrics.values, startTime, endTime),
29
+ dataPointType: DataPointType.SUM,
30
+ isMonotonic: true,
31
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
32
+ };
33
+ }
34
+ }
@@ -0,0 +1,19 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import type { DataPoint } from '@opentelemetry/sdk-metrics';
3
+ import type { MetricValue } from 'prom-client';
4
+
5
+ // OTLP JSON сериализует NaN и Infinity как null, такие точки отбрасываем
6
+ export function toDataPoints(
7
+ values: readonly MetricValue<string>[],
8
+ startTime: HrTime,
9
+ endTime: HrTime,
10
+ ): DataPoint<number>[] {
11
+ return values
12
+ .filter((v) => Number.isFinite(v.value))
13
+ .map((v) => ({
14
+ attributes: v.labels,
15
+ value: v.value,
16
+ startTime,
17
+ endTime,
18
+ }));
19
+ }
@@ -0,0 +1,33 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import { ValueType } from '@opentelemetry/api';
3
+ import type { GaugeMetricData } from '@opentelemetry/sdk-metrics';
4
+ import {
5
+ AggregationTemporality,
6
+ DataPointType,
7
+ InstrumentType,
8
+ } from '@opentelemetry/sdk-metrics';
9
+
10
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
11
+
12
+ import { toDataPoints } from './data-points';
13
+
14
+ export class GaugeConvertor {
15
+ static toOtel(
16
+ promMetrics: PromMetricWithValues,
17
+ startTime: HrTime,
18
+ endTime: HrTime,
19
+ ): GaugeMetricData {
20
+ return {
21
+ descriptor: {
22
+ name: promMetrics.name,
23
+ description: promMetrics.help,
24
+ unit: '',
25
+ type: InstrumentType.GAUGE,
26
+ valueType: ValueType.DOUBLE,
27
+ },
28
+ dataPoints: toDataPoints(promMetrics.values, startTime, endTime),
29
+ dataPointType: DataPointType.GAUGE,
30
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
31
+ };
32
+ }
33
+ }
@@ -0,0 +1,121 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import { ValueType } from '@opentelemetry/api';
3
+ import type {
4
+ DataPoint,
5
+ Histogram,
6
+ HistogramMetricData,
7
+ } from '@opentelemetry/sdk-metrics';
8
+ import {
9
+ AggregationTemporality,
10
+ DataPointType,
11
+ InstrumentType,
12
+ } from '@opentelemetry/sdk-metrics';
13
+ import type { LabelValues, MetricValueWithName } from 'prom-client';
14
+
15
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
16
+
17
+ const BUCKET_SUFFIX = '_bucket';
18
+ const SUM_SUFFIX = '_sum';
19
+ const COUNT_SUFFIX = '_count';
20
+
21
+ interface Series {
22
+ labels: LabelValues<string>;
23
+ buckets: Map<number, number>;
24
+ sum?: number;
25
+ count?: number;
26
+ }
27
+
28
+ export class HistogramConvertor {
29
+ static toOtel(
30
+ promMetrics: PromMetricWithValues,
31
+ startTime: HrTime,
32
+ endTime: HrTime,
33
+ ): HistogramMetricData {
34
+ // prom-client отдает histogram плоским списком: бакеты с меткой le, _sum и _count
35
+ const seriesByLabels = new Map<string, Series>();
36
+
37
+ for (const rec of promMetrics.values as MetricValueWithName<string>[]) {
38
+ const { le, ...labels } = rec.labels;
39
+ const key = JSON.stringify(labels);
40
+ let series = seriesByLabels.get(key);
41
+
42
+ if (!series) {
43
+ series = { labels, buckets: new Map() };
44
+ seriesByLabels.set(key, series);
45
+ }
46
+
47
+ switch (rec.metricName) {
48
+ case promMetrics.name + BUCKET_SUFFIX: {
49
+ const bound = le === '+Inf' ? Number.POSITIVE_INFINITY : Number(le);
50
+
51
+ if (!Number.isNaN(bound)) series.buckets.set(bound, rec.value);
52
+
53
+ break;
54
+ }
55
+ case promMetrics.name + SUM_SUFFIX:
56
+ series.sum = rec.value;
57
+
58
+ break;
59
+
60
+ case promMetrics.name + COUNT_SUFFIX:
61
+ series.count = rec.value;
62
+
63
+ break;
64
+
65
+ // No default
66
+ }
67
+ }
68
+
69
+ const dataPoints: DataPoint<Histogram>[] = [];
70
+
71
+ for (const series of seriesByLabels.values()) {
72
+ const boundaries = [...series.buckets.keys()]
73
+ .filter((b) => Number.isFinite(b))
74
+ .sort((a, b) => a - b);
75
+
76
+ // в prom-client бакеты кумулятивные, в OTLP нужен счетчик каждого бакета
77
+ const counts: number[] = [];
78
+ let prev = 0;
79
+
80
+ for (const bound of boundaries) {
81
+ const cumulative = series.buckets.get(bound) ?? prev;
82
+
83
+ counts.push(cumulative - prev);
84
+ prev = cumulative;
85
+ }
86
+
87
+ const total =
88
+ series.count ?? series.buckets.get(Number.POSITIVE_INFINITY) ?? prev;
89
+
90
+ counts.push(total - prev);
91
+
92
+ dataPoints.push({
93
+ attributes: series.labels,
94
+ startTime,
95
+ endTime,
96
+ value: {
97
+ count: total,
98
+
99
+ // NaN и Infinity не сериализуются в OTLP JSON
100
+ ...(series.sum !== undefined && Number.isFinite(series.sum)
101
+ ? { sum: series.sum }
102
+ : {}),
103
+ buckets: { boundaries, counts },
104
+ },
105
+ });
106
+ }
107
+
108
+ return {
109
+ descriptor: {
110
+ name: promMetrics.name,
111
+ description: promMetrics.help,
112
+ unit: '',
113
+ type: InstrumentType.HISTOGRAM,
114
+ valueType: ValueType.DOUBLE,
115
+ },
116
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
117
+ dataPointType: DataPointType.HISTOGRAM,
118
+ dataPoints,
119
+ };
120
+ }
121
+ }
@@ -0,0 +1,4 @@
1
+ export * from './counter.convertor';
2
+ export * from './gauge.convertor';
3
+ export * from './histogram.convertor';
4
+ export * from './summary.convertor';
@@ -0,0 +1,86 @@
1
+ import type { HrTime } from '@opentelemetry/api';
2
+ import { ValueType } from '@opentelemetry/api';
3
+ import type {
4
+ GaugeMetricData,
5
+ MetricData,
6
+ SumMetricData,
7
+ } from '@opentelemetry/sdk-metrics';
8
+ import {
9
+ AggregationTemporality,
10
+ DataPointType,
11
+ InstrumentType,
12
+ } from '@opentelemetry/sdk-metrics';
13
+ import type { MetricValue, MetricValueWithName } from 'prom-client';
14
+
15
+ import type { PromMetricWithValues } from '../opentelemetry/prom-metrics.type';
16
+
17
+ import { toDataPoints } from './data-points';
18
+
19
+ // В sdk-metrics нет типа Summary: квантили уходят как gauge, _sum и _count как sum
20
+ export class SummaryConvertor {
21
+ static toOtel(
22
+ promMetrics: PromMetricWithValues,
23
+ startTime: HrTime,
24
+ endTime: HrTime,
25
+ ): MetricData[] {
26
+ // prom-client отдает summary плоским списком: квантили с меткой quantile,
27
+ // а _sum и _count отдельными записями с metricName
28
+ const quantileValues: MetricValue<string>[] = [];
29
+ const sumValues: MetricValue<string>[] = [];
30
+ const countValues: MetricValue<string>[] = [];
31
+
32
+ for (const v of promMetrics.values as MetricValueWithName<string>[]) {
33
+ if (v.metricName === `${promMetrics.name}_sum`) {
34
+ sumValues.push(v);
35
+ } else if (v.metricName === `${promMetrics.name}_count`) {
36
+ countValues.push(v);
37
+ } else {
38
+ quantileValues.push(v);
39
+ }
40
+ }
41
+
42
+ const quantiles: GaugeMetricData = {
43
+ descriptor: {
44
+ name: promMetrics.name,
45
+ description: promMetrics.help,
46
+ unit: '',
47
+ type: InstrumentType.GAUGE,
48
+ valueType: ValueType.DOUBLE,
49
+ },
50
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
51
+ dataPointType: DataPointType.GAUGE,
52
+ dataPoints: toDataPoints(quantileValues, startTime, endTime),
53
+ };
54
+
55
+ // наблюдения могут быть отрицательными, поэтому _sum не монотонный
56
+ const sum: SumMetricData = {
57
+ descriptor: {
58
+ name: `${promMetrics.name}_sum`,
59
+ description: `${promMetrics.help} (sum)`,
60
+ unit: '',
61
+ type: InstrumentType.UP_DOWN_COUNTER,
62
+ valueType: ValueType.DOUBLE,
63
+ },
64
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
65
+ dataPointType: DataPointType.SUM,
66
+ isMonotonic: false,
67
+ dataPoints: toDataPoints(sumValues, startTime, endTime),
68
+ };
69
+
70
+ const count: SumMetricData = {
71
+ descriptor: {
72
+ name: `${promMetrics.name}_count`,
73
+ description: `${promMetrics.help} (count)`,
74
+ unit: '',
75
+ type: InstrumentType.COUNTER,
76
+ valueType: ValueType.DOUBLE,
77
+ },
78
+ aggregationTemporality: AggregationTemporality.CUMULATIVE,
79
+ dataPointType: DataPointType.SUM,
80
+ isMonotonic: true,
81
+ dataPoints: toDataPoints(countValues, startTime, endTime),
82
+ };
83
+
84
+ return [quantiles, sum, count];
85
+ }
86
+ }