@mojaloop/sdk-scheme-adapter 24.16.0 → 24.17.0-traceid.0

package/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.11.0.cjs
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

package/modules/api-svc/src/OutboundServer/handlers.js

@@ -155,7 +155,7 @@ const postTransfers = async (ctx) => {
         const model = createOutboundTransfersModel(ctx);
 
         // initialize the transfer model and start it running
-        await model.initialize(transferRequest);
+        await model.initialize(transferRequest, ctx.request.headers);
         const response = await model.run();
 
         // return the result
@@ -182,7 +182,7 @@ const getTransfers = async (ctx) => {
         const model = createOutboundTransfersModel(ctx);
 
         // initialize the transfer model and start it running
-        await model.initialize(transferRequest);
+        await model.initialize(transferRequest, ctx.request.headers);
         const response = await model.run();
 
         // return the result
@@ -207,7 +207,7 @@ const putTransfers = async (ctx) => {
         // TODO: check the incoming body to reject party or quote when requested to do so
 
         // load the transfer model from cache and start it running again
-        await model.load(ctx.state.path.params.transferId);
+        await model.load(ctx.state.path.params.transferId, ctx.request.headers);
 
         const response = await model.run(ctx.request.body);
 

package/modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -253,9 +253,16 @@ class OutboundTransfersModel {
      *
      * @param data {object} - The inbound API POST /transfers request body
      */
-    async initialize(data) {
+    async initialize(data, { traceparent, baggage} = {}) {
         this.data = data;
 
+        if (traceparent) {
+            this._traceFlags = traceparent.split('-').pop();
+            this.data.traceId = traceparent.split('-')[1];
+        }
+
+        this._baggage = baggage;
+
         // add a transferId if one is not present e.g. on first submission
         if(!this.data.hasOwnProperty('transferId')) {
             this.data.transferId = this._idGenerator();
@@ -1315,14 +1322,14 @@ class OutboundTransfersModel {
      *
      * @param transferId {string} - UUID transferId of the model to load from cache
      */
-    async load(transferId) {
+    async load(transferId, headers) {
         try {
             const data = await this._cache.get(`transferModel_out_${transferId}`);
 
             if(!data) {
                 throw new Error(`No cached data found for transferId: ${transferId}`);
             }
-            await this.initialize(data);
+            await this.initialize(data, headers);
             this._logger.isDebugEnabled && this._logger.push({ cache: this.data }).debug('Transfer model loaded from cached state');
         }
         catch (err) {
@@ -1543,7 +1550,7 @@ class OutboundTransfersModel {
 
     #generateTraceId() {
         // todo: add possibility to generate traceId based on transferId
-        this.data.traceId = randomBytes(16).toString('hex');
+        this.data.traceId ||= randomBytes(16).toString('hex');
         const { traceId, transferId } = this.data;
         this._logger.isInfoEnabled && this._logger.push({ traceId, transferId }).info('traceId is generated');
         return traceId;
@@ -1552,6 +1559,7 @@ class OutboundTransfersModel {
     #createOtelHeaders() {
         return Object.freeze({
             traceparent: generateTraceparent(this.data.traceId, this._traceFlags),
+            ...this._baggage && { baggage: this._baggage },
         });
     }
 }

package/modules/api-svc/test/unit/lib/model/OutboundTransfersModel.test.js

@@ -160,7 +160,7 @@ describe('OutboundTransfersModel Tests', () => {
             metricsClient,
         });
 
-        await model.initialize(JSON.parse(JSON.stringify(transferRequest)));
+        await model.initialize(JSON.parse(JSON.stringify(transferRequest)), {traceparent: '00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01', baggage: 'key1=val1,key2=val2'});
 
         let expectError;
         if (rejects.quoteResponse && delays.requestQuotes && expirySeconds < delays.requestQuotes) {

package/modules/outbound-command-event-handler/package.json

@@ -65,8 +65,8 @@
     "@types/supertest": "6.0.3",
     "@types/swagger-ui-express": "4.1.8",
     "@types/yamljs": "0.2.34",
-    "@typescript-eslint/eslint-plugin": "8.48.0",
-    "@typescript-eslint/parser": "8.48.0",
+    "@typescript-eslint/eslint-plugin": "8.48.1",
+    "@typescript-eslint/parser": "8.48.1",
     "copyfiles": "2.4.1",
     "eslint": "9.15.0",
     "jest": "29.7.0",

package/modules/outbound-domain-event-handler/package.json

@@ -62,8 +62,8 @@
         "@types/supertest": "6.0.3",
         "@types/swagger-ui-express": "4.1.8",
         "@types/yamljs": "0.2.34",
-        "@typescript-eslint/eslint-plugin": "8.48.0",
-        "@typescript-eslint/parser": "8.48.0",
+        "@typescript-eslint/eslint-plugin": "8.48.1",
+        "@typescript-eslint/parser": "8.48.1",
         "copyfiles": "2.4.1",
         "eslint": "9.15.0",
         "jest": "29.7.0",

package/modules/private-shared-lib/package.json

@@ -44,8 +44,8 @@
     "@eslint/compat": "2.0.0",
     "@types/node": "24.10.1",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.48.0",
-    "@typescript-eslint/parser": "8.48.0",
+    "@typescript-eslint/eslint-plugin": "8.48.1",
+    "@typescript-eslint/parser": "8.48.1",
     "eslint": "9.15.0",
     "jest": "29.7.0",
     "npm-check-updates": "16.7.10",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.16.0",
+  "version": "24.17.0-traceid.0",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",
@@ -18,7 +18,7 @@
     "Yevhen Kyriukha <yevhen.kyriukha@modusbox.com>",
     "Vijay Kumar Guthi <vijaya.guthi@modusbox.com>"
   ],
-  "packageManager": "yarn@4.11.0",
+  "packageManager": "yarn@4.12.0",
   "engines": {
     "yarn": "3.2.0"
   },
@@ -85,8 +85,8 @@
     "@types/jest": "30.0.0",
     "@types/node": "24.10.1",
     "@types/node-cache": "4.2.5",
-    "@typescript-eslint/eslint-plugin": "8.48.0",
-    "@typescript-eslint/parser": "8.48.0",
+    "@typescript-eslint/eslint-plugin": "8.48.1",
+    "@typescript-eslint/parser": "8.48.1",
     "audit-ci": "7.1.0",
     "eslint": "9.15.0",
     "eslint-config-airbnb-typescript": "18.0.0",
@@ -140,7 +140,6 @@
     "shins/express": "4.19.2",
     "serve-static/send": "0.19.0",
     "tar": "7.5.2",
-    "validator": "13.15.20",
     "widdershins/yargs-parser": "13.1.2",
     "widdershins/markdown-it": "12.3.2",
     "widdershins/swagger2openapi": "7.0.8",