@rsdk/nats.producer.request 5.11.5 → 5.11.6-next.0

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

@@ -0,0 +1,7 @@
+import type { NatsMiddleware } from './types';
+/**
+ * Middleware для клиента Nats request: создаёт CLIENT-спан `nats.request <subject>`
+ * и пробрасывает его контекст в заголовки запроса.
+ * Если @opentelemetry/api не установлен — ничего не делает.
+ */
+export declare const opentelemetryMiddleware: () => NatsMiddleware;

package/dist/middleware/opentelemetry.middleware.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.opentelemetryMiddleware = void 0;
+const nats_common_1 = require("@rsdk/nats.common");
+/**
+ * Middleware для клиента Nats request: создаёт CLIENT-спан `nats.request <subject>`
+ * и пробрасывает его контекст в заголовки запроса.
+ * Если @opentelemetry/api не установлен — ничего не делает.
+ */
+const opentelemetryMiddleware = () => {
+    const otel = new nats_common_1.NatsOtelInstrumentation('rsdk:nats.producer.request');
+    return async function* (call, options) {
+        const span = otel.startSpan(`nats.request ${call.subject}`, {
+            kind: 'CLIENT',
+            attributes: {
+                'messaging.system': 'nats',
+                'messaging.operation.type': 'send',
+                'messaging.operation.name': 'request',
+                'messaging.destination.name': call.subject,
+            },
+        });
+        const metadata = { ...options.metadata };
+        otel.inject(metadata, span);
+        try {
+            const result = yield* call.next(call.request, { ...options, metadata });
+            otel.endSpan(span);
+            return result;
+        }
+        catch (error) {
+            otel.endSpan(span, error);
+            throw error;
+        }
+    };
+};
+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,mDAA4D;AAI5D;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,GAAmB,EAAE;IAC1D,MAAM,IAAI,GAAG,IAAI,qCAAuB,CAAC,4BAA4B,CAAC,CAAC;IAEvE,OAAO,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,EAAE;YAC1D,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,kBAAkB,EAAE,MAAM;gBAC1B,0BAA0B,EAAE,MAAM;gBAClC,0BAA0B,EAAE,SAAS;gBACrC,4BAA4B,EAAE,IAAI,CAAC,OAAO;aAC3C;SACF,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAE5B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;YAExE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAEnB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,uBAAuB,2BA4BlC"}

package/dist/repository/clients.repository.d.ts

@@ -1,4 +1,5 @@
 import { ConfigContext, PropertyToken } from '@rsdk/core';
+import { NatsMetricsConfig } from '@rsdk/nats.common';
 import { NatsConnection } from 'nats';
 import { NatsRequestClientsOptions } from '../options/types';
 import { NatsRequestClientFactory } from '../request-client.factory';
