@rsdk/cli.cmd.start 5.15.0-next.9 → 5.16.0-next.0
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 +4 -0
- package/dist/opentelemetry/opentelemetry.init.js +19 -13
- package/dist/opentelemetry/opentelemetry.init.js.map +1 -1
- package/dist/opentelemetry/otlp-exporter.d.ts +6 -0
- package/dist/opentelemetry/otlp-exporter.js +21 -0
- package/dist/opentelemetry/otlp-exporter.js.map +1 -0
- package/dist/opentelemetry/propagators.d.ts +5 -0
- package/dist/opentelemetry/propagators.js +34 -0
- package/dist/opentelemetry/propagators.js.map +1 -0
- package/package.json +16 -4
- package/src/opentelemetry/opentelemetry.init.ts +21 -15
- package/src/opentelemetry/otlp-exporter.spec.ts +66 -0
- package/src/opentelemetry/otlp-exporter.ts +28 -0
- package/src/opentelemetry/propagators.spec.ts +67 -0
- package/src/opentelemetry/propagators.ts +35 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [5.15.0](https://github.com/R-Vision/rsdk/compare/v5.15.0-next.14...v5.15.0) (2026-10-30)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/cli.cmd.start
|
|
9
|
+
|
|
6
10
|
## [5.14.1](https://github.com/R-Vision/rsdk/compare/v5.14.1-next.0...v5.14.1) (2026-09-16)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @rsdk/cli.cmd.start
|
|
@@ -5,10 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const api_1 = require("@opentelemetry/api");
|
|
7
7
|
const auto_instrumentations_node_1 = require("@opentelemetry/auto-instrumentations-node");
|
|
8
|
-
const
|
|
8
|
+
const exporter_metrics_otlp_grpc_1 = require("@opentelemetry/exporter-metrics-otlp-grpc");
|
|
9
9
|
const exporter_metrics_otlp_http_1 = require("@opentelemetry/exporter-metrics-otlp-http");
|
|
10
|
+
const exporter_metrics_otlp_proto_1 = require("@opentelemetry/exporter-metrics-otlp-proto");
|
|
11
|
+
const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
|
|
10
12
|
const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
|
|
11
|
-
const
|
|
13
|
+
const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
|
|
12
14
|
const resource_detector_container_1 = require("@opentelemetry/resource-detector-container");
|
|
13
15
|
const resources_1 = require("@opentelemetry/resources");
|
|
14
16
|
const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
|
|
@@ -19,7 +21,9 @@ const node_http_1 = require("node:http");
|
|
|
19
21
|
const node_path_1 = __importDefault(require("node:path"));
|
|
20
22
|
const node_process_1 = require("node:process");
|
|
21
23
|
const exporter_1 = require("./exporter");
|
|
24
|
+
const otlp_exporter_1 = require("./otlp-exporter");
|
|
22
25
|
const profiling_context_manager_1 = require("./profiling.context-manager");
|
|
26
|
+
const propagators_1 = require("./propagators");
|
|
23
27
|
const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
|
|
24
28
|
if (otelDiagLogLevel) {
|
|
25
29
|
console.log('telemetry diag enabled:', otelDiagLogLevel);
|
|
@@ -90,14 +94,7 @@ const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoIn
|
|
|
90
94
|
const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
|
|
91
95
|
// без него transport отправляет логи с service.name=unknown_service
|
|
92
96
|
process.env.LOG_OTEL_SERVICE_NAME ??= otelServiceName;
|
|
93
|
-
|
|
94
|
-
propagators: [
|
|
95
|
-
new propagator_b3_1.B3Propagator(),
|
|
96
|
-
new propagator_b3_1.B3Propagator({
|
|
97
|
-
injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
|
|
98
|
-
}),
|
|
99
|
-
],
|
|
100
|
-
});
|
|
97
|
+
(0, propagators_1.normalizePropagatorsEnv)(process.env);
|
|
101
98
|
const resource = new resources_1.Resource({
|
|
102
99
|
[semantic_conventions_1.ATTR_SERVICE_NAME]: otelServiceName,
|
|
103
100
|
[semantic_conventions_1.ATTR_SERVICE_VERSION]: manifestData.version,
|
|
@@ -115,8 +112,18 @@ const appMetricsRegistry = () => {
|
|
|
115
112
|
const envMillis = (name) => Number.parseInt(process.env[name] ?? '') || undefined;
|
|
116
113
|
const exportIntervalMillis = envMillis('OTEL_METRIC_EXPORT_INTERVAL');
|
|
117
114
|
const exportTimeoutMillis = envMillis('OTEL_METRIC_EXPORT_TIMEOUT');
|
|
118
|
-
|
|
119
|
-
|
|
115
|
+
// exporter метрик NodeSDK выбирает по протоколу только для своего reader'а, а наш
|
|
116
|
+
// создан вручную. Exporter трейсов выбирается тем же кодом
|
|
117
|
+
const traceExporter = (0, otlp_exporter_1.otlpExporter)('TRACES', {
|
|
118
|
+
grpc: exporter_trace_otlp_grpc_1.OTLPTraceExporter,
|
|
119
|
+
'http/json': exporter_trace_otlp_http_1.OTLPTraceExporter,
|
|
120
|
+
'http/protobuf': exporter_trace_otlp_proto_1.OTLPTraceExporter,
|
|
121
|
+
});
|
|
122
|
+
const metricExporter = (0, otlp_exporter_1.otlpExporter)('METRICS', {
|
|
123
|
+
grpc: exporter_metrics_otlp_grpc_1.OTLPMetricExporter,
|
|
124
|
+
'http/json': exporter_metrics_otlp_http_1.OTLPMetricExporter,
|
|
125
|
+
'http/protobuf': exporter_metrics_otlp_proto_1.OTLPMetricExporter,
|
|
126
|
+
});
|
|
120
127
|
const metricReader = new sdk_metrics_1.PeriodicExportingMetricReader({
|
|
121
128
|
exporter: metricExporter,
|
|
122
129
|
...(exportIntervalMillis === undefined ? {} : { exportIntervalMillis }),
|
|
@@ -132,7 +139,6 @@ const sdk = new sdk_node_1.NodeSDK({
|
|
|
132
139
|
resource,
|
|
133
140
|
traceExporter,
|
|
134
141
|
metricReader,
|
|
135
|
-
textMapPropagator,
|
|
136
142
|
...(contextManager && { contextManager }),
|
|
137
143
|
resourceDetectors: [
|
|
138
144
|
resource_detector_container_1.containerDetector,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opentelemetry.init.js","sourceRoot":"","sources":["../../src/opentelemetry/opentelemetry.init.ts"],"names":[],"mappings":";;;;;AAEA,4CAA2E;AAC3E,0FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"opentelemetry.init.js","sourceRoot":"","sources":["../../src/opentelemetry/opentelemetry.init.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export type OtlpProtocol = 'grpc' | 'http/json' | 'http/protobuf';
|
|
2
|
+
/**
|
|
3
|
+
* Exporter сигнала по OTEL_EXPORTER_OTLP_<SIGNAL>_PROTOCOL или
|
|
4
|
+
* OTEL_EXPORTER_OTLP_PROTOCOL, как в спецификации OpenTelemetry
|
|
5
|
+
*/
|
|
6
|
+
export declare const otlpExporter: <T>(signal: "TRACES" | "METRICS", exporters: Record<OtlpProtocol, new () => T>) => T;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.otlpExporter = void 0;
|
|
4
|
+
const DEFAULT_PROTOCOL = 'http/protobuf';
|
|
5
|
+
/**
|
|
6
|
+
* Exporter сигнала по OTEL_EXPORTER_OTLP_<SIGNAL>_PROTOCOL или
|
|
7
|
+
* OTEL_EXPORTER_OTLP_PROTOCOL, как в спецификации OpenTelemetry
|
|
8
|
+
*/
|
|
9
|
+
const otlpExporter = (signal, exporters) => {
|
|
10
|
+
const protocol = process.env[`OTEL_EXPORTER_OTLP_${signal}_PROTOCOL`]?.trim() ||
|
|
11
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL?.trim() ||
|
|
12
|
+
DEFAULT_PROTOCOL;
|
|
13
|
+
if (!Object.hasOwn(exporters, protocol)) {
|
|
14
|
+
// diag без OTEL_DIAG_LOG_LEVEL молчит, а опечатку в протоколе надо увидеть
|
|
15
|
+
console.warn(`Unsupported OTLP protocol for ${signal.toLowerCase()}: ${protocol}. Using ${DEFAULT_PROTOCOL}`);
|
|
16
|
+
return new exporters[DEFAULT_PROTOCOL]();
|
|
17
|
+
}
|
|
18
|
+
return new exporters[protocol]();
|
|
19
|
+
};
|
|
20
|
+
exports.otlpExporter = otlpExporter;
|
|
21
|
+
//# sourceMappingURL=otlp-exporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otlp-exporter.js","sourceRoot":"","sources":["../../src/opentelemetry/otlp-exporter.ts"],"names":[],"mappings":";;;AAEA,MAAM,gBAAgB,GAAiB,eAAe,CAAC;AAEvD;;;GAGG;AACI,MAAM,YAAY,GAAG,CAC1B,MAA4B,EAC5B,SAA4C,EACzC,EAAE;IACL,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,sBAAsB,MAAM,WAAW,CAAC,EAAE,IAAI,EAAE;QAC5D,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE;QAC/C,gBAAgB,CAAC;IAEnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;QACxC,2EAA2E;QAC3E,OAAO,CAAC,IAAI,CACV,iCAAiC,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,WAAW,gBAAgB,EAAE,CAChG,CAAC;QAEF,OAAO,IAAI,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,IAAI,SAAS,CAAC,QAAwB,CAAC,EAAE,CAAC;AACnD,CAAC,CAAC;AAnBW,QAAA,YAAY,gBAmBvB"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizePropagatorsEnv = void 0;
|
|
4
|
+
// что NodeTracerProvider собирает из OTEL_PROPAGATORS, и none из спецификации
|
|
5
|
+
const KNOWN_PROPAGATORS = [
|
|
6
|
+
'tracecontext',
|
|
7
|
+
'baggage',
|
|
8
|
+
'b3',
|
|
9
|
+
'b3multi',
|
|
10
|
+
'jaeger',
|
|
11
|
+
'none',
|
|
12
|
+
];
|
|
13
|
+
/**
|
|
14
|
+
* Готовит OTEL_PROPAGATORS для SDK. Ошибки в значении SDK пишет только в diag,
|
|
15
|
+
* а без OTEL_DIAG_LOG_LEVEL он молчит, и контекст трейса пропадает незаметно
|
|
16
|
+
*/
|
|
17
|
+
const normalizePropagatorsEnv = (env) => {
|
|
18
|
+
const names = (env.OTEL_PROPAGATORS ?? '')
|
|
19
|
+
.split(',')
|
|
20
|
+
.map((name) => name.trim())
|
|
21
|
+
.filter(Boolean);
|
|
22
|
+
// пустой OTEL_PROPAGATORS SDK читает как список из '' и не передаёт контекст вовсе,
|
|
23
|
+
// а по спецификации пустое значение равно незаданному
|
|
24
|
+
if (names.length === 0) {
|
|
25
|
+
delete env.OTEL_PROPAGATORS;
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const unknown = names.filter((name) => !KNOWN_PROPAGATORS.includes(name));
|
|
29
|
+
if (unknown.length > 0) {
|
|
30
|
+
console.warn(`Unsupported OTEL_PROPAGATORS values: ${unknown.join(', ')}. Supported: ${KNOWN_PROPAGATORS.join(', ')}`);
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
exports.normalizePropagatorsEnv = normalizePropagatorsEnv;
|
|
34
|
+
//# sourceMappingURL=propagators.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"propagators.js","sourceRoot":"","sources":["../../src/opentelemetry/propagators.ts"],"names":[],"mappings":";;;AAAA,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG;IACxB,cAAc;IACd,SAAS;IACT,IAAI;IACJ,SAAS;IACT,QAAQ;IACR,MAAM;CACP,CAAC;AAEF;;;GAGG;AACI,MAAM,uBAAuB,GAAG,CAAC,GAAsB,EAAQ,EAAE;IACtE,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACvC,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,oFAAoF;IACpF,sDAAsD;IACtD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAC,gBAAgB,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAE1E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,CACV,wCAAwC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzG,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AApBW,QAAA,uBAAuB,2BAoBlC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/cli.cmd.start",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.16.0-next.0",
|
|
4
4
|
"description": "Start command for rsdk cli",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -26,9 +26,12 @@
|
|
|
26
26
|
"@opentelemetry/api": "^1.9.0",
|
|
27
27
|
"@opentelemetry/auto-instrumentations-node": "^0.56.1",
|
|
28
28
|
"@opentelemetry/core": "^1.30.1",
|
|
29
|
+
"@opentelemetry/exporter-metrics-otlp-grpc": "^0.57.2",
|
|
29
30
|
"@opentelemetry/exporter-metrics-otlp-http": "^0.57.2",
|
|
31
|
+
"@opentelemetry/exporter-metrics-otlp-proto": "^0.57.2",
|
|
32
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "^0.57.2",
|
|
30
33
|
"@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
|
|
31
|
-
"@opentelemetry/
|
|
34
|
+
"@opentelemetry/exporter-trace-otlp-proto": "^0.57.2",
|
|
32
35
|
"@opentelemetry/resource-detector-container": "^0.6.1",
|
|
33
36
|
"@opentelemetry/resources": "^1.30.1",
|
|
34
37
|
"@opentelemetry/sdk-metrics": "^1.30.1",
|
|
@@ -54,13 +57,22 @@
|
|
|
54
57
|
"@opentelemetry/core": {
|
|
55
58
|
"optional": true
|
|
56
59
|
},
|
|
60
|
+
"@opentelemetry/exporter-metrics-otlp-grpc": {
|
|
61
|
+
"optional": true
|
|
62
|
+
},
|
|
57
63
|
"@opentelemetry/exporter-metrics-otlp-http": {
|
|
58
64
|
"optional": true
|
|
59
65
|
},
|
|
66
|
+
"@opentelemetry/exporter-metrics-otlp-proto": {
|
|
67
|
+
"optional": true
|
|
68
|
+
},
|
|
69
|
+
"@opentelemetry/exporter-trace-otlp-grpc": {
|
|
70
|
+
"optional": true
|
|
71
|
+
},
|
|
60
72
|
"@opentelemetry/exporter-trace-otlp-http": {
|
|
61
73
|
"optional": true
|
|
62
74
|
},
|
|
63
|
-
"@opentelemetry/
|
|
75
|
+
"@opentelemetry/exporter-trace-otlp-proto": {
|
|
64
76
|
"optional": true
|
|
65
77
|
},
|
|
66
78
|
"@opentelemetry/resource-detector-container": {
|
|
@@ -85,5 +97,5 @@
|
|
|
85
97
|
"optional": true
|
|
86
98
|
}
|
|
87
99
|
},
|
|
88
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "3a41021e6309c074bb5d7df283209e2df1c13c41"
|
|
89
101
|
}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
import type { Span } from '@opentelemetry/api';
|
|
3
3
|
import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api';
|
|
4
4
|
import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
|
|
5
|
-
import {
|
|
6
|
-
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
5
|
+
import { OTLPMetricExporter as GrpcMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
|
|
6
|
+
import { OTLPMetricExporter as JsonMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
|
|
7
|
+
import { OTLPMetricExporter as ProtobufMetricExporter } from '@opentelemetry/exporter-metrics-otlp-proto';
|
|
8
|
+
import { OTLPTraceExporter as GrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
|
|
9
|
+
import { OTLPTraceExporter as JsonTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
10
|
+
import { OTLPTraceExporter as ProtobufTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
|
|
9
11
|
import { containerDetector } from '@opentelemetry/resource-detector-container';
|
|
10
12
|
import {
|
|
11
13
|
envDetector,
|
|
@@ -27,7 +29,9 @@ import { cwd } from 'node:process';
|
|
|
27
29
|
import type { Registry } from 'prom-client';
|
|
28
30
|
|
|
29
31
|
import { PromClientMetricProducer } from './exporter';
|
|
32
|
+
import { otlpExporter } from './otlp-exporter';
|
|
30
33
|
import { createProfilingContextManager } from './profiling.context-manager';
|
|
34
|
+
import { normalizePropagatorsEnv } from './propagators';
|
|
31
35
|
|
|
32
36
|
const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
|
|
33
37
|
if (otelDiagLogLevel) {
|
|
@@ -110,14 +114,7 @@ const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
|
|
|
110
114
|
// без него transport отправляет логи с service.name=unknown_service
|
|
111
115
|
process.env.LOG_OTEL_SERVICE_NAME ??= otelServiceName;
|
|
112
116
|
|
|
113
|
-
|
|
114
|
-
propagators: [
|
|
115
|
-
new B3Propagator(),
|
|
116
|
-
new B3Propagator({
|
|
117
|
-
injectEncoding: B3InjectEncoding.MULTI_HEADER,
|
|
118
|
-
}),
|
|
119
|
-
],
|
|
120
|
-
});
|
|
117
|
+
normalizePropagatorsEnv(process.env);
|
|
121
118
|
|
|
122
119
|
const resource = new Resource({
|
|
123
120
|
[ATTR_SERVICE_NAME]: otelServiceName,
|
|
@@ -141,8 +138,18 @@ const envMillis = (name: string): number | undefined =>
|
|
|
141
138
|
const exportIntervalMillis = envMillis('OTEL_METRIC_EXPORT_INTERVAL');
|
|
142
139
|
const exportTimeoutMillis = envMillis('OTEL_METRIC_EXPORT_TIMEOUT');
|
|
143
140
|
|
|
144
|
-
|
|
145
|
-
|
|
141
|
+
// exporter метрик NodeSDK выбирает по протоколу только для своего reader'а, а наш
|
|
142
|
+
// создан вручную. Exporter трейсов выбирается тем же кодом
|
|
143
|
+
const traceExporter = otlpExporter('TRACES', {
|
|
144
|
+
grpc: GrpcTraceExporter,
|
|
145
|
+
'http/json': JsonTraceExporter,
|
|
146
|
+
'http/protobuf': ProtobufTraceExporter,
|
|
147
|
+
});
|
|
148
|
+
const metricExporter = otlpExporter('METRICS', {
|
|
149
|
+
grpc: GrpcMetricExporter,
|
|
150
|
+
'http/json': JsonMetricExporter,
|
|
151
|
+
'http/protobuf': ProtobufMetricExporter,
|
|
152
|
+
});
|
|
146
153
|
const metricReader = new PeriodicExportingMetricReader({
|
|
147
154
|
exporter: metricExporter,
|
|
148
155
|
...(exportIntervalMillis === undefined ? {} : { exportIntervalMillis }),
|
|
@@ -160,7 +167,6 @@ const sdk = new NodeSDK({
|
|
|
160
167
|
resource,
|
|
161
168
|
traceExporter,
|
|
162
169
|
metricReader,
|
|
163
|
-
textMapPropagator,
|
|
164
170
|
...(contextManager && { contextManager }),
|
|
165
171
|
resourceDetectors: [
|
|
166
172
|
containerDetector,
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { otlpExporter } from './otlp-exporter';
|
|
2
|
+
|
|
3
|
+
class GrpcExporter {}
|
|
4
|
+
class JsonExporter {}
|
|
5
|
+
class ProtobufExporter {}
|
|
6
|
+
|
|
7
|
+
const exporters = {
|
|
8
|
+
grpc: GrpcExporter,
|
|
9
|
+
'http/json': JsonExporter,
|
|
10
|
+
'http/protobuf': ProtobufExporter,
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
describe('otlpExporter', () => {
|
|
14
|
+
const env = { ...process.env };
|
|
15
|
+
|
|
16
|
+
afterEach(() => {
|
|
17
|
+
process.env = { ...env };
|
|
18
|
+
jest.restoreAllMocks();
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it('uses http/protobuf by default', () => {
|
|
22
|
+
delete process.env.OTEL_EXPORTER_OTLP_PROTOCOL;
|
|
23
|
+
delete process.env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL;
|
|
24
|
+
|
|
25
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(ProtobufExporter);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it('takes protocol from OTEL_EXPORTER_OTLP_PROTOCOL', () => {
|
|
29
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'grpc';
|
|
30
|
+
|
|
31
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(GrpcExporter);
|
|
32
|
+
expect(otlpExporter('METRICS', exporters)).toBeInstanceOf(GrpcExporter);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
it('prefers the signal variable over the common one', () => {
|
|
36
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'grpc';
|
|
37
|
+
process.env.OTEL_EXPORTER_OTLP_METRICS_PROTOCOL = 'http/json';
|
|
38
|
+
|
|
39
|
+
expect(otlpExporter('METRICS', exporters)).toBeInstanceOf(JsonExporter);
|
|
40
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(GrpcExporter);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it('treats blank values as unset', () => {
|
|
44
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'http/json';
|
|
45
|
+
process.env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = ' ';
|
|
46
|
+
|
|
47
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(JsonExporter);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it('falls back to http/protobuf with a warning on unknown protocol', () => {
|
|
51
|
+
const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
|
|
52
|
+
process.env.OTEL_EXPORTER_OTLP_TRACES_PROTOCOL = 'http';
|
|
53
|
+
|
|
54
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(ProtobufExporter);
|
|
55
|
+
expect(warn).toHaveBeenCalledWith(
|
|
56
|
+
'Unsupported OTLP protocol for traces: http. Using http/protobuf',
|
|
57
|
+
);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('does not take protocol from inherited object keys', () => {
|
|
61
|
+
jest.spyOn(console, 'warn').mockImplementation(() => {});
|
|
62
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL = 'constructor';
|
|
63
|
+
|
|
64
|
+
expect(otlpExporter('TRACES', exporters)).toBeInstanceOf(ProtobufExporter);
|
|
65
|
+
});
|
|
66
|
+
});
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export type OtlpProtocol = 'grpc' | 'http/json' | 'http/protobuf';
|
|
2
|
+
|
|
3
|
+
const DEFAULT_PROTOCOL: OtlpProtocol = 'http/protobuf';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Exporter сигнала по OTEL_EXPORTER_OTLP_<SIGNAL>_PROTOCOL или
|
|
7
|
+
* OTEL_EXPORTER_OTLP_PROTOCOL, как в спецификации OpenTelemetry
|
|
8
|
+
*/
|
|
9
|
+
export const otlpExporter = <T>(
|
|
10
|
+
signal: 'TRACES' | 'METRICS',
|
|
11
|
+
exporters: Record<OtlpProtocol, new () => T>,
|
|
12
|
+
): T => {
|
|
13
|
+
const protocol =
|
|
14
|
+
process.env[`OTEL_EXPORTER_OTLP_${signal}_PROTOCOL`]?.trim() ||
|
|
15
|
+
process.env.OTEL_EXPORTER_OTLP_PROTOCOL?.trim() ||
|
|
16
|
+
DEFAULT_PROTOCOL;
|
|
17
|
+
|
|
18
|
+
if (!Object.hasOwn(exporters, protocol)) {
|
|
19
|
+
// diag без OTEL_DIAG_LOG_LEVEL молчит, а опечатку в протоколе надо увидеть
|
|
20
|
+
console.warn(
|
|
21
|
+
`Unsupported OTLP protocol for ${signal.toLowerCase()}: ${protocol}. Using ${DEFAULT_PROTOCOL}`,
|
|
22
|
+
);
|
|
23
|
+
|
|
24
|
+
return new exporters[DEFAULT_PROTOCOL]();
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
return new exporters[protocol as OtlpProtocol]();
|
|
28
|
+
};
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { normalizePropagatorsEnv } from './propagators';
|
|
2
|
+
|
|
3
|
+
describe('normalizePropagatorsEnv', () => {
|
|
4
|
+
let warn: jest.SpyInstance;
|
|
5
|
+
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
afterEach(() => {
|
|
11
|
+
jest.restoreAllMocks();
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
it.each(['', ' ', ' , '])('treats %j as unset', (value) => {
|
|
15
|
+
const env: NodeJS.ProcessEnv = { OTEL_PROPAGATORS: value };
|
|
16
|
+
|
|
17
|
+
normalizePropagatorsEnv(env);
|
|
18
|
+
|
|
19
|
+
expect(env).not.toHaveProperty('OTEL_PROPAGATORS');
|
|
20
|
+
expect(warn).not.toHaveBeenCalled();
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it('leaves unset variable as is', () => {
|
|
24
|
+
const env: NodeJS.ProcessEnv = {};
|
|
25
|
+
|
|
26
|
+
normalizePropagatorsEnv(env);
|
|
27
|
+
|
|
28
|
+
expect(env).toEqual({});
|
|
29
|
+
expect(warn).not.toHaveBeenCalled();
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('accepts supported values without warning', () => {
|
|
33
|
+
const env: NodeJS.ProcessEnv = {
|
|
34
|
+
OTEL_PROPAGATORS: 'tracecontext, baggage,b3,b3multi,jaeger',
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
normalizePropagatorsEnv(env);
|
|
38
|
+
|
|
39
|
+
expect(env.OTEL_PROPAGATORS).toBe(
|
|
40
|
+
'tracecontext, baggage,b3,b3multi,jaeger',
|
|
41
|
+
);
|
|
42
|
+
expect(warn).not.toHaveBeenCalled();
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it('accepts none', () => {
|
|
46
|
+
normalizePropagatorsEnv({ OTEL_PROPAGATORS: 'none' });
|
|
47
|
+
|
|
48
|
+
expect(warn).not.toHaveBeenCalled();
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it('warns about unknown values only', () => {
|
|
52
|
+
normalizePropagatorsEnv({ OTEL_PROPAGATORS: 'tracecontext,b3mutli,W3C' });
|
|
53
|
+
|
|
54
|
+
expect(warn).toHaveBeenCalledTimes(1);
|
|
55
|
+
expect(warn).toHaveBeenCalledWith(
|
|
56
|
+
'Unsupported OTEL_PROPAGATORS values: b3mutli, W3C. Supported: tracecontext, baggage, b3, b3multi, jaeger, none',
|
|
57
|
+
);
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
it('treats values as case-sensitive like the SDK', () => {
|
|
61
|
+
normalizePropagatorsEnv({ OTEL_PROPAGATORS: 'TraceContext' });
|
|
62
|
+
|
|
63
|
+
expect(warn).toHaveBeenCalledWith(
|
|
64
|
+
expect.stringContaining('values: TraceContext.'),
|
|
65
|
+
);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
// что NodeTracerProvider собирает из OTEL_PROPAGATORS, и none из спецификации
|
|
2
|
+
const KNOWN_PROPAGATORS = [
|
|
3
|
+
'tracecontext',
|
|
4
|
+
'baggage',
|
|
5
|
+
'b3',
|
|
6
|
+
'b3multi',
|
|
7
|
+
'jaeger',
|
|
8
|
+
'none',
|
|
9
|
+
];
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Готовит OTEL_PROPAGATORS для SDK. Ошибки в значении SDK пишет только в diag,
|
|
13
|
+
* а без OTEL_DIAG_LOG_LEVEL он молчит, и контекст трейса пропадает незаметно
|
|
14
|
+
*/
|
|
15
|
+
export const normalizePropagatorsEnv = (env: NodeJS.ProcessEnv): void => {
|
|
16
|
+
const names = (env.OTEL_PROPAGATORS ?? '')
|
|
17
|
+
.split(',')
|
|
18
|
+
.map((name) => name.trim())
|
|
19
|
+
.filter(Boolean);
|
|
20
|
+
|
|
21
|
+
// пустой OTEL_PROPAGATORS SDK читает как список из '' и не передаёт контекст вовсе,
|
|
22
|
+
// а по спецификации пустое значение равно незаданному
|
|
23
|
+
if (names.length === 0) {
|
|
24
|
+
delete env.OTEL_PROPAGATORS;
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const unknown = names.filter((name) => !KNOWN_PROPAGATORS.includes(name));
|
|
29
|
+
|
|
30
|
+
if (unknown.length > 0) {
|
|
31
|
+
console.warn(
|
|
32
|
+
`Unsupported OTEL_PROPAGATORS values: ${unknown.join(', ')}. Supported: ${KNOWN_PROPAGATORS.join(', ')}`,
|
|
33
|
+
);
|
|
34
|
+
}
|
|
35
|
+
};
|