@rsdk/grpc.clients 4.0.0-next.13 → 4.0.0-next.14

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.0-next.14](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.13...v4.0.0-next.14) (2023-11-29)
+
+### Features
+
+* **core:** PFM-601 Add support send trace id from client to server ([#164](https://github.com/R-Vision/rsdk/issues/164)) ([9e37243](https://github.com/R-Vision/rsdk/commit/9e372437fbb3d7d2b1167b99d07b0ac64cb4013d)), closes [#pfm-601](https://github.com/R-Vision/rsdk/issues/pfm-601) [#pfm-601](https://github.com/R-Vision/rsdk/issues/pfm-601)
+
 ## [4.0.0-next.13](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.12...v4.0.0-next.13) (2023-11-29)
 
 **Note:** Version bump only for package @rsdk/grpc.clients

package/dist/middleware/opentelemetry.middleware.d.ts

@@ -0,0 +1,5 @@
+import type { ClientMiddleware } from 'nice-grpc';
+/**
+ * Middleware для клиента GRPC, который пробрасывает **traceId** и **spanId** из текущего приложения в стороннее через Metadata
+ */
+export declare const opentelemetryMiddleware: () => ClientMiddleware;

package/dist/middleware/opentelemetry.middleware.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.opentelemetryMiddleware = void 0;
+const propagator_b3_1 = require("@opentelemetry/propagator-b3");
+const core_1 = require("@rsdk/core");
+const nice_grpc_1 = require("nice-grpc");
+/**
+ * Middleware для клиента GRPC, который пробрасывает **traceId** и **spanId** из текущего приложения в стороннее через Metadata
+ */
+const opentelemetryMiddleware = () => 
+// eslint-disable-next-line unicorn/consistent-function-scoping
+async function* (call, options) {
+    const metadata = options.metadata ?? new nice_grpc_1.Metadata();
+    const traceId = core_1.ActiveSpanStorage.getInstance()
+        ?.getActiveSpan()
+        ?.spanContext().traceId;
+    if (traceId) {
+        metadata.append(propagator_b3_1.X_B3_TRACE_ID, traceId);
+    }
+    const spanId = core_1.ActiveSpanStorage.getInstance()
+        ?.getActiveSpan()
+        ?.spanContext().spanId;
+    if (spanId) {
+        metadata.append(propagator_b3_1.X_B3_PARENT_SPAN_ID, spanId);
+    }
+    options.metadata = metadata;
+    return yield* call.next(call.request, {
+        ...options,
+    });
+};
+exports.opentelemetryMiddleware = opentelemetryMiddleware;
+//# sourceMappingURL=opentelemetry.middleware.js.map

package/dist/middleware/opentelemetry.middleware.js.map

@@ -0,0 +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;QACX,QAAQ,CAAC,MAAM,CAAC,6BAAa,EAAE,OAAO,CAAC,CAAC;KACzC;IAED,MAAM,MAAM,GAAG,wBAAiB,CAAC,WAAW,EAAE;QAC5C,EAAE,aAAa,EAAE;QACjB,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC;IACzB,IAAI,MAAM,EAAE;QACV,QAAQ,CAAC,MAAM,CAAC,mCAAmB,EAAE,MAAM,CAAC,CAAC;KAC9C;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"}

package/dist/middleware/request-metadata.middleware.d.ts

@@ -0,0 +1,5 @@
+import type { ClientMiddleware } from 'nice-grpc';
+/**
+ * Мидл варя для клиента GRPC, для проброса **requestId** из текущего приложения в стороннее через Metadata
+ */
+export declare const requestMetadataMiddleware: () => ClientMiddleware;

package/dist/middleware/request-metadata.middleware.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestMetadataMiddleware = void 0;
+const core_1 = require("@rsdk/core");
+const nice_grpc_1 = require("nice-grpc");
+/**
+ * Мидл варя для клиента GRPC, для проброса **requestId** из текущего приложения в стороннее через Metadata
+ */
+const requestMetadataMiddleware = () => 
+// eslint-disable-next-line unicorn/consistent-function-scoping
+async function* (call, options) {
+    const requestMetadata = await core_1.RequestMetadataStorage.getInstance()?.getRequestMetadata();
+    if (!requestMetadata) {
+        return yield* call.next(call.request, {
+            ...options,
+        });
+    }
+    const metadata = options.metadata ?? new nice_grpc_1.Metadata();
+    const requestId = requestMetadata.requestId;
+    if (requestId) {
+        metadata.append(core_1.X_REQUEST_ID, requestId);
+    }
+    options.metadata = metadata;
+    return yield* call.next(call.request, {
+        ...options,
+    });
+};
+exports.requestMetadataMiddleware = requestMetadataMiddleware;
+//# sourceMappingURL=request-metadata.middleware.js.map

package/dist/middleware/request-metadata.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-metadata.middleware.js","sourceRoot":"","sources":["../../src/middleware/request-metadata.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAElE,yCAAqC;AAErC;;GAEG;AACI,MAAM,yBAAyB,GAAG,GAAqB,EAAE;AAC9D,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,eAAe,GACnB,MAAM,6BAAsB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,CAAC;IACnE,IAAI,CAAC,eAAe,EAAE;QACpB,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;KACJ;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,oBAAQ,EAAE,CAAC;IAEpD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IAC5C,IAAI,SAAS,EAAE;QACb,QAAQ,CAAC,MAAM,CAAC,mBAAY,EAAE,SAAS,CAAC,CAAC;KAC1C;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;AAtBS,QAAA,yBAAyB,6BAsBlC"}

package/dist/repository/grpc-client.repository.js

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcClientRepository = void 0;
 const nice_grpc_1 = require("nice-grpc");
-const nice_grpc_opentelemetry_1 = require("nice-grpc-opentelemetry");
 const exception_mapper_middleware_1 = require("../middleware/exception-mapper.middleware");
+const opentelemetry_middleware_1 = require("../middleware/opentelemetry.middleware");
+const request_metadata_middleware_1 = require("../middleware/request-metadata.middleware");
 /**
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 class GrpcClientRepository {
     static factory = (0, nice_grpc_1.createClientFactory)()
-        .use((0, nice_grpc_opentelemetry_1.openTelemetryClientMiddleware)())
-        .use((0, exception_mapper_middleware_1.exceptionMapperMiddleware)());
+        .use((0, exception_mapper_middleware_1.exceptionMapperMiddleware)())
+        .use((0, opentelemetry_middleware_1.opentelemetryMiddleware)())
+        .use((0, request_metadata_middleware_1.requestMetadataMiddleware)());
     // Caches
     channels = new Map();
     clients = new Map();

package/dist/repository/grpc-client.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"grpc-client.repository.js","sourceRoot":"","sources":["../../src/repository/grpc-client.repository.ts"],"names":[],"mappings":";;;AAEA,yCAA+D;AAE/D,qEAAwE;AAExE,2FAAsF;AAEtF;;GAEG;AACH,MAAa,oBAAoB;IACvB,MAAM,CAAC,OAAO,GAAG,IAAA,+BAAmB,GAAE;SAC3C,GAAG,CAAC,IAAA,uDAA6B,GAAE,CAAC;SACpC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC,CAAC;IAEpC,SAAS;IACA,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAEtE,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa,CACX,UAAmC,EACnC,OAA8B,EAC9B,WAAmB;QAEnB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAC7B,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;;AA7BH,oDA8BC"}
+{"version":3,"file":"grpc-client.repository.js","sourceRoot":"","sources":["../../src/repository/grpc-client.repository.ts"],"names":[],"mappings":";;;AAEA,yCAA+D;AAG/D,2FAAsF;AACtF,qFAAiF;AACjF,2FAAsF;AAEtF;;GAEG;AACH,MAAa,oBAAoB;IACvB,MAAM,CAAC,OAAO,GAAG,IAAA,+BAAmB,GAAE;SAC3C,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC;SAChC,GAAG,CAAC,IAAA,kDAAuB,GAAE,CAAC;SAC9B,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC,CAAC;IAEpC,SAAS;IACA,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IACtC,OAAO,GAAG,IAAI,GAAG,EAA2C,CAAC;IAEtE,cAAc,CAAC,OAAe,EAAE,YAAoB;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAC;QAE1E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAEzC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa,CACX,UAAmC,EACnC,OAA8B,EAC9B,WAAmB;QAEnB,MAAM,OAAO,GACX,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;YAC7B,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEvC,OAAO,OAAO,CAAC;IACjB,CAAC;;AA9BH,oDA+BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/grpc.clients",
-  "version": "4.0.0-next.13",
+  "version": "4.0.0-next.14",
   "description": "Grpc clients infrastructure",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -18,19 +18,18 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@rsdk/autodoc.protocol": "^4.0.0-next.13",
-    "@rsdk/builtin-contract": "^4.0.0-next.13",
-    "@rsdk/common": "^4.0.0-next.13",
-    "@rsdk/core": "^4.0.0-next.13",
-    "@rsdk/grpc.common": "^4.0.0-next.13",
-    "@rsdk/logging": "^4.0.0-next.13",
-    "@rsdk/metadata": "^4.0.0-next.13",
+    "@opentelemetry/propagator-b3": "1.18.1",
+    "@opentelemetry/sdk-node": "0.45.1",
+    "@rsdk/autodoc.protocol": "^4.0.0-next.14",
+    "@rsdk/builtin-contract": "^4.0.0-next.14",
+    "@rsdk/common": "^4.0.0-next.14",
+    "@rsdk/core": "^4.0.0-next.14",
+    "@rsdk/grpc.common": "^4.0.0-next.14",
+    "@rsdk/logging": "^4.0.0-next.14",
+    "@rsdk/metadata": "^4.0.0-next.14",
     "nice-grpc": "^2.1.4",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1"
   },
-  "dependencies": {
-    "nice-grpc-opentelemetry": "^0.1.2"
-  },
-  "gitHead": "3fe5f00eff1ac7155d8e42dbbbcbd8a6cfd75e93"
+  "gitHead": "567e6d331c4caa6fdadbe0329f91c471b877f7a4"
 }

package/src/middleware/opentelemetry.middleware.ts

@@ -0,0 +1,36 @@
+import {
+  X_B3_PARENT_SPAN_ID,
+  X_B3_TRACE_ID,
+} from '@opentelemetry/propagator-b3';
+import { ActiveSpanStorage } from '@rsdk/core';
+import type { ClientMiddleware } from 'nice-grpc';
+import { Metadata } from 'nice-grpc';
+
+/**
+ * Middleware для клиента GRPC, который пробрасывает **traceId** и **spanId** из текущего приложения в стороннее через Metadata
+ */
+export const opentelemetryMiddleware = (): ClientMiddleware =>
+  // eslint-disable-next-line unicorn/consistent-function-scoping
+  async function* (call, options) {
+    const metadata = options.metadata ?? new Metadata();
+
+    const traceId = ActiveSpanStorage.getInstance()
+      ?.getActiveSpan()
+      ?.spanContext().traceId;
+    if (traceId) {
+      metadata.append(X_B3_TRACE_ID, traceId);
+    }
+
+    const spanId = ActiveSpanStorage.getInstance()
+      ?.getActiveSpan()
+      ?.spanContext().spanId;
+    if (spanId) {
+      metadata.append(X_B3_PARENT_SPAN_ID, spanId);
+    }
+
+    options.metadata = metadata;
+
+    return yield* call.next(call.request, {
+      ...options,
+    });
+  };

package/src/middleware/request-metadata.middleware.ts

@@ -0,0 +1,30 @@
+import { RequestMetadataStorage, X_REQUEST_ID } from '@rsdk/core';
+import type { ClientMiddleware } from 'nice-grpc';
+import { Metadata } from 'nice-grpc';
+
+/**
+ * Мидл варя для клиента GRPC, для проброса **requestId** из текущего приложения в стороннее через Metadata
+ */
+export const requestMetadataMiddleware = (): ClientMiddleware =>
+  // eslint-disable-next-line unicorn/consistent-function-scoping
+  async function* (call, options) {
+    const requestMetadata =
+      await RequestMetadataStorage.getInstance()?.getRequestMetadata();
+    if (!requestMetadata) {
+      return yield* call.next(call.request, {
+        ...options,
+      });
+    }
+    const metadata = options.metadata ?? new Metadata();
+
+    const requestId = requestMetadata.requestId;
+    if (requestId) {
+      metadata.append(X_REQUEST_ID, requestId);
+    }
+
+    options.metadata = metadata;
+
+    return yield* call.next(call.request, {
+      ...options,
+    });
+  };

package/src/repository/grpc-client.repository.ts

@@ -2,17 +2,19 @@ import type { ChannelImplementation } from '@grpc/grpc-js/build/src/channel';
 import type { Channel, Client } from 'nice-grpc';
 import { createChannel, createClientFactory } from 'nice-grpc';
 import type { CompatServiceDefinition } from 'nice-grpc/lib/service-definitions';
-import { openTelemetryClientMiddleware } from 'nice-grpc-opentelemetry';
 
 import { exceptionMapperMiddleware } from '../middleware/exception-mapper.middleware';
+import { opentelemetryMiddleware } from '../middleware/opentelemetry.middleware';
+import { requestMetadataMiddleware } from '../middleware/request-metadata.middleware';
 
 /**
  * Простое кеш хранилище внутри DI для кеширования на замену статике
  */
 export class GrpcClientRepository {
   private static factory = createClientFactory()
-    .use(openTelemetryClientMiddleware())
-    .use(exceptionMapperMiddleware());
+    .use(exceptionMapperMiddleware())
+    .use(opentelemetryMiddleware())
+    .use(requestMetadataMiddleware());
 
   // Caches
   readonly channels = new Map<string, Channel>();