@rsdk/cli.cmd.start 5.1.0 → 5.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 CHANGED
@@ -3,6 +3,18 @@
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.2.0-next.1](https://github.com/R-Vision/rsdk/compare/v5.2.0-next.0...v5.2.0-next.1) (2024-10-09)
7
+
8
+ ### Features
9
+
10
+ * **core:** opentelemetry metrics exporting support [PFM-1888] ([a1114ff](https://github.com/R-Vision/rsdk/commit/a1114ff867136acbe5ca83df01a273c8d00a0cd3))
11
+
12
+ ## [5.2.0-next.0](https://github.com/R-Vision/rsdk/compare/v5.1.0...v5.2.0-next.0) (2024-10-09)
13
+
14
+ ### Features
15
+
16
+ * **core:** opentelemetry logs exporting support [PFM-1892] ([#292](https://github.com/R-Vision/rsdk/issues/292)) ([6db5304](https://github.com/R-Vision/rsdk/commit/6db53049fd61b1307d685ec9f2684c2291257c29))
17
+
6
18
  ## [5.1.0](https://github.com/R-Vision/rsdk/compare/v5.1.0-next.0...v5.1.0) (2024-09-03)
7
19
 
8
20
  **Note:** Version bump only for package @rsdk/cli.cmd.start
@@ -1,16 +1,21 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  const api_1 = require("@opentelemetry/api");
4
7
  const auto_instrumentations_node_1 = require("@opentelemetry/auto-instrumentations-node");
5
8
  const core_1 = require("@opentelemetry/core");
9
+ const exporter_metrics_otlp_http_1 = require("@opentelemetry/exporter-metrics-otlp-http");
6
10
  const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
7
11
  const propagator_b3_1 = require("@opentelemetry/propagator-b3");
8
12
  const resource_detector_container_1 = require("@opentelemetry/resource-detector-container");
9
13
  const resources_1 = require("@opentelemetry/resources");
14
+ const sdk_metrics_1 = require("@opentelemetry/sdk-metrics");
10
15
  const sdk_node_1 = require("@opentelemetry/sdk-node");
11
16
  const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
12
17
  const node_http_1 = require("node:http");
13
- const node_path_1 = require("node:path");
18
+ const node_path_1 = __importDefault(require("node:path"));
14
19
  const node_process_1 = require("node:process");
15
20
  const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
16
21
  if (otelDiagLogLevel) {
@@ -23,7 +28,7 @@ else {
23
28
  console.log('telemetry debug disabled');
24
29
  }
25
30
  // eslint-disable-next-line @typescript-eslint/no-var-requires
26
- const manifestData = require((0, node_path_1.resolve)((0, node_process_1.cwd)(), 'package.json'));
31
+ const manifestData = require(node_path_1.default.resolve((0, node_process_1.cwd)(), 'package.json'));
27
32
  const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoInstrumentations)({
28
33
  '@opentelemetry/instrumentation-fs': {
29
34
  // only instrument fs if it is part of another trace
@@ -77,24 +82,31 @@ const autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoIn
77
82
  enabled: true,
78
83
  },
79
84
  });
80
- const exporter = new exporter_trace_otlp_http_1.OTLPTraceExporter();
81
85
  const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
86
+ const textMapPropagator = new core_1.CompositePropagator({
87
+ propagators: [
88
+ new propagator_b3_1.B3Propagator(),
89
+ new propagator_b3_1.B3Propagator({
90
+ injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
91
+ }),
92
+ ],
93
+ });
94
+ const resource = new resources_1.Resource({
95
+ [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: otelServiceName,
96
+ [semantic_conventions_1.SemanticResourceAttributes.SERVICE_VERSION]: manifestData.version,
97
+ });
98
+ const traceExporter = new exporter_trace_otlp_http_1.OTLPTraceExporter();
99
+ const metricExporter = new exporter_metrics_otlp_http_1.OTLPMetricExporter();
100
+ const metricReader = new sdk_metrics_1.PeriodicExportingMetricReader({
101
+ exporter: metricExporter,
102
+ });
82
103
  const sdk = new sdk_node_1.NodeSDK({
83
104
  serviceName: otelServiceName,
84
105
  instrumentations: [autoInstumentationOptions],
85
- resource: new resources_1.Resource({
86
- [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: otelServiceName,
87
- [semantic_conventions_1.SemanticResourceAttributes.SERVICE_VERSION]: manifestData.version,
88
- }),
89
- traceExporter: exporter,
90
- textMapPropagator: new core_1.CompositePropagator({
91
- propagators: [
92
- new propagator_b3_1.B3Propagator(),
93
- new propagator_b3_1.B3Propagator({
94
- injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
95
- }),
96
- ],
97
- }),
106
+ resource,
107
+ traceExporter,
108
+ metricReader,
109
+ textMapPropagator,
98
110
  resourceDetectors: [
99
111
  resource_detector_container_1.containerDetector,
100
112
  resources_1.envDetector,
@@ -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":";;;;;AAEA,4CAA2E;AAC3E,0FAAwF;AACxF,8CAA0D;AAC1D,0FAA+E;AAC/E,sFAA4E;AAC5E,gEAA8E;AAC9E,4FAA+E;AAC/E,wDAMkC;AAClC,4DAA2E;AAC3E,sDAAkD;AAClD,8EAAiF;AACjF,yCAA2D;AAC3D,0DAA6B;AAC7B,+CAAmC;AAEnC,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;AACzD,IAAI,gBAAgB,EAAE,CAAC;IACrB,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,CAAC;IACzD,UAAI,CAAC,SAAS,CACZ,IAAI,uBAAiB,EAAE;IACvB,wBAAwB;IACxB,kBAAY,CAAC,gBAAgB,CAAC,CAC/B,CAAC;AACJ,CAAC;KAAM,CAAC;IACN,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAC1C,CAAC;AAED,8DAA8D;AAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAA,kBAAG,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;AAClE,MAAM,yBAAyB,GAAU,IAAA,wDAA2B,EAAC;IACnE,mCAAmC,EAAE;QACnC,oDAAoD;QACpD,iBAAiB,EAAE,IAAI;KACxB;IACD,wCAAwC,EAAE;QACxC,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;YACnC,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;KACF;IACD,wCAAwC,EAAE;QACxC,WAAW,EAAE,IAAI;KAClB;IACD,qCAAqC,EAAE;QACrC,iCAAiC;QACjC,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAC7B,IAAI,OAAO,YAAY,yBAAa,EAAE,CAAC;gBACrC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,OAAO,YAAY,2BAAe,EAAE,CAAC;gBACvC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;iBAAM,IACL,OAAO,YAAY,yBAAa;gBAChC,OAAO,CAAC,GAAG,CAAC,MAAM;gBAClB,OAAO,CAAC,GAAG,CAAC,GAAG,EACf,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrD,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;KACF;IACD,mCAAmC,EAAE;QACnC,yBAAyB,EAAE,IAAI;KAChC;IACD,qCAAqC,EAAE;QACrC,OAAO,EAAE,IAAI;QACb,OAAO,CAAC,KAAW,EAAE,MAA2B;YAC9C,MAAM,CAAC,uBAAuB,CAAC,GAAG,eAAe,CAAC;QACpD,CAAC;KACF;IACD,qCAAqC,EAAE;QACrC,OAAO,EAAE,IAAI;KACd;IACD,4CAA4C,EAAE;QAC5C,OAAO,EAAE,IAAI;KACd;CACF,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,YAAY,CAAC,IAAI,CAAC;AAE3E,MAAM,iBAAiB,GAAG,IAAI,0BAAmB,CAAC;IAChD,WAAW,EAAE;QACX,IAAI,4BAAY,EAAE;QAClB,IAAI,4BAAY,CAAC;YACf,cAAc,EAAE,gCAAgB,CAAC,YAAY;SAC9C,CAAC;KACH;CACF,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,oBAAQ,CAAC;IAC5B,CAAC,iDAA0B,CAAC,YAAY,CAAC,EAAE,eAAe;IAC1D,CAAC,iDAA0B,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC,OAAO;CACnE,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,IAAI,4CAAiB,EAAE,CAAC;AAC9C,MAAM,cAAc,GAAG,IAAI,+CAAkB,EAAE,CAAC;AAChD,MAAM,YAAY,GAAG,IAAI,2CAA6B,CAAC;IACrD,QAAQ,EAAE,cAAc;CACzB,CAAC,CAAC;AAEH,MAAM,GAAG,GAAG,IAAI,kBAAO,CAAC;IACtB,WAAW,EAAE,eAAe;IAC5B,gBAAgB,EAAE,CAAC,yBAAyB,CAAC;IAC7C,QAAQ;IACR,aAAa;IACb,YAAY;IACZ,iBAAiB;IACjB,iBAAiB,EAAE;QACjB,+CAAiB;QACjB,uBAAW;QACX,wBAAY;QACZ,sBAAU;QACV,2BAAe;KAChB;CACF,CAAC,CAAC;AAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACZ,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAEnC,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAU,CAAC;AAE/C,MAAM,QAAQ,GAAQ,KAAK,IAAI,EAAE;IAC/B,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAChD,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAChD,mDAAmD;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;YAAS,CAAC;QACT,mDAAmD;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC;AAEF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC/B,CAAC"}
@@ -25,9 +25,11 @@ class StartDevCmd {
25
25
  static logger = logging_1.LoggerFactory.create(StartDevCmd);
26
26
  async handle(otel, pretty) {
27
27
  const tracingPart = [`-r`, opentelemetry_path_1.OPENTELEMETRY_INIT_PATH];
28
+ const env = {};
28
29
  const command = [`--watch`];
29
30
  if (otel) {
30
31
  command.push(...tracingPart);
32
+ env['LOG_OTEL_ENABLED'] = 'true';
31
33
  }
32
34
  command.push('-r', 'ts-node/register', 'src/main.ts');
33
35
  const bin = 'node';
@@ -36,6 +38,7 @@ class StartDevCmd {
36
38
  const appCwd = (0, node_path_1.resolve)();
37
39
  const spawn = (0, execa_1.default)(bin, command, {
38
40
  cwd: appCwd,
41
+ env,
39
42
  });
40
43
  if (pretty) {
41
44
  // TODO make correctly with commonly stream from pino-pretty
@@ -1 +1 @@
1
- {"version":3,"file":"start-dev.cmd.js","sourceRoot":"","sources":["../src/start-dev.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iDAA2D;AAC3D,2CAA8C;AAC9C,kDAA0B;AAC1B,yCAAoC;AAEpC,2EAA6E;AAE7E,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAG5C,AAAN,KAAK,CAAC,MAAM,CAEV,IAAa,EAGb,MAAe;QAEf,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,4CAAuB,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC;QAEnB,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAA,mBAAO,GAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE,OAAO,EAAE;YAChC,GAAG,EAAE,MAAM;SACZ,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACX,4DAA4D;YAC5D,MAAM,eAAe,GAAG,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE;gBAC1D,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,GAAG,EAAE,IAAA,mBAAO,GAAE;aACf,CAAC,CAAC;YAEH,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAM,CAAC,CAAC;YAC3C,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAM,CAAC,CAAC;YAC3C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,MAAM,eAAe,CAAC;YACtB,OAAO;QACT,CAAC;QACD,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,KAAK,CAAC;IACd,CAAC;;AAhDH,kCAiDC;AA7CO;IADL,IAAA,mBAAM,EAAC,WAAW,EAAE,2BAA2B,CAAC;IAE9C,WAAA,IAAA,mBAAM,EAAC,MAAM,EAAE,8BAA8B,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAA,IAAA,mBAAM,EAAC,QAAQ,EAAE,0BAA0B,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;IACzE,WAAA,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAA;;;;yCAwCjB"}
1
+ {"version":3,"file":"start-dev.cmd.js","sourceRoot":"","sources":["../src/start-dev.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,iDAA2D;AAC3D,2CAA8C;AAC9C,kDAA0B;AAC1B,yCAAoC;AAEpC,2EAA6E;AAE7E,MAAa,WAAW;IACtB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAG5C,AAAN,KAAK,CAAC,MAAM,CAEV,IAAa,EAGb,MAAe;QAEf,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,4CAAuB,CAAC,CAAC;QACpD,MAAM,GAAG,GAAsB,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YAC7B,GAAG,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC;QAEnB,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAA,mBAAO,GAAE,CAAC;QAEzB,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,GAAG,EAAE,OAAO,EAAE;YAChC,GAAG,EAAE,MAAM;YACX,GAAG;SACJ,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACX,4DAA4D;YAC5D,MAAM,eAAe,GAAG,IAAA,eAAK,EAAC,KAAK,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE;gBAC1D,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,GAAG,EAAE,IAAA,mBAAO,GAAE;aACf,CAAC,CAAC;YAEH,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAM,CAAC,CAAC;YAC3C,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAM,CAAC,CAAC;YAC3C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,mDAAmD;gBACnD,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,MAAM,eAAe,CAAC;YACtB,OAAO;QACT,CAAC;QACD,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,KAAK,CAAC;IACd,CAAC;;AArDH,kCAsDC;AAlDO;IADL,IAAA,mBAAM,EAAC,WAAW,EAAE,2BAA2B,CAAC;IAE9C,WAAA,IAAA,mBAAM,EAAC,MAAM,EAAE,8BAA8B,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAA,IAAA,mBAAM,EAAC,QAAQ,EAAE,0BAA0B,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;IACzE,WAAA,IAAA,oBAAO,EAAC,MAAM,CAAC,CAAA;;;;yCA6CjB"}
package/dist/start.cmd.js CHANGED
@@ -24,6 +24,7 @@ class StartCmd {
24
24
  try {
25
25
  if (otel) {
26
26
  require(opentelemetry_path_1.OPENTELEMETRY_INIT_PATH);
27
+ process.env.LOG_OTEL_ENABLED = 'true';
27
28
  }
28
29
  const appFile = (0, node_path_1.resolve)(`dist/app.js`);
29
30
  this.logger.trace('resolved appFile', { appFile });
@@ -1 +1 @@
1
- {"version":3,"file":"start.cmd.js","sourceRoot":"","sources":["../src/start.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAkD;AAClD,2CAA8C;AAC9C,yCAAoC;AAEpC,2EAA6E;AAE7E,MAAa,QAAQ;IACF,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAGnD,AAAN,KAAK,CAAC,MAAM,CAC+C,IAAa;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE3C,IAAI,CAAC;YACH,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,CAAC,4CAAuB,CAAC,CAAC;YACnC,CAAC;YAED,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,aAAa,CAAC,CAAC;YAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YACnD,8DAA8D;YAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;YACjC,8DAA8D;YAC9D,IAAI,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;YAClC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AA7BD,4BA6BC;AAzBO;IADL,IAAA,mBAAM,EAAC,OAAO,EAAE,iBAAiB,CAAC;IAEhC,WAAA,IAAA,mBAAM,EAAC,MAAM,EAAE,8BAA8B,EAAE,OAAO,CAAC,CAAA;;;;sCAuBzD"}
1
+ {"version":3,"file":"start.cmd.js","sourceRoot":"","sources":["../src/start.cmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iDAAkD;AAClD,2CAA8C;AAC9C,yCAAoC;AAEpC,2EAA6E;AAE7E,MAAa,QAAQ;IACF,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAGnD,AAAN,KAAK,CAAC,MAAM,CAC+C,IAAa;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE3C,IAAI,CAAC;YACH,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,CAAC,4CAAuB,CAAC,CAAC;gBACjC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YACxC,CAAC;YAED,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,aAAa,CAAC,CAAC;YAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YACnD,8DAA8D;YAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;YACjC,8DAA8D;YAC9D,IAAI,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,GAAG,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAc,CAAC,CAAC;YAClC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AA9BD,4BA8BC;AA1BO;IADL,IAAA,mBAAM,EAAC,OAAO,EAAE,iBAAiB,CAAC;IAEhC,WAAA,IAAA,mBAAM,EAAC,MAAM,EAAE,8BAA8B,EAAE,OAAO,CAAC,CAAA;;;;sCAwBzD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/cli.cmd.start",
3
- "version": "5.1.0",
3
+ "version": "5.2.0-next.1",
4
4
  "description": "Start command for rsdk cli",
5
5
  "main": "dist/index.js",
6
6
  "bin": {
@@ -24,13 +24,15 @@
24
24
  "@nestjs/common": "^10.0.0",
25
25
  "@nestjs/core": "^10.0.0",
26
26
  "@opentelemetry/api": "1.7.0",
27
- "@opentelemetry/auto-instrumentations-node": "0.40.2",
27
+ "@opentelemetry/auto-instrumentations-node": "0.50.0",
28
28
  "@opentelemetry/core": "1.18.1",
29
+ "@opentelemetry/exporter-metrics-otlp-http": "0.53.0",
29
30
  "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
30
31
  "@opentelemetry/propagator-b3": "1.18.1",
31
32
  "@opentelemetry/resource-detector-container": "^0.3.11",
32
33
  "@opentelemetry/resources": "1.18.1",
33
- "@opentelemetry/sdk-node": "0.45.1",
34
+ "@opentelemetry/sdk-metrics": "1.24.1",
35
+ "@opentelemetry/sdk-node": "0.51.1",
34
36
  "@opentelemetry/sdk-trace-node": "1.18.1",
35
37
  "@opentelemetry/semantic-conventions": "1.18.1",
36
38
  "@rsdk/actx": "*",
@@ -50,6 +52,9 @@
50
52
  "@opentelemetry/core": {
51
53
  "optional": true
52
54
  },
55
+ "@opentelemetry/exporter-metrics-otlp-http": {
56
+ "optional": true
57
+ },
53
58
  "@opentelemetry/exporter-trace-otlp-http": {
54
59
  "optional": true
55
60
  },
@@ -62,6 +67,9 @@
62
67
  "@opentelemetry/resources": {
63
68
  "optional": true
64
69
  },
70
+ "@opentelemetry/sdk-metrics": {
71
+ "optional": true
72
+ },
65
73
  "@opentelemetry/sdk-node": {
66
74
  "optional": true
67
75
  },
@@ -72,5 +80,5 @@
72
80
  "optional": true
73
81
  }
74
82
  },
75
- "gitHead": "9ff282c26debd6adb7b8a89e871bf8733de5d329"
83
+ "gitHead": "ebcdc0bac9243f442b06430c81d4f8d91661a914"
76
84
  }
@@ -3,6 +3,7 @@ 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
5
  import { CompositePropagator } from '@opentelemetry/core';
6
+ import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
6
7
  import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
7
8
  import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
8
9
  import { containerDetector } from '@opentelemetry/resource-detector-container';
@@ -13,10 +14,11 @@ import {
13
14
  processDetector,
14
15
  Resource,
15
16
  } from '@opentelemetry/resources';
17
+ import { PeriodicExportingMetricReader } from '@opentelemetry/sdk-metrics';
16
18
  import { NodeSDK } from '@opentelemetry/sdk-node';
17
19
  import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
18
20
  import { ClientRequest, IncomingMessage } from 'node:http';
19
- import { resolve } from 'node:path';
21
+ import path from 'node:path';
20
22
  import { cwd } from 'node:process';
21
23
 
22
24
  const otelDiagLogLevel = process.env.OTEL_DIAG_LOG_LEVEL;
@@ -32,7 +34,7 @@ if (otelDiagLogLevel) {
32
34
  }
33
35
 
34
36
  // eslint-disable-next-line @typescript-eslint/no-var-requires
35
- const manifestData = require(resolve(cwd(), 'package.json'));
37
+ const manifestData = require(path.resolve(cwd(), 'package.json'));
36
38
  const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
37
39
  '@opentelemetry/instrumentation-fs': {
38
40
  // only instrument fs if it is part of another trace
@@ -91,25 +93,35 @@ const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
91
93
  },
92
94
  });
93
95
 
94
- const exporter = new OTLPTraceExporter();
95
96
  const otelServiceName = process.env.OTEL_SERVICE_NAME ?? manifestData.name;
96
97
 
98
+ const textMapPropagator = new CompositePropagator({
99
+ propagators: [
100
+ new B3Propagator(),
101
+ new B3Propagator({
102
+ injectEncoding: B3InjectEncoding.MULTI_HEADER,
103
+ }),
104
+ ],
105
+ });
106
+
107
+ const resource = new Resource({
108
+ [SemanticResourceAttributes.SERVICE_NAME]: otelServiceName,
109
+ [SemanticResourceAttributes.SERVICE_VERSION]: manifestData.version,
110
+ });
111
+
112
+ const traceExporter = new OTLPTraceExporter();
113
+ const metricExporter = new OTLPMetricExporter();
114
+ const metricReader = new PeriodicExportingMetricReader({
115
+ exporter: metricExporter,
116
+ });
117
+
97
118
  const sdk = new NodeSDK({
98
119
  serviceName: otelServiceName,
99
120
  instrumentations: [autoInstumentationOptions],
100
- resource: new Resource({
101
- [SemanticResourceAttributes.SERVICE_NAME]: otelServiceName,
102
- [SemanticResourceAttributes.SERVICE_VERSION]: manifestData.version,
103
- }),
104
- traceExporter: exporter,
105
- textMapPropagator: new CompositePropagator({
106
- propagators: [
107
- new B3Propagator(),
108
- new B3Propagator({
109
- injectEncoding: B3InjectEncoding.MULTI_HEADER,
110
- }),
111
- ],
112
- }),
121
+ resource,
122
+ traceExporter,
123
+ metricReader,
124
+ textMapPropagator,
113
125
  resourceDetectors: [
114
126
  containerDetector,
115
127
  envDetector,
@@ -17,10 +17,14 @@ export class StartDevCmd {
17
17
  pretty: boolean,
18
18
  ): Promise<void> {
19
19
  const tracingPart = [`-r`, OPENTELEMETRY_INIT_PATH];
20
+ const env: NodeJS.ProcessEnv = {};
20
21
  const command = [`--watch`];
22
+
21
23
  if (otel) {
22
24
  command.push(...tracingPart);
25
+ env['LOG_OTEL_ENABLED'] = 'true';
23
26
  }
27
+
24
28
  command.push('-r', 'ts-node/register', 'src/main.ts');
25
29
  const bin = 'node';
26
30
 
@@ -31,6 +35,7 @@ export class StartDevCmd {
31
35
 
32
36
  const spawn = execa(bin, command, {
33
37
  cwd: appCwd,
38
+ env,
34
39
  });
35
40
 
36
41
  if (pretty) {
package/src/start.cmd.ts CHANGED
@@ -16,6 +16,7 @@ export class StartCmd {
16
16
  try {
17
17
  if (otel) {
18
18
  require(OPENTELEMETRY_INIT_PATH);
19
+ process.env.LOG_OTEL_ENABLED = 'true';
19
20
  }
20
21
 
21
22
  const appFile = resolve(`dist/app.js`);