@@ -12,8 +13,9 @@ import { NatsRequestClient, ServiceDefinition } from '../servers/types';
 export declare class ClientsRepository {
     private readonly factory;
     private readonly configContext;
+    private readonly metricsConfig;
     private readonly clients;
-    constructor(factory: NatsRequestClientFactory, configContext: ConfigContext, options?: NatsRequestClientsOptions);
+    constructor(factory: NatsRequestClientFactory, configContext: ConfigContext, metricsConfig: NatsMetricsConfig, options?: NatsRequestClientsOptions);
     resolveClient(definition: ServiceDefinition, nc: NatsConnection, clientToken: string, { payloadFormatKey, responsePayloadFormatKey, }: {
         payloadFormatKey: PropertyToken;
         responsePayloadFormatKey: PropertyToken;

package/dist/repository/clients.repository.js

@@ -15,7 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientsRepository = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@rsdk/core");
+const nats_common_1 = require("@rsdk/nats.common");
 const exception_mapper_middleware_1 = require("../middleware/exception-mapper.middleware");
+const opentelemetry_middleware_1 = require("../middleware/opentelemetry.middleware");
 const tracing_middleware_1 = require("../middleware/tracing.middleware");
 const di_1 = require("../options/di");
 const request_client_factory_1 = require("../request-client.factory");
@@ -28,12 +30,17 @@ const request_client_factory_1 = require("../request-client.factory");
 let ClientsRepository = class ClientsRepository {
     factory;
     configContext;
+    metricsConfig;
     clients = new Map();
-    constructor(factory, configContext, options) {
+    constructor(factory, configContext, metricsConfig, options) {
         this.factory = factory;
         this.configContext = configContext;
+        this.metricsConfig = metricsConfig;
         this.factory.use((0, exception_mapper_middleware_1.exceptionMapperMiddleware)());
         this.factory.use((0, tracing_middleware_1.tracingMiddleware)());
+        // Подключается последним, поэтому оборачивает остальные встроенные middleware
+        // и видит уже смапленные RSDK-исключения
+        this.factory.use((0, opentelemetry_middleware_1.opentelemetryMiddleware)());
         const { middleware } = options || {};
         if (middleware) {
             for (const x of middleware) {
@@ -50,6 +57,7 @@ let ClientsRepository = class ClientsRepository {
         const client = this.factory.create(definition, nc, {
             payloadFormat,
             responsePayloadFormat,
+            metrics: this.metricsConfig.toOptions(),
         });
         this.clients.set(clientToken, client);
         return client;
@@ -58,9 +66,10 @@ let ClientsRepository = class ClientsRepository {
 exports.ClientsRepository = ClientsRepository;
 exports.ClientsRepository = ClientsRepository = __decorate([
     (0, common_1.Injectable)(),
-    __param(2, (0, common_1.Optional)()),
-    __param(2, (0, common_1.Inject)(di_1.NATS_REQUEST_CLIENTS_OPTIONS)),
+    __param(3, (0, common_1.Optional)()),
+    __param(3, (0, common_1.Inject)(di_1.NATS_REQUEST_CLIENTS_OPTIONS)),
     __metadata("design:paramtypes", [request_client_factory_1.NatsRequestClientFactory,
-        core_1.ConfigContext, Object])
+        core_1.ConfigContext,
+        nats_common_1.NatsMetricsConfig, Object])
 ], ClientsRepository);
 //# sourceMappingURL=clients.repository.js.map

package/dist/repository/clients.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"clients.repository.js","sourceRoot":"","sources":["../../src/repository/clients.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,qCAA0D;AAG1D,2FAAsF;AACtF,yEAAqE;AACrE,sCAA6D;AAE7D,sEAAqE;AAGrE;;;;;GAKG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAOT;IACA;IAPF,OAAO,GAAG,IAAI,GAAG,EAG/B,CAAC;IAEJ,YACmB,OAAiC,EACjC,aAA4B,EAG7C,OAAmC;QAJlB,YAAO,GAAP,OAAO,CAA0B;QACjC,kBAAa,GAAb,aAAa,CAAe;QAK7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,sCAAiB,GAAE,CAAC,CAAC;QAEtC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,aAAa,CACX,UAA6B,EAC7B,EAAkB,EAClB,WAAmB,EACnB,EACE,gBAAgB,EAChB,wBAAwB,GAIzB;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CACrB,WAAW,CAC4B,CAAC;QAC5C,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC3E,MAAM,qBAAqB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAC9D,wBAAwB,CACzB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE;YACjD,aAAa;YACb,qBAAqB;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEtC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAzDY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,iBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,eAAM,EAAC,iCAA4B,CAAC,CAAA;qCAHX,iDAAwB;QAClB,oBAAa;GARpC,iBAAiB,CAyD7B"}
+{"version":3,"file":"clients.repository.js","sourceRoot":"","sources":["../../src/repository/clients.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,qCAA0D;AAC1D,mDAAsD;AAGtD,2FAAsF;AACtF,qFAAiF;AACjF,yEAAqE;AACrE,sCAA6D;AAE7D,sEAAqE;AAGrE;;;;;GAKG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAOT;IACA;IACA;IARF,OAAO,GAAG,IAAI,GAAG,EAG/B,CAAC;IAEJ,YACmB,OAAiC,EACjC,aAA4B,EAC5B,aAAgC,EAGjD,OAAmC;QALlB,YAAO,GAAP,OAAO,CAA0B;QACjC,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAmB;QAKjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,uDAAyB,GAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,sCAAiB,GAAE,CAAC,CAAC;QAEtC,8EAA8E;QAC9E,yCAAyC;QACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAA,kDAAuB,GAAE,CAAC,CAAC;QAE5C,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,aAAa,CACX,UAA6B,EAC7B,EAAkB,EAClB,WAAmB,EACnB,EACE,gBAAgB,EAChB,wBAAwB,GAIzB;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CACrB,WAAW,CAC4B,CAAC;QAC5C,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;QAC3E,MAAM,qBAAqB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAC9D,wBAAwB,CACzB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE;YACjD,aAAa;YACb,qBAAqB;YACrB,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE;SACxC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEtC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA/DY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAWR,WAAA,IAAA,iBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,eAAM,EAAC,iCAA4B,CAAC,CAAA;qCAJX,iDAAwB;QAClB,oBAAa;QACb,+BAAiB;GATxC,iBAAiB,CA+D7B"}

package/dist/request-producer.factory.d.ts

@@ -7,6 +7,7 @@ export declare class RequestProducerFactory<T extends MessageType, R extends Mes
     private readonly requestType;
     private readonly responseType;
     private readonly factory;
+    private readonly metrics;
     constructor(client: NatsConnection, requestType: T, responseType: R, config: RequestProducerOptions);
     createRequestMethod<R>(middleware?: NatsMiddleware): (payload: MessagePayload<T>, options?: CallOptions) => Promise<R>;
     private getResponseDecoder;

package/dist/request-producer.factory.js

@@ -10,6 +10,7 @@ class RequestProducerFactory {
     requestType;
     responseType;
     factory;
+    metrics;
     constructor(client, requestType, responseType, config) {
         this.client = client;
         this.requestType = requestType;
@@ -17,18 +18,20 @@ class RequestProducerFactory {
         this.client = client;
         this.requestType = requestType;
         this.factory = new request_message_factory_1.EventsFactoryRequest(requestType, config);
+        this.metrics = new nats_common_1.NatsPublishMetrics(nats_common_1.NatsClientNames.get(client), nats_common_1.NatsMetricsRegistry.from(config.metrics));
     }
     createRequestMethod(middleware) {
         const factory = this.factory;
         const client = this.client;
+        const metrics = this.metrics;
         const getResponseDecoder = this.getResponseDecoder.bind(this);
         const subject = this.requestType.$type;
         const unaryMethod = async function* (request, options) {
             const message = factory.create(request, options?.metadata);
-            const res = await client.request(subject, message.payload, {
+            const res = await metrics.observe('core', message.payload, () => client.request(subject, message.payload, {
                 headers: message.headers,
                 timeout: options?.timeout ?? 10000,
-            });
+            }));
             if (options.onTrailer && res.headers) {
                 options.onTrailer(res.headers);
             }

package/dist/request-producer.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-producer.factory.js","sourceRoot":"","sources":["../src/request-producer.factory.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAC/C,uDAI6B;AAM7B,mDAAwE;AAKxE,uEAAiE;AAEjE,MAAa,sBAAsB;IAOd;IACA;IACA;IALF,OAAO,CAA0B;IAElD,YACmB,MAAsB,EACtB,WAAc,EACd,YAAe,EAChC,MAA8B;QAHb,WAAM,GAAN,MAAM,CAAgB;QACtB,gBAAW,GAAX,WAAW,CAAG;QACd,iBAAY,GAAZ,YAAY,CAAG;QAGhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,8CAAoB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,mBAAmB,CACjB,UAA2B;QAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAEvC,MAAM,WAAW,GAAG,KAAK,SAAS,CAAC,EACjC,OAA0B,EAC1B,OAAoB;YAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAE3D,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE;gBACzD,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK;aACnC,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;gBACrC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;YAED,MAAM,MAAM,GACV,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,+BAAe,CAAC,IAAI,sCAAsB,CAAC;YAC9D,MAAM,OAAO,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAE3C,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,IAAc,CAAC,CAAC;QAC5C,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,UAAU;YACvB,CAAC,CAAC,CACE,OAA0B,EAC1B,OAAoB,EACoB,EAAE,CAC1C,UAAU,CACR;gBACE,OAAO;gBACP,OAAO;gBACP,IAAI,EAAE,WAAW;aAClB,EACD,OAAO,CACR;YACL,CAAC,CAAC,WAAW,CAAC;QAEhB,OAAO,KAAK,EAAE,OAA0B,EAAE,OAAqB,EAAE,EAAE;YACjE,MAAM,YAAY,GAAgB;gBAChC,GAAG,OAAO;aACX,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YACvE,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAErC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;gBACzC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,CAAC;YAED,OAAO,MAAM,CAAC,KAAK,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,MAAc;QACvC,IAAI,eAA8C,CAAC;QAEnD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,6BAAa,CAAC,IAAI;gBACrB,eAAe,GAAG,IAAI,8BAAgB,EAAE,CAAC;gBACzC,MAAM;YACR,KAAK,6BAAa,CAAC,QAAQ;gBACzB,eAAe,GAAG,IAAI,+BAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,wBAAiB,CAAC,4BAA4B,EAAE;gBACxD,OAAO,EAAE;oBACP,eAAe,EAAE,MAAM;iBACxB;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AAnGD,wDAmGC"}
+{"version":3,"file":"request-producer.factory.js","sourceRoot":"","sources":["../src/request-producer.factory.ts"],"names":[],"mappings":"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"}

package/dist/request.options.d.ts

@@ -1,8 +1,10 @@
 import type { PayloadFormat } from '@rsdk/events.common';
+import type { NatsMetricsSelection } from '@rsdk/nats.common';
 import type { EventMetadata } from '@rsdk/nats.producer';
 export type RequestProducerOptions = {
     payloadFormat: PayloadFormat;
     responsePayloadFormat: PayloadFormat;
+    metrics?: NatsMetricsSelection;
 };
 export type PublishOptions = {
     metadata?: EventMetadata;

package/jest.config.unit.js

@@ -0,0 +1 @@
+module.exports = require('@rsdk/jest/jest.config.unit');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/nats.producer.request",
-  "version": "5.11.5",
+  "version": "5.11.6-next.0",
   "description": "Nats request/reply producer",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -30,5 +30,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.1.0"
   },
-  "gitHead": "6f45710bc0d9713d061184beeb06afb17db8fa6f"
+  "gitHead": "36ecf2006c7e322bc53eb12b81de37ac3719180c"
 }

package/src/middleware/opentelemetry.middleware.spec.ts

@@ -0,0 +1,120 @@
+import {
+  context,
+  propagation,
+  SpanKind,
+  SpanStatusCode,
+  trace,
+} from '@opentelemetry/api';
+import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
+import {
+  InMemorySpanExporter,
+  NodeTracerProvider,
+  SimpleSpanProcessor,
+} from '@opentelemetry/sdk-trace-node';
+import type { EventMetadata } from '@rsdk/nats.producer';
+
+import { opentelemetryMiddleware } from './opentelemetry.middleware';
+import type { CallOptions, NatsMiddlewareCall } from './types';
+
+const SUBJECT = 'test.service.method';
+
+const runMiddleware = async (
+  next: NatsMiddlewareCall<unknown, string>['next'],
+  options: CallOptions = {},
+): Promise<string | void> => {
+  const iterator = opentelemetryMiddleware()<unknown, string>(
+    { subject: SUBJECT, request: { id: 1 }, next },
+    options,
+  );
+  const { value } = await iterator.next();
+
+  return value;
+};
+
+describe('opentelemetryMiddleware', () => {
+  const exporter = new InMemorySpanExporter();
+  const provider = new NodeTracerProvider({
+    spanProcessors: [new SimpleSpanProcessor(exporter)],
+  });
+  const tracer = trace.getTracer('test');
+
+  beforeAll(() => {
+    provider.register({
+      propagator: new B3Propagator({
+        injectEncoding: B3InjectEncoding.MULTI_HEADER,
+      }),
+    });
+  });
+
+  afterEach(() => {
+    exporter.reset();
+  });
+
+  afterAll(async () => {
+    await provider.shutdown();
+    trace.disable();
+    context.disable();
+    propagation.disable();
+  });
+
+  it('creates client span and injects its context into metadata', async () => {
+    const callerMetadata: EventMetadata = { requestId: 'r-1' };
+    let sentMetadata: EventMetadata | undefined;
+
+    const parent = tracer.startSpan('parent');
+    const result = await context.with(
+      trace.setSpan(context.active(), parent),
+      () =>
+        runMiddleware(
+          // eslint-disable-next-line require-yield
+          async function* (_request, options) {
+            sentMetadata = options.metadata;
+
+            return 'response';
+          },
+          { metadata: callerMetadata },
+        ),
+    );
+
+    parent.end();
+
+    const span = exporter
+      .getFinishedSpans()
+      .find((x) => x.name === `nats.request ${SUBJECT}`);
+
+    expect(result).toBe('response');
+    expect(span?.kind).toBe(SpanKind.CLIENT);
+    expect(span?.parentSpanId).toBe(parent.spanContext().spanId);
+    expect(span?.status.code).toBe(SpanStatusCode.OK);
+    expect(span?.attributes).toMatchObject({
+      'messaging.system': 'nats',
+      'messaging.operation.type': 'send',
+      'messaging.operation.name': 'request',
+      'messaging.destination.name': SUBJECT,
+    });
+    expect(sentMetadata).toMatchObject({
+      requestId: 'r-1',
+      'x-b3-traceid': parent.spanContext().traceId,
+      'x-b3-spanid': span?.spanContext().spanId,
+    });
+
+    // метаданные вызывающего кода не мутируются
+    expect(callerMetadata).toEqual({ requestId: 'r-1' });
+  });
+
+  it('marks span as error and rethrows', async () => {
+    await expect(
+      // eslint-disable-next-line require-yield
+      runMiddleware(async function* () {
+        throw new Error('request failed');
+      }),
+    ).rejects.toThrow('request failed');
+
+    const [span] = exporter.getFinishedSpans();
+
+    expect(span.status).toEqual({
+      code: SpanStatusCode.ERROR,
+      message: 'request failed',
+    });
+  });
+});

package/src/middleware/opentelemetry.middleware.ts

@@ -0,0 +1,38 @@
+import { NatsOtelInstrumentation } from '@rsdk/nats.common';
+
+import type { NatsMiddleware } from './types';
+
+/**
+ * Middleware для клиента Nats request: создаёт CLIENT-спан `nats.request <subject>`
+ * и пробрасывает его контекст в заголовки запроса.
+ * Если @opentelemetry/api не установлен — ничего не делает.
+ */
+export const opentelemetryMiddleware = (): NatsMiddleware => {
+  const otel = new NatsOtelInstrumentation('rsdk:nats.producer.request');
+
+  return async function* (call, options) {
+    const span = otel.startSpan(`nats.request ${call.subject}`, {
+      kind: 'CLIENT',
+      attributes: {
+        'messaging.system': 'nats',
+        'messaging.operation.type': 'send',
+        'messaging.operation.name': 'request',
+        'messaging.destination.name': call.subject,
+      },
+    });
+    const metadata = { ...options.metadata };
+
+    otel.inject(metadata, span);
+
+    try {
+      const result = yield* call.next(call.request, { ...options, metadata });
+
+      otel.endSpan(span);
+
+      return result;
+    } catch (error) {
+      otel.endSpan(span, error);
+      throw error;
+    }
+  };
+};

package/src/repository/clients.repository.ts

@@ -1,8 +1,10 @@
 import { Inject, Injectable, Optional } from '@nestjs/common';
 import { ConfigContext, PropertyToken } from '@rsdk/core';
+import { NatsMetricsConfig } from '@rsdk/nats.common';
 import { NatsConnection } from 'nats';
 
 import { exceptionMapperMiddleware } from '../middleware/exception-mapper.middleware';
+import { opentelemetryMiddleware } from '../middleware/opentelemetry.middleware';
 import { tracingMiddleware } from '../middleware/tracing.middleware';
 import { NATS_REQUEST_CLIENTS_OPTIONS } from '../options/di';
 import { NatsRequestClientsOptions } from '../options/types';
@@ -25,6 +27,7 @@ export class ClientsRepository {
   constructor(
     private readonly factory: NatsRequestClientFactory,
     private readonly configContext: ConfigContext,
+    private readonly metricsConfig: NatsMetricsConfig,
     @Optional()
     @Inject(NATS_REQUEST_CLIENTS_OPTIONS)
     options?: NatsRequestClientsOptions,
@@ -32,6 +35,10 @@ export class ClientsRepository {
     this.factory.use(exceptionMapperMiddleware());
     this.factory.use(tracingMiddleware());
 
+    // Подключается последним, поэтому оборачивает остальные встроенные middleware
+    // и видит уже смапленные RSDK-исключения
+    this.factory.use(opentelemetryMiddleware());
+
     const { middleware } = options || {};
 
     if (middleware) {
@@ -67,6 +74,7 @@ export class ClientsRepository {
     const client = this.factory.create(definition, nc, {
       payloadFormat,
       responsePayloadFormat,
+      metrics: this.metricsConfig.toOptions(),
     });
 
     this.clients.set(clientToken, client);

package/src/request-producer.factory.ts

@@ -9,7 +9,13 @@ import type {
   MessagePayload,
   MessageType,
 } from '@rsdk/nats.common';
-import { JSONMessageCodec, ProtoMessageCodec } from '@rsdk/nats.common';
+import {
+  JSONMessageCodec,
+  NatsClientNames,
+  NatsMetricsRegistry,
+  NatsPublishMetrics,
+  ProtoMessageCodec,
+} from '@rsdk/nats.common';
 import { type NatsConnection } from 'nats';
 
 import type { CallOptions, NatsMiddleware } from './middleware/types';
@@ -21,6 +27,7 @@ export class RequestProducerFactory<
   R extends MessageType,
 > {
   private readonly factory: EventsFactoryRequest<T>;
+  private readonly metrics: NatsPublishMetrics;
 
   constructor(
     private readonly client: NatsConnection,
@@ -31,6 +38,10 @@ export class RequestProducerFactory<
     this.client = client;
     this.requestType = requestType;
     this.factory = new EventsFactoryRequest(requestType, config);
+    this.metrics = new NatsPublishMetrics(
+      NatsClientNames.get(client),
+      NatsMetricsRegistry.from(config.metrics),
+    );
   }
 
   createRequestMethod<R>(
@@ -38,6 +49,7 @@ export class RequestProducerFactory<
   ): (payload: MessagePayload<T>, options?: CallOptions) => Promise<R> {
     const factory = this.factory;
     const client = this.client;
+    const metrics = this.metrics;
     const getResponseDecoder = this.getResponseDecoder.bind(this);
     const subject = this.requestType.$type;
 
@@ -47,10 +59,12 @@ export class RequestProducerFactory<
     ): AsyncGenerator<never, R, undefined> {
       const message = factory.create(request, options?.metadata);
 
-      const res = await client.request(subject, message.payload, {
-        headers: message.headers,
-        timeout: options?.timeout ?? 10000,
-      });
+      const res = await metrics.observe('core', message.payload, () =>
+        client.request(subject, message.payload, {
+          headers: message.headers,
+          timeout: options?.timeout ?? 10000,
+        }),
+      );
 
       if (options.onTrailer && res.headers) {
         options.onTrailer(res.headers);

package/src/request.options.ts

@@ -1,9 +1,11 @@
 import type { PayloadFormat } from '@rsdk/events.common';
+import type { NatsMetricsSelection } from '@rsdk/nats.common';
 import type { EventMetadata } from '@rsdk/nats.producer';
 
 export type RequestProducerOptions = {
   payloadFormat: PayloadFormat;
   responsePayloadFormat: PayloadFormat;
+  metrics?: NatsMetricsSelection;
 };
 
 export type PublishOptions = {