@rsdk/nats.producer.request 6.0.0-next.29 → 6.0.0-next.30

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 (5) hide show
  1. package/dist/middleware/tracing.middleware.d.ts +2 -1
  2. package/dist/middleware/tracing.middleware.js +4 -13
  3. package/dist/middleware/tracing.middleware.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/middleware/tracing.middleware.ts +4 -16
package/dist/middleware/tracing.middleware.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import type { NatsMiddleware } from './types';
2
2
  /**
3
- * Middleware для клиента Nats request, для проброса **requestId** из текущего приложения в стороннее через Metadata
3
+ * Middleware для клиента Nats request, для проброса трассируемых заголовков
4
+ * (requestId + additionalMappings) из текущего приложения в стороннее через Metadata
4
5
  */
5
6
  export declare const tracingMiddleware: () => NatsMiddleware;
package/dist/middleware/tracing.middleware.js CHANGED
@@ -1,26 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.tracingMiddleware = void 0;
4
- const core_1 = require("@rsdk/core");
4
+ const nats_producer_1 = require("@rsdk/nats.producer");
5
5
  /**
6
- * Middleware для клиента Nats request, для проброса **requestId** из текущего приложения в стороннее через Metadata
6
+ * Middleware для клиента Nats request, для проброса трассируемых заголовков
7
+ * (requestId + additionalMappings) из текущего приложения в стороннее через Metadata
7
8
  */
8
9
  const tracingMiddleware = () =>
9
10
  // eslint-disable-next-line unicorn/consistent-function-scoping
10
11
  async function* (call, options) {
11
- const headers = core_1.TracingHeaders.get();
12
- if (!headers) {
13
- return yield* call.next(call.request, {
14
- ...options,
15
- });
16
- }
17
- const metadata = options.metadata ?? {};
18
- for (const [key, value] of Object.entries(headers)) {
19
- metadata[key] = value;
20
- }
21
12
  return yield* call.next(call.request, {
22
13
  ...options,
23
- metadata,
14
+ metadata: (0, nats_producer_1.withTracingMetadata)(options.metadata),
24
15
  });
25
16
  };
26
17
  exports.tracingMiddleware = tracingMiddleware;
package/dist/middleware/tracing.middleware.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.middleware.js","sourceRoot":"","sources":["../../src/middleware/tracing.middleware.ts"],"names":[],"mappings":";;;AAAA,qCAA4C;AAI5C;;GAEG;AACI,MAAM,iBAAiB,GAAG,GAAmB,EAAE;AACpD,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,MAAM,OAAO,GAAG,qBAAc,CAAC,GAAG,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACpC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;IAExC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;QACV,QAAQ;KACT,CAAC,CAAC;AACL,CAAC,CAAC;AApBS,QAAA,iBAAiB,qBAoB1B"}
1
+ {"version":3,"file":"tracing.middleware.js","sourceRoot":"","sources":["../../src/middleware/tracing.middleware.ts"],"names":[],"mappings":";;;AAAA,uDAA0D;AAI1D;;;GAGG;AACI,MAAM,iBAAiB,GAAG,GAAmB,EAAE;AACpD,+DAA+D;AAC/D,KAAK,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO;IAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACpC,GAAG,OAAO;QACV,QAAQ,EAAE,IAAA,mCAAmB,EAAC,OAAO,CAAC,QAAQ,CAAC;KAChD,CAAC,CAAC;AACL,CAAC,CAAC;AAPS,QAAA,iBAAiB,qBAO1B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/nats.producer.request",
3
- "version": "6.0.0-next.29",
3
+ "version": "6.0.0-next.30",
4
4
  "description": "Nats request/reply producer",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -33,5 +33,5 @@
33
33
  "nats": "^2.29.3",
34
34
  "reflect-metadata": "^0.1.12 || ^0.2.0"
35
35
  },
36
- "gitHead": "c9daf2934e4d1dbb88a5955d8869179b0846976f"
36
+ "gitHead": "b3508ef34ae639383ce55056f597f2783303bd9f"
37
37
  }
package/src/middleware/tracing.middleware.ts CHANGED
@@ -1,28 +1,16 @@
1
- import { TracingHeaders } from '@rsdk/core';
1
+ import { withTracingMetadata } from '@rsdk/nats.producer';
2
2
 
3
3
  import type { NatsMiddleware } from './types';
4
4
 
5
5
  /**
6
- * Middleware для клиента Nats request, для проброса **requestId** из текущего приложения в стороннее через Metadata
6
+ * Middleware для клиента Nats request, для проброса трассируемых заголовков
7
+ * (requestId + additionalMappings) из текущего приложения в стороннее через Metadata
7
8
  */
8
9
  export const tracingMiddleware = (): NatsMiddleware =>
9
10
  // eslint-disable-next-line unicorn/consistent-function-scoping
10
11
  async function* (call, options) {
11
- const headers = TracingHeaders.get();
12
- if (!headers) {
13
- return yield* call.next(call.request, {
14
- ...options,
15
- });
16
- }
17
-
18
- const metadata = options.metadata ?? {};
19
-
20
- for (const [key, value] of Object.entries(headers)) {
21
- metadata[key] = value;
22
- }
23
-
24
12
  return yield* call.next(call.request, {
25
13
  ...options,
26
- metadata,
14
+ metadata: withTracingMetadata(options.metadata),
27
15
  });
28
16
  };