@rsdk/cli.cmd.start 5.16.0 → 5.17.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.
|
@@ -11,6 +11,8 @@ const exporter_metrics_otlp_proto_1 = require("@opentelemetry/exporter-metrics-o
|
|
|
11
11
|
const exporter_trace_otlp_grpc_1 = require("@opentelemetry/exporter-trace-otlp-grpc");
|
|
12
12
|
const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
|
|
13
13
|
const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
|
|
14
|
+
const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
|
|
15
|
+
const instrumentation_nestjs_core_1 = require("@opentelemetry/instrumentation-nestjs-core");
|
|
14
16
|
const resource_detector_container_1 = require("@opentelemetry/resource-detector-container");
|
|
15
17
|
const resources_1 = require("@opentelemetry/resources");
|
|
16
18
|
const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
|
|
@@ -87,8 +89,13 @@ const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoIn
|
|
|
87
89
|
'@opentelemetry/instrumentation-grpc': {
|
|
88
90
|
enabled: true,
|
|
89
91
|
},
|
|
92
|
+
// Версии из auto-instrumentations не поддерживают Nest 11 и Express 5,
|
|
93
|
+
// поэтому эти две подключаются отдельно ниже
|
|
90
94
|
'@opentelemetry/instrumentation-nestjs-core': {
|
|
91
|
-
enabled:
|
|
95
|
+
enabled: false,
|
|
96
|
+
},
|
|
97
|
+
'@opentelemetry/instrumentation-express': {
|
|
98
|
+
enabled: false,
|
|
92
99
|
},
|
|
93
100
|
});
|
|
94
101
|
const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
|
|
@@ -135,7 +142,11 @@ const metricReader = new sdk_metrics_1.PeriodicExportingMetricReader({
|
|
|
135
142
|
const contextManager = (0, profiling_context_manager_1.createProfilingContextManager)();
|
|
136
143
|
const sdk = new sdk_node_1.NodeSDK({
|
|
137
144
|
serviceName: otelServiceName,
|
|
138
|
-
instrumentations: [
|
|
145
|
+
instrumentations: [
|
|
146
|
+
autoInstumentationOptions,
|
|
147
|
+
new instrumentation_nestjs_core_1.NestInstrumentation(),
|
|
148
|
+
new instrumentation_express_1.ExpressInstrumentation(),
|
|
149
|
+
],
|
|
139
150
|
resource,
|
|
140
151
|
traceExporter,
|
|
141
152
|
metricReader,
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/cli.cmd.start",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.17.0-next.0",
|
|
4
4
|
"description": "Start command for rsdk cli",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -15,14 +15,16 @@
|
|
|
15
15
|
],
|
|
16
16
|
"license": "Apache License 2.0",
|
|
17
17
|
"dependencies": {
|
|
18
|
+
"@opentelemetry/instrumentation-express": "^0.49.0",
|
|
19
|
+
"@opentelemetry/instrumentation-nestjs-core": "^0.46.0",
|
|
18
20
|
"commander": "^12.1.0",
|
|
19
21
|
"dotenv": "^16.0.0",
|
|
20
22
|
"execa": "^5.1.1",
|
|
21
23
|
"yaml": "^2.7.0"
|
|
22
24
|
},
|
|
23
25
|
"peerDependencies": {
|
|
24
|
-
"@nestjs/common": "^
|
|
25
|
-
"@nestjs/core": "^
|
|
26
|
+
"@nestjs/common": "^11.2.9",
|
|
27
|
+
"@nestjs/core": "^11.2.9",
|
|
26
28
|
"@opentelemetry/api": "^1.9.0",
|
|
27
29
|
"@opentelemetry/auto-instrumentations-node": "^0.56.1",
|
|
28
30
|
"@opentelemetry/core": "^1.30.1",
|
|
@@ -97,5 +99,5 @@
|
|
|
97
99
|
"optional": true
|
|
98
100
|
}
|
|
99
101
|
},
|
|
100
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "c65206299ce1f0f1e209bb936721a1537bc4a064"
|
|
101
103
|
}
|
|
@@ -8,6 +8,8 @@ import { OTLPMetricExporter as ProtobufMetricExporter } from '@opentelemetry/exp
|
|
|
8
8
|
import { OTLPTraceExporter as GrpcTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
|
|
9
9
|
import { OTLPTraceExporter as JsonTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
10
10
|
import { OTLPTraceExporter as ProtobufTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
|
|
11
|
+
import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
|
|
12
|
+
import { NestInstrumentation } from '@opentelemetry/instrumentation-nestjs-core';
|
|
11
13
|
import { containerDetector } from '@opentelemetry/resource-detector-container';
|
|
12
14
|
import {
|
|
13
15
|
envDetector,
|
|
@@ -104,8 +106,14 @@ const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
|
|
|
104
106
|
'@opentelemetry/instrumentation-grpc': {
|
|
105
107
|
enabled: true,
|
|
106
108
|
},
|
|
109
|
+
|
|
110
|
+
// Версии из auto-instrumentations не поддерживают Nest 11 и Express 5,
|
|
111
|
+
// поэтому эти две подключаются отдельно ниже
|
|
107
112
|
'@opentelemetry/instrumentation-nestjs-core': {
|
|
108
|
-
enabled:
|
|
113
|
+
enabled: false,
|
|
114
|
+
},
|
|
115
|
+
'@opentelemetry/instrumentation-express': {
|
|
116
|
+
enabled: false,
|
|
109
117
|
},
|
|
110
118
|
});
|
|
111
119
|
|
|
@@ -163,7 +171,11 @@ const contextManager = createProfilingContextManager();
|
|
|
163
171
|
|
|
164
172
|
const sdk = new NodeSDK({
|
|
165
173
|
serviceName: otelServiceName,
|
|
166
|
-
instrumentations: [
|
|
174
|
+
instrumentations: [
|
|
175
|
+
autoInstumentationOptions,
|
|
176
|
+
new NestInstrumentation(),
|
|
177
|
+
new ExpressInstrumentation(),
|
|
178
|
+
],
|
|
167
179
|
resource,
|
|
168
180
|
traceExporter,
|
|
169
181
|
metricReader,
|