@rsdk/grpc.clients 4.2.5-next.0 → 4.3.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.
Files changed (8) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/middleware/opentelemetry.middleware.js +3 -7
  3. package/dist/middleware/opentelemetry.middleware.js.map +1 -1
  4. package/dist/middleware/request-metadata.middleware.js +2 -1
  5. package/dist/middleware/request-metadata.middleware.js.map +1 -1
  6. package/package.json +11 -10
  7. package/src/middleware/opentelemetry.middleware.ts +3 -7
  8. package/src/middleware/request-metadata.middleware.ts +2 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,16 @@
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
+ ## [4.3.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.3.0-next.0...v4.3.0-next.1) (2024-03-21)
7
+
8
+ **Note:** Version bump only for package @rsdk/grpc.clients
9
+
10
+ ## [4.3.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.5-next.0...v4.3.0-next.0) (2024-03-19)
11
+
12
+ ### Features
13
+
14
+ * reworked cli system ([745ebf5](https://github.com/R-Vision/rsdk/commit/745ebf53635de135a4a9083f47ce833efe2d4411))
15
+
6
16
  ## [4.2.5-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.4...v4.2.5-next.0) (2024-03-04)
7
17
 
8
18
  **Note:** Version bump only for package @rsdk/grpc.clients
package/dist/middleware/opentelemetry.middleware.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.opentelemetryMiddleware = void 0;
4
4
  const propagator_b3_1 = require("@opentelemetry/propagator-b3");
5
- const core_1 = require("@rsdk/core");
5
+ const sdk_node_1 = require("@opentelemetry/sdk-node");
6
6
  const nice_grpc_1 = require("nice-grpc");
7
7
  /**
8
8
  * Middleware для клиента GRPC, который пробрасывает **traceId** и **spanId** из текущего приложения в стороннее через Metadata
@@ -11,15 +11,11 @@ const opentelemetryMiddleware = () =>
11
11
  // eslint-disable-next-line unicorn/consistent-function-scoping
12
12
  async function* (call, options) {
13
13
  const metadata = options.metadata ?? new nice_grpc_1.Metadata();
14
- const traceId = core_1.ActiveSpanStorage.getInstance()
15
- ?.getActiveSpan()
16
- ?.spanContext().traceId;
14
+ const traceId = sdk_node_1.api.trace?.getActiveSpan()?.spanContext().traceId;
17
15
  if (traceId) {
18
16
  metadata.append(propagator_b3_1.X_B3_TRACE_ID, traceId);
19
17
  }
20
- const spanId = core_1.ActiveSpanStorage.getInstance()
21
- ?.getActiveSpan()
22
- ?.spanContext().spanId;
18
+ const spanId = sdk_node_1.api.trace?.getActiveSpan()?.spanContext().spanId;
23
19
  if (spanId) {
24
20
  metadata.append(propagator_b3_1.X_B3_PARENT_SPAN_ID, spanId);
25
21
  }
package/dist/middleware/opentelemetry.middleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"opentelemetry.middleware.js","sourceRoot":"","sources":["../../src/middleware/opentelemetry.middleware.ts"],"names":[],"mappings":";;;AAAA,gEAGsC;AACtC,qCAA+C;AAE/C,yCAAqC;AAErC;;GAEG;AACI,MAAM,uBAAuB,GAAG,GAAqB,EAAE;AAC5D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,MAAM,OAAO,GAAG,wBAAiB,CAAC,WAAW,EAAE;QAC7C,EAAE,aAAa,EAAE;QACjB,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC;IAC1B,IAAI,OAAO,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,CAAC,6BAAa,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,MAAM,GAAG,wBAAiB,CAAC,WAAW,EAAE;QAC5C,EAAE,aAAa,EAAE;QACjB,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC;IACzB,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,mCAAmB,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AAxBS,QAAA,uBAAuB,2BAwBhC"}
1
+ {"version":3,"file":"opentelemetry.middleware.js","sourceRoot":"","sources":["../../src/middleware/opentelemetry.middleware.ts"],"names":[],"mappings":";;;AAAA,gEAGsC;AACtC,sDAA8C;AAE9C,yCAAqC;AAErC;;GAEG;AACI,MAAM,uBAAuB,GAAG,GAAqB,EAAE;AAC5D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,MAAM,OAAO,GAAG,cAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC;IAClE,IAAI,OAAO,EAAE,CAAC;QACZ,QAAQ,CAAC,MAAM,CAAC,6BAAa,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,MAAM,GAAG,cAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC;IAChE,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,CAAC,mCAAmB,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AApBS,QAAA,uBAAuB,2BAoBhC"}
package/dist/middleware/request-metadata.middleware.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.requestMetadataMiddleware = void 0;
4
4
  const core_1 = require("@rsdk/core");
5
+ const tracing_1 = require("@rsdk/tracing");
5
6
  const nice_grpc_1 = require("nice-grpc");
6
7
  /**
7
8
  * Мидл варя для клиента GRPC, для проброса **requestId** из текущего приложения в стороннее через Metadata
@@ -9,7 +10,7 @@ const nice_grpc_1 = require("nice-grpc");
9
10
  const requestMetadataMiddleware = () =>
10
11
  // eslint-disable-next-line unicorn/consistent-function-scoping
11
12
  async function* (call, options) {
12
- const requestId = core_1.RequestIdProvider.get();
13
+ const requestId = tracing_1.RequestIdProvider.get();
13
14
  if (requestId === undefined) {
14
15
  return yield* call.next(call.request, {
15
16
  ...options,
package/dist/middleware/request-metadata.middleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"request-metadata.middleware.js","sourceRoot":"","sources":["../../src/middleware/request-metadata.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAA6D;AAE7D,yCAAqC;AAErC;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,SAAS,GAAG,wBAAiB,CAAC,GAAG,EAAE,CAAC;IAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,mBAAY,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AApBS,QAAA,yBAAyB,6BAoBlC"}
1
+ {"version":3,"file":"request-metadata.middleware.js","sourceRoot":"","sources":["../../src/middleware/request-metadata.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,2CAAkD;AAElD,yCAAqC;AAErC;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,SAAS,GAAG,2BAAiB,CAAC,GAAG,EAAE,CAAC;IAC1C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,IAAI,SAAS,EAAE,CAAC;QACd,QAAQ,CAAC,MAAM,CAAC,mBAAY,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAE5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AApBS,QAAA,yBAAyB,6BAoBlC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/grpc.clients",
3
- "version": "4.2.5-next.0",
3
+ "version": "4.3.0-next.1",
4
4
  "description": "Grpc clients infrastructure",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -17,16 +17,17 @@
17
17
  "@nestjs/microservices": "^10.0.0",
18
18
  "@opentelemetry/propagator-b3": "1.18.1",
19
19
  "@opentelemetry/sdk-node": "0.45.1",
20
- "@rsdk/autodoc.protocol": "^4.2.5-next.0",
21
- "@rsdk/builtin-contract": "^4.2.5-next.0",
22
- "@rsdk/common": "^4.2.5-next.0",
23
- "@rsdk/core": "^4.2.5-next.0",
24
- "@rsdk/grpc.common": "^4.2.5-next.0",
25
- "@rsdk/logging": "^4.2.5-next.0",
26
- "@rsdk/metadata": "^4.2.5-next.0",
20
+ "@rsdk/autodoc.protocol": "^4.3.0-next.1",
21
+ "@rsdk/builtin-contract": "^4.3.0-next.1",
22
+ "@rsdk/common": "^4.3.0-next.1",
23
+ "@rsdk/core": "^4.3.0-next.1",
24
+ "@rsdk/grpc.common": "^4.3.0-next.1",
25
+ "@rsdk/logging": "^4.3.0-next.1",
26
+ "@rsdk/metadata": "^4.3.0-next.1",
27
+ "@rsdk/tracing": "^4.3.0-next.1",
27
28
  "nice-grpc": "^2.1.4",
28
- "reflect-metadata": "^0.1.13",
29
+ "reflect-metadata": "^0.1.12 || ^0.2.0",
29
30
  "rxjs": "^7.8.1"
30
31
  },
31
- "gitHead": "3fd1ccaa4a982d914736c13b87dc9bfe03cd229d"
32
+ "gitHead": "da58041323f3145aa436e02774d36d44606c1217"
32
33
  }
package/src/middleware/opentelemetry.middleware.ts CHANGED
@@ -2,7 +2,7 @@ import {
2
2
  X_B3_PARENT_SPAN_ID,
3
3
  X_B3_TRACE_ID,
4
4
  } from '@opentelemetry/propagator-b3';
5
- import { ActiveSpanStorage } from '@rsdk/core';
5
+ import { api } from '@opentelemetry/sdk-node';
6
6
  import type { ClientMiddleware } from 'nice-grpc';
7
7
  import { Metadata } from 'nice-grpc';
8
8
 
@@ -14,16 +14,12 @@ export const opentelemetryMiddleware = (): ClientMiddleware =>
14
14
  async function* (call, options) {
15
15
  const metadata = options.metadata ?? new Metadata();
16
16
 
17
- const traceId = ActiveSpanStorage.getInstance()
18
- ?.getActiveSpan()
19
- ?.spanContext().traceId;
17
+ const traceId = api.trace?.getActiveSpan()?.spanContext().traceId;
20
18
  if (traceId) {
21
19
  metadata.append(X_B3_TRACE_ID, traceId);
22
20
  }
23
21
 
24
- const spanId = ActiveSpanStorage.getInstance()
25
- ?.getActiveSpan()
26
- ?.spanContext().spanId;
22
+ const spanId = api.trace?.getActiveSpan()?.spanContext().spanId;
27
23
  if (spanId) {
28
24
  metadata.append(X_B3_PARENT_SPAN_ID, spanId);
29
25
  }
package/src/middleware/request-metadata.middleware.ts CHANGED
@@ -1,4 +1,5 @@
1
- import { RequestIdProvider, X_REQUEST_ID } from '@rsdk/core';
1
+ import { X_REQUEST_ID } from '@rsdk/core';
2
+ import { RequestIdProvider } from '@rsdk/tracing';
2
3
  import type { ClientMiddleware } from 'nice-grpc';
3
4
  import { Metadata } from 'nice-grpc';
4
5