@rsdk/nats.producer.request 5.15.0-next.7 → 5.15.0-next.9

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.js

@@ -16,6 +16,7 @@ exports.ClientsRepository = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@rsdk/core");
 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");
@@ -34,6 +35,9 @@ let ClientsRepository = class ClientsRepository {
         this.configContext = configContext;
         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) {

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;AAG1D,2FAAsF;AACtF,qFAAiF;AACjF,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,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;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAEtC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AA7DY,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,CA6D7B"}

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.15.0-next.7",
+  "version": "5.15.0-next.9",
   "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": "2178d5a4b05b6d2663202712ab364e83f5177cbd"
+  "gitHead": "f8da4799d92dd62e259de4c774792cf2ae2788a5"
 }

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

@@ -3,6 +3,7 @@ import { ConfigContext, PropertyToken } from '@rsdk/core';
 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';
@@ -32,6 +33,10 @@ export class ClientsRepository {
     this.factory.use(exceptionMapperMiddleware());
     this.factory.use(tracingMiddleware());
 
+    // Подключается последним, поэтому оборачивает остальные встроенные middleware
+    // и видит уже смапленные RSDK-исключения
+    this.factory.use(opentelemetryMiddleware());
+
     const { middleware } = options || {};
 
     if (middleware) {