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

package/.yarnrc.yml

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

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+## [24.16.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.15.3...v24.16.0) (2025-12-02)
+
+
+### Features
+
+* add metrics for fx steps in model ([#635](https://github.com/mojaloop/sdk-scheme-adapter/issues/635)) ([f4e4082](https://github.com/mojaloop/sdk-scheme-adapter/commit/f4e40824f40b652ff16786c8c5c522d2107cdcb3))
+
+
+### Chore
+
+* **sbom:** update sbom [skip ci] ([426600b](https://github.com/mojaloop/sdk-scheme-adapter/commit/426600bdf4a557ca034ec2f3492a4e00704b5605))
+
 ### [24.15.3](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.15.2...v24.15.3) (2025-11-11)
 
 

package/modules/api-svc/package.json

@@ -70,7 +70,7 @@
     "@mojaloop/central-services-error-handling": "13.1.4",
     "@mojaloop/central-services-logger": "11.10.1",
     "@mojaloop/central-services-metrics": "12.8.1",
-    "@mojaloop/central-services-shared": "18.34.3",
+    "@mojaloop/central-services-shared": "18.34.4",
     "@mojaloop/event-sdk": "14.8.1",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.7.8",
@@ -78,7 +78,7 @@
     "@mojaloop/sdk-standard-components": "19.18.0",
     "ajv": "8.17.1",
     "axios": "1.13.2",
-    "body-parser": "2.2.0",
+    "body-parser": "2.2.1",
     "co-body": "6.2.0",
     "dotenv": "17.2.3",
     "env-var": "7.5.0",
@@ -86,7 +86,7 @@
     "fast-json-patch": "3.1.1",
     "fast-safe-stringify": "2.1.1",
     "javascript-state-machine": "3.1.0",
-    "js-yaml": "4.1.0",
+    "js-yaml": "4.1.1",
     "json-schema-ref-parser": "9.0.9",
     "knex": "3.1.0",
     "koa": "3.1.1",
@@ -98,7 +98,7 @@
     "prom-client": "15.1.3",
     "promise-timeout": "1.3.0",
     "random-word-slugs": "0.1.7",
-    "redis": "5.9.0",
+    "redis": "5.10.0",
     "retry": "^0.13.1",
     "uuidv4": "6.2.13",
     "ws": "8.18.3"
@@ -114,7 +114,7 @@
     "eslint": "9.15.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-jest": "29.0.1",
+    "eslint-plugin-jest": "29.2.1",
     "jest": "29.7.0",
     "jest-junit": "16.0.0",
     "npm-check-updates": "16.7.10",

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

@@ -135,12 +135,24 @@ class OutboundTransfersModel {
             quoteResponses: config.metricsClient.getCounter(
                 'mojaloop_connector_outbound_quote_response_count',
                 'Count of responses received to outbound quote requests'),
+            fxQuoteRequests: config.metricsClient.getCounter(
+                'mojaloop_connector_outbound_fx_quote_request_count',
+                'Count of outbound FX quote requests sent'),
+            fxQuoteResponses: config.metricsClient.getCounter(
+                'mojaloop_connector_outbound_fx_quote_response_count',
+                'Count of responses received to outbound FX quote requests'),
             transferPrepares: config.metricsClient.getCounter(
                 'mojaloop_connector_outbound_transfer_prepare_count',
                 'Count of outbound transfer prepare requests sent'),
             transferFulfils: config.metricsClient.getCounter(
                 'mojaloop_connector_outbound_transfer_fulfil_response_count',
                 'Count of responses received to outbound transfer prepares'),
+            fxTransferPrepares: config.metricsClient.getCounter(
+                'mojaloop_connector_outbound_fx_transfer_prepare_count',
+                'Count of outbound FX transfer prepare requests sent'),
+            fxTransferFulfils: config.metricsClient.getCounter(
+                'mojaloop_connector_outbound_fx_transfer_fulfil_response_count',
+                'Count of responses received to outbound FX transfer prepares'),
             partyLookupLatency: config.metricsClient.getHistogram(
                 'mojaloop_connector_outbound_party_lookup_latency',
                 'Time taken for a response to a party lookup request to be received'),
@@ -149,7 +161,13 @@ class OutboundTransfersModel {
                 'Time taken for a response to a quote request to be received'),
             transferLatency: config.metricsClient.getHistogram(
                 'mojaloop_connector_outbound_transfer_latency',
-                'Time taken for a response to a transfer prepare to be received')
+                'Time taken for a response to a transfer prepare to be received'),
+            fxQuoteLatency: config.metricsClient.getHistogram(
+                'mojaloop_connector_outbound_fx_quote_latency',
+                'Time taken for a response to an FX quote request to be received'),
+            fxTransferLatency: config.metricsClient.getHistogram(
+                'mojaloop_connector_outbound_fx_transfer_latency',
+                'Time taken for a response to an FX transfer to be received')
         };
 
         this.getServicesFxpResponse = config.getServicesFxpResponse;
@@ -235,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();
@@ -570,11 +595,13 @@ class OutboundTransfersModel {
     }
 
     async _requestFxQuote() {
+        let latencyTimerDone;
         try {
             this.data.fxQuoteExpiration = this._getExpirationTimestamp();
             const payload = dto.outboundPostFxQuotePayloadDto(this.data);
             const channel = `${CacheKeyPrefixes.FX_QUOTE_CALLBACK_CHANNEL}_${payload.conversionRequestId}`;
 
+            latencyTimerDone = this.metrics.fxQuoteLatency.startTimer();
             const subscribing = this._cache.subscribeToOneMessageWithTimer(channel);
 
             const resp = await this._requests.postFxQuotes(
@@ -590,10 +617,16 @@ class OutboundTransfersModel {
                 body: payload,
                 headers: originalRequest.headers
             };
+            this.metrics.fxQuoteRequests.inc();
             this._logger.isVerboseEnabled && this._logger.push({ fxQuotePayload: payload }).verbose('fxQuote request is sent to hub');
 
             const message = await subscribing;
 
+            if (latencyTimerDone) {
+                latencyTimerDone();
+            }
+            this.metrics.fxQuoteResponses.inc();
+
             if (message instanceof Error) throw message;
             const { body, headers } = message.data;
 
@@ -622,6 +655,9 @@ class OutboundTransfersModel {
 
             return payload; // think, if we need to return something at this point
         } catch (err) {
+            if (latencyTimerDone) {
+                latencyTimerDone();
+            }
             this._logger.push({ err }).error(`error in _requestFxQuote: ${err.message}`);
             throw err;
         }
@@ -812,20 +848,26 @@ class OutboundTransfersModel {
 
 
     async _executeFxTransfer() {
+        let latencyTimerDone;
         try {
-
             this.data.fxTransferExpiration = this._getExpirationTimestamp();
             const payload = dto.outboundPostFxTransferPayloadDto(this.data);
             const channel = `${CacheKeyPrefixes.FX_TRANSFER_CALLBACK_CHANNEL}_${payload.commitRequestId}`;
 
+            latencyTimerDone = this.metrics.fxTransferLatency.startTimer();
             const subscribing = this._cache.subscribeToOneMessageWithTimer(channel);
 
             const { originalRequest } = await this._requests.postFxTransfers(payload, payload.counterPartyFsp, this.#createOtelHeaders());
             this.data.fxTransferRequest = { body: payload , headers: originalRequest.headers };
+            this.metrics.fxTransferPrepares.inc();
             this._logger.push({ originalRequest }).verbose('fxTransfers request is sent to hub');
 
             const message = await subscribing;
 
+            if (latencyTimerDone) {
+                latencyTimerDone();
+            }
+            this.metrics.fxTransferFulfils.inc();
             if (message instanceof Error) throw message;
 
             const { body, headers } = message.data;
@@ -856,6 +898,9 @@ class OutboundTransfersModel {
 
             return payload; // think, if we need to return something at this point
         } catch (err) {
+            if (latencyTimerDone) {
+                latencyTimerDone();
+            }
             this._logger.push({ err }).error(`error in _executeFxTransfer: ${err.message}`);
             throw err;
         }
@@ -1277,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) {
@@ -1505,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;
@@ -1514,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

@@ -42,39 +42,39 @@
   },
   "dependencies": {
     "@mojaloop/api-snippets": "18.2.1",
-    "@mojaloop/central-services-shared": "18.34.3",
+    "@mojaloop/central-services-shared": "18.34.4",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
-    "@mojaloop/logging-bc-public-types-lib": "0.5.6",
+    "@mojaloop/logging-bc-public-types-lib": "0.5.7",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
     "convict": "6.2.4",
     "express": "4.21.2",
     "openapi-backend": "5.15.0",
-    "redis": "5.9.0",
+    "redis": "5.10.0",
     "swagger-ui-express": "5.0.1",
     "yamljs": "0.3.0"
   },
   "devDependencies": {
-    "@eslint/compat": "1.4.1",
+    "@eslint/compat": "2.0.0",
     "@types/convict": "6.1.6",
-    "@types/express": "5.0.5",
+    "@types/express": "5.0.6",
     "@types/jest": "30.0.0",
-    "@types/node": "24.10.0",
+    "@types/node": "24.10.1",
     "@types/node-cache": "4.2.5",
     "@types/supertest": "6.0.3",
     "@types/swagger-ui-express": "4.1.8",
     "@types/yamljs": "0.2.34",
-    "@typescript-eslint/eslint-plugin": "8.46.3",
-    "@typescript-eslint/parser": "8.46.3",
+    "@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",
-    "nodemon": "3.1.10",
+    "nodemon": "3.1.11",
     "npm-check-updates": "16.7.10",
     "replace": "1.2.2",
     "standard-version": "9.5.0",
-    "ts-jest": "29.4.5",
+    "ts-jest": "29.4.6",
     "ts-node": "10.9.2",
     "typescript": "5.9.3"
   },

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

@@ -43,35 +43,35 @@
     "dependencies": {
         "@mojaloop/api-snippets": "18.2.1",
         "@mojaloop/logging-bc-client-lib": "0.5.8",
-        "@mojaloop/logging-bc-public-types-lib": "0.5.6",
+        "@mojaloop/logging-bc-public-types-lib": "0.5.7",
         "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
         "ajv-formats": "3.0.1",
         "convict": "6.2.4",
         "express": "4.21.2",
         "openapi-backend": "5.15.0",
-        "redis": "5.9.0",
+        "redis": "5.10.0",
         "swagger-ui-express": "5.0.1",
         "yamljs": "0.3.0"
     },
     "devDependencies": {
         "@types/convict": "6.1.6",
-        "@types/express": "5.0.5",
+        "@types/express": "5.0.6",
         "@types/jest": "30.0.0",
-        "@types/node": "24.10.0",
+        "@types/node": "24.10.1",
         "@types/node-cache": "4.2.5",
         "@types/supertest": "6.0.3",
         "@types/swagger-ui-express": "4.1.8",
         "@types/yamljs": "0.2.34",
-        "@typescript-eslint/eslint-plugin": "8.46.3",
-        "@typescript-eslint/parser": "8.46.3",
+        "@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",
-        "nodemon": "3.1.10",
+        "nodemon": "3.1.11",
         "npm-check-updates": "16.7.10",
         "replace": "1.2.2",
         "standard-version": "9.5.0",
-        "ts-jest": "29.4.5",
+        "ts-jest": "29.4.6",
         "ts-node": "10.9.2",
         "typescript": "5.9.3"
     },

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

@@ -32,26 +32,26 @@
   },
   "dependencies": {
     "@mojaloop/api-snippets": "18.2.1",
-    "@mojaloop/central-services-shared": "18.34.3",
-    "@mojaloop/logging-bc-public-types-lib": "0.5.6",
-    "@mojaloop/platform-shared-lib-messaging-types-lib": "0.7.3",
+    "@mojaloop/central-services-shared": "18.34.4",
+    "@mojaloop/logging-bc-public-types-lib": "0.5.7",
+    "@mojaloop/platform-shared-lib-messaging-types-lib": "0.7.4",
     "@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.5.18",
     "ajv": "8.17.1",
-    "redis": "5.9.0",
+    "redis": "5.10.0",
     "uuid": "11.1.0"
   },
   "devDependencies": {
-    "@eslint/compat": "1.4.1",
-    "@types/node": "24.10.0",
+    "@eslint/compat": "2.0.0",
+    "@types/node": "24.10.1",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.46.3",
-    "@typescript-eslint/parser": "8.46.3",
+    "@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",
     "replace": "1.2.2",
     "standard-version": "9.5.0",
-    "ts-jest": "29.4.5",
+    "ts-jest": "29.4.6",
     "tslib": "2.8.1",
     "typescript": "5.9.3"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.15.3",
+  "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.10.3",
+  "packageManager": "yarn@4.12.0",
   "engines": {
     "yarn": "3.2.0"
   },
@@ -83,10 +83,10 @@
   },
   "devDependencies": {
     "@types/jest": "30.0.0",
-    "@types/node": "24.10.0",
+    "@types/node": "24.10.1",
     "@types/node-cache": "4.2.5",
-    "@typescript-eslint/eslint-plugin": "8.46.3",
-    "@typescript-eslint/parser": "8.46.3",
+    "@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",
@@ -94,11 +94,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "knex": "3.1.0",
-    "nodemon": "3.1.10",
+    "nodemon": "3.1.11",
     "npm-check-updates": "16.7.10",
     "replace": "1.2.2",
     "standard-version": "9.5.0",
-    "ts-jest": "29.4.5",
+    "ts-jest": "29.4.6",
     "ts-node": "10.9.2",
     "typescript": "5.9.3",
     "yarn-audit-fix": "10.1.1"
@@ -117,9 +117,9 @@
   },
   "resolutions": {
     "@mojaloop/api-snippets": "17.10.3",
-    "axios": "1.12.0",
+    "axios": "1.8.2",
     "body-parser": "1.20.3",
-    "brace-expansion": "2.0.2",
+    "brace-expansion": "2.0.1",
     "cacache/tar": "6.2.1",
     "cookie": "1.0.2",
     "express": "4.21.2",
@@ -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",