@mojaloop/sdk-scheme-adapter 24.1.2 → 24.2.0-csi-1210.0

package/modules/api-svc/package.json

@@ -63,63 +63,67 @@
     "url": "git@github.com:mojaloop/sdk-scheme-adapter.git"
   },
   "dependencies": {
-    "@koa/cors": "^5.0.0",
+    "@koa/cors": "5.0.0",
     "@mojaloop/api-snippets": "17.8.0",
-    "@mojaloop/central-services-error-handling": "^13.0.6",
-    "@mojaloop/central-services-logger": "^11.5.5",
-    "@mojaloop/central-services-metrics": "^12.4.5",
-    "@mojaloop/central-services-shared": "^18.19.0",
-    "@mojaloop/event-sdk": "^14.1.5",
+    "@mojaloop/central-services-error-handling": "13.0.7",
+    "@mojaloop/central-services-logger": "11.5.5",
+    "@mojaloop/central-services-metrics": "12.4.5",
+    "@mojaloop/central-services-shared": "18.21.0",
+    "@mojaloop/event-sdk": "14.1.5",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
-    "@mojaloop/ml-schema-transformer-lib": "^2.5.4",
+    "@mojaloop/ml-schema-transformer-lib": "2.5.6",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
-    "@mojaloop/sdk-standard-components": "19.7.0",
+    "@mojaloop/sdk-standard-components": "19.8.0-snapshot.4",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/context-base": "^0.17.0",
     "ajv": "8.17.1",
-    "axios": "^1.7.9",
-    "body-parser": "^1.20.3",
-    "co-body": "^6.2.0",
-    "dotenv": "^16.4.7",
-    "env-var": "^7.5.0",
-    "express": "^4.21.2",
-    "fast-json-patch": "^3.1.1",
-    "fast-safe-stringify": "^2.1.1",
-    "javascript-state-machine": "^3.1.0",
-    "js-yaml": "^4.1.0",
-    "json-schema-ref-parser": "^9.0.9",
-    "koa": "^2.15.4",
-    "koa-body": "^6.0.1",
-    "lodash": "^4.17.21",
-    "module-alias": "^2.2.3",
-    "oauth2-server": "^4.0.0-dev.2",
-    "openapi-jsonschema-parameters": "^12.1.3",
-    "prom-client": "^15.1.3",
-    "promise-timeout": "^1.3.0",
-    "random-word-slugs": "^0.1.7",
-    "redis": "^4.7.0",
-    "uuidv4": "^6.2.13",
-    "ws": "^8.18.1"
+    "axios": "1.8.1",
+    "body-parser": "1.20.3",
+    "co-body": "6.2.0",
+    "dotenv": "16.4.7",
+    "env-var": "7.5.0",
+    "express": "4.21.2",
+    "fast-json-patch": "3.1.1",
+    "fast-safe-stringify": "2.1.1",
+    "javascript-state-machine": "3.1.0",
+    "js-yaml": "4.1.0",
+    "json-schema-ref-parser": "9.0.9",
+    "koa": "2.16.0",
+    "koa-body": "6.0.1",
+    "lodash": "4.17.21",
+    "module-alias": "2.2.3",
+    "oauth2-server": "4.0.0-dev.2",
+    "openapi-jsonschema-parameters": "12.1.3",
+    "prom-client": "15.1.3",
+    "promise-timeout": "1.3.0",
+    "random-word-slugs": "0.1.7",
+    "redis": "4.7.0",
+    "uuidv4": "6.2.13",
+    "ws": "8.18.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.9",
-    "@babel/preset-env": "^7.26.9",
-    "@redocly/openapi-cli": "^1.0.0-beta.95",
-    "@types/jest": "^29.5.14",
-    "axios-mock-adapter": "^2.1.0",
-    "babel-jest": "^29.7.0",
-    "eslint": "^9.15.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.11.0",
-    "jest": "^29.7.0",
-    "jest-junit": "^16.0.0",
-    "npm-check-updates": "^16.7.10",
-    "openapi-response-validator": "^12.1.3",
-    "openapi-typescript": "^7.6.1",
-    "redis-mock": "^0.56.3",
-    "replace": "^1.2.2",
-    "standard-version": "^9.5.0",
-    "supertest": "^7.0.0",
-    "swagger-cli": "^4.0.4"
+    "@babel/core": "7.26.9",
+    "@babel/preset-env": "7.26.9",
+    "@opentelemetry/auto-instrumentations-node": "^0.56.1",
+    "@opentelemetry/sdk-node": "^0.57.2",
+    "@redocly/openapi-cli": "1.0.0-beta.95",
+    "@types/jest": "29.5.14",
+    "axios-mock-adapter": "2.1.0",
+    "babel-jest": "29.7.0",
+    "eslint": "9.15.0",
+    "eslint-config-airbnb-base": "15.0.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jest": "28.11.0",
+    "jest": "29.7.0",
+    "jest-junit": "16.0.0",
+    "npm-check-updates": "16.7.10",
+    "openapi-response-validator": "12.1.3",
+    "openapi-typescript": "7.6.1",
+    "redis-mock": "0.56.3",
+    "replace": "1.2.2",
+    "standard-version": "9.5.0",
+    "supertest": "7.0.0",
+    "swagger-cli": "4.0.4"
   },
   "standard-version": {
     "scripts": {

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

@@ -996,8 +996,8 @@ const postFxQuotes = async (ctx) => {
     const model = createInboundTransfersModel(ctx);
 
     model.postFxQuotes({ body, headers }, sourceFspId)
-        .then(response => logger.push({ response }).log(`${logPrefix} is done`))
-        .catch(err => logger.push({ err }).log(`${logPrefix} error`));
+        .then(response => logger.push({ response }).verbose(`${logPrefix} is done`))
+        .catch(err => logger.push({ err }).error(`${logPrefix} error`));
 
     prepareResponse(ctx);
 };
@@ -1041,8 +1041,8 @@ const postFxTransfers = async (ctx) => {
 
     const model = createInboundTransfersModel(ctx);
     model.postFxTransfers({ body, headers }, sourceFspId)
-        .then(response => logger.push({ response }).log(`${logPrefix} is done`))
-        .catch(err => logger.push({ err }).log(`${logPrefix} error`));
+        .then(response => logger.push({ response }).verbose(`${logPrefix} is done`))
+        .catch(err => logger.push({ err }).error(`${logPrefix} error`));
 
     prepareResponse(ctx);
 };

package/modules/api-svc/src/InboundServer/index.js

@@ -118,14 +118,14 @@ class InboundApi extends EventEmitter {
 
         api.use(middlewares.createErrorHandler(logger));
         api.use(middlewares.createRequestIdGenerator(logger));
-        api.use(middlewares.createHeaderValidator(conf, logger));
+        api.use(middlewares.createLogger(logger));
+        api.use(middlewares.createHeaderValidator(conf));
         if (conf.validateInboundJws) {
             const jwsExclusions = conf.validateInboundPutPartiesJws ? [] : ['putParties'];
             api.use(middlewares.createJwsValidator(logger, jwsVerificationKeys, jwsExclusions));
         }
 
         api.use(middlewares.applyState({ cache, wso2, conf, logExcludePaths }));
-        api.use(middlewares.createLogger(logger));
         api.use(middlewares.createRequestValidator(validator));
         api.use(middlewares.assignFspiopIdentifier());
         if (conf.enableTestFeatures) {
@@ -133,7 +133,7 @@ class InboundApi extends EventEmitter {
         }
         api.use(router(handlers, conf));
         api.use(middlewares.createResponseBodyHandler());
-        api.use(middlewares.createResponseLogging(logger));
+        api.use(middlewares.createResponseLogging());
 
         api.context.resourceVersions = conf.resourceVersions;
 

package/modules/api-svc/src/InboundServer/middlewares.js

@@ -247,12 +247,13 @@ const createRequestIdGenerator = (logger) => async (ctx, next) => {
  * @return {Function}
  */
 //
-const createHeaderValidator = (conf, logger) => async (
+const createHeaderValidator = (conf) => async (
     ctx,
     next,
     resources = defaultProtocolResources,
     supportedProtocolVersions = defaultProtocolVersions
 ) => {
+    const { logger } = ctx.state;
     const request = ctx.request;
 
     // First, extract the resource type from the path
@@ -369,6 +370,7 @@ const createHeaderValidator = (conf, logger) => async (
  * @return {Function}
  */
 const createJwsValidator = (logger, keys, exclusions) => {
+    // todo: take logger from ctx
     const jwsValidator = new Jws.validator({
         logger: logger,
         validationKeys: keys,
@@ -381,7 +383,7 @@ const createJwsValidator = (logger, keys, exclusions) => {
             if (exclusions.includes('putParties')
                     && ctx.request.method === 'PUT'
                     && ctx.request.path.startsWith('/parties/')) {
-                logger.isDebugEnabled && logger.debug('Skipping jws validation on put parties. config flag is set');
+                logger.isInfoEnabled && logger.info('Skipping jws validation on put parties. config flag is set');
                 return await next();
             }
 
@@ -389,7 +391,7 @@ const createJwsValidator = (logger, keys, exclusions) => {
             // todo: validate this requirement. No state is mutated by GETs but
             // there are potential security issues if message origin is used to
             // determine permission sets i.e. what is "readable"
-            if(ctx.request.method !== 'GET') {
+            if (ctx.request.method !== 'GET') {
                 logger.isDebugEnabled && logger.push({ request: ctx.request, body: ctx.request.body }).debug('Validating JWS');
                 jwsValidator.validate(ctx.request, logger);
             }
@@ -439,19 +441,8 @@ const createLogger = (logger) => async (ctx, next) => {
         path: ctx.path,
         method: ctx.method
     }});
-    await ctx.state.logger.isDebugEnabled && ctx.state.logger.debug('Request received');
-    // TODO: we need to disable the following log message based on a configurable parameter like DEBUG
-    if (!ctx.state.logExcludePaths.includes(ctx.path) && !ctx.path.startsWith('/bulk')) {
-        ctx.state.logger.push({body: ctx.request.body}).debug('Request received');
-    }
-    try {
-        await next();
-    } catch (err) {
-        ctx.state.logger.isErrorEnabled && ctx.state.logger.push(err).error('Error');
-    }
-    if (!ctx.state.logExcludePaths.includes(ctx.path)) {
-        await ctx.state.logger.isDebugEnabled && ctx.state.logger.debug('Request processed');
-    }
+
+    await next();
 };
 
 
@@ -510,18 +501,21 @@ const createResponseBodyHandler = () => async (ctx, next) => {
     return await next();
 };
 
-const createResponseLogging = (logger) => async (ctx, next) => {
-    if (shouldLog(ctx.path, logger)) {
+
+const logResponse = (ctx) => {
+    if (shouldLog(ctx.path, ctx.state.logger)) {
         const { method, path, id } = ctx.request;
         const { status = 'n/a' } = ctx.response;
         const processTime = ((Date.now() - ctx.state.receivedAt) / 1000).toFixed(1);
-        logger.info(`[<== ${status}] ${method?.toUpperCase()} ${path} [${processTime}sec] - requestId: ${id}`);
+        ctx.state.logger.info(`[<== ${status}] ${method?.toUpperCase()} ${path} [${processTime}sec] - requestId: ${id}`);
     }
+};
 
+const createResponseLogging = () => async (ctx, next) => {
+    logResponse(ctx);
     return await next();
 };
 
-
 module.exports = {
     applyState,
     assignFspiopIdentifier,
@@ -534,4 +528,5 @@ module.exports = {
     createRequestValidator,
     createResponseBodyHandler,
     createResponseLogging,
+    logResponse,
 };

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

@@ -71,7 +71,7 @@ const handleError = (method, err, ctx, stateField) => {
         // the structure of the response object in depth to ascertain an underlying mojaloop API error code.
         const errorInformation = err[stateField].lastError.mojaloopError.errorInformation;
         ctx.response.body.statusCode = errorInformation.errorCode;
-        ctx.state.logger.warn('errorInformation - ', errorInformation);
+        ctx.state.logger.push({ errorInformation }).warn('errorInformation:');
 
         // if we have been configured to use an error extensionList item as status code, look for it and use
         // it if it is present...

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

@@ -33,6 +33,7 @@ const {
     createLogger,
     createRequestIdGenerator,
     createResponseLogging,
+    logResponse,
 } = require('../InboundServer/middlewares');
 
 
@@ -42,25 +43,29 @@ const {
  * @return {Function}
  */
 const createRequestValidator = (validator) => async (ctx, next) => {
+    const { logger } = ctx.state;
+
     if (!ctx.state.logExcludePaths.includes(ctx.path)) {
-        ctx.state.logger.isDebugEnabled && ctx.state.logger.debug('Validating request');
+        logger.isDebugEnabled && logger.debug('Validating request');
     }
     try {
-        const matchedPathObject = validator.validateRequest(ctx, ctx.state.logger);
+        const matchedPathObject = validator.validateRequest(ctx, logger);
         ctx.state.path = {
             ...matchedPathObject
         };
         if (!ctx.state.logExcludePaths.includes(ctx.path)) {
-            ctx.state.logger.isDebugEnabled && ctx.state.logger.debug('Request passed validation');
+            logger.isDebugEnabled && logger.debug('Request validation passed');
         }
         await next();
     } catch (err) {
-        ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ err }).debug('Request failed validation.');
+        const { method, path, id } = ctx.request;
+        logger.isWarnEnabled && logger.push({ err, method, path, id }).warn('Request validation failed');
         ctx.response.status = ReturnCodes.BADREQUEST.CODE;
         ctx.response.body = {
             message: `${err.dataPath ? err.dataPath + ' ' : ''}${err.message}`,
             statusCode: 400
         };
+        logResponse(ctx);
     }
 };
 

package/modules/api-svc/src/index.js

@@ -231,7 +231,7 @@ class Server extends EventEmitter {
             );
             this.inboundServer.on('error', (...args) => {
                 const errMessage = 'Unhandled error in Inbound Server';
-                this.logger.push({ args }).log(errMessage);
+                this.logger.push({ args }).error(errMessage);
                 this.emit('error', errMessage);
             });
             await this.inboundServer.start();
@@ -251,7 +251,7 @@ class Server extends EventEmitter {
             );
             this.outboundServer.on('error', (...args) => {
                 const errMessage = 'Unhandled error in Outbound Server';
-                this.logger.push({ args }).log(errMessage);
+                this.logger.push({ args }).error(errMessage);
                 this.emit('error', errMessage);
             });
             await this.outboundServer.start();

package/modules/api-svc/src/lib/cache.js

@@ -217,7 +217,7 @@ class Cache {
 
             this.subscribe(channel, (_, message) => {
                 try {
-                    this._logger.push({ channel, message, needParse }).log('subscribeToOneMessageWithTimer is done');
+                    this._logger.push({ channel, message, needParse }).debug('subscribeToOneMessageWithTimer is done');
                     resolve(needParse ? JSON.parse(message) : message);
                 } catch (err) {
                     this._logger.push({ channel, err }).warn(`error in subscribeToOneMessageWithTimer: ${err.message}`);

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

@@ -595,9 +595,9 @@ class InboundTransfersModel {
 
             return res;
         } catch (err) {
-            this._logger.push({ err }).log('Error in postFxQuotes');
+            this._logger.push({ err }).error('Error in postFxQuotes');
             const mojaloopError = await this._handleError(err);
-            this._logger.push({ mojaloopError }).log(`Sending error response to ${sourceFspId}`);
+            this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
             return this._mojaloopRequests
                 .putFxQuotesError(body.conversionRequestId, mojaloopError, sourceFspId);
         }
@@ -646,7 +646,7 @@ class InboundTransfersModel {
                 return 'No response from FX backend';
             }
 
-            this._logger.log(`fxTransfer accepted by backend returning homeTransactionId: ${beResponse.homeTransactionId} for mojaloop commitRequestId: ${body.commitRequestId}`);
+            this._logger.info(`fxTransfer accepted by backend returning homeTransactionId: ${beResponse.homeTransactionId} for mojaloop commitRequestId: ${body.commitRequestId}`);
             this.data.homeTransactionId = beResponse.homeTransactionId;
 
             // create a  mojaloop fxTransfer fulfil response
@@ -663,9 +663,9 @@ class InboundTransfersModel {
 
             return res;
         } catch (err) {
-            this._logger.push({ err }).log('Error in postFxTransfer');
+            this._logger.push({ err }).error('Error in postFxTransfer');
             const mojaloopError = await this._handleError(err);
-            this._logger.push({ mojaloopError }).log(`Sending error response to ${sourceFspId}`);
+            this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
             return this._mojaloopRequests
                 .putFxTransfersError(body.commitRequestId, mojaloopError, sourceFspId);
         }

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

@@ -26,10 +26,12 @@
  ******/
 'use strict';
 
+const { randomBytes } = require('node:crypto');
 const safeStringify = require('fast-safe-stringify');
 const StateMachine = require('javascript-state-machine');
-const { Enum, Util: {id: idGenerator} } = require('@mojaloop/central-services-shared');
+const { Enum, Util: { id: idGenerator } } = require('@mojaloop/central-services-shared');
 const { Ilp, MojaloopRequests } = require('@mojaloop/sdk-standard-components');
+
 const { API_TYPES } = require('../../constants');
 const dto = require('../dto');
 const shared = require('./lib/shared');
@@ -226,6 +228,7 @@ class OutboundTransfersModel {
         // add a transferId if one is not present e.g. on first submission
         if(!this.data.hasOwnProperty('transferId')) {
             this.data.transferId = this._idGenerator();
+            this.#generateTraceId();
         }
 
         // initialize the transfer state machine to its starting state
@@ -435,8 +438,13 @@ class OutboundTransfersModel {
             // a GET /parties request to the switch
             try {
                 latencyTimerDone = this.metrics.partyLookupLatency.startTimer();
-                const res = await this._requests.getParties(this.data.to.idType, this.data.to.idValue,
-                    this.data.to.idSubValue, this.data.to.fspId);
+                const res = await this._requests.getParties(
+                    this.data.to.idType,
+                    this.data.to.idValue,
+                    this.data.to.idSubValue,
+                    this.data.to.fspId,
+                    this.#createOtelHeaders()
+                );
 
                 this.data.getPartiesRequest = res.originalRequest;
 
@@ -545,8 +553,13 @@ class OutboundTransfersModel {
             // a GET /parties request to the switch
             try {
                 latencyTimerDone = this.metrics.partyLookupLatency.startTimer();
-                const res = await this._requests.getParties(this.data.to.idType, this.data.to.idValue,
-                    this.data.to.idSubValue);
+                const res = await this._requests.getParties(
+                    this.data.to.idType,
+                    this.data.to.idValue,
+                    this.data.to.idSubValue,
+                    undefined,
+                    this.#createOtelHeaders()
+                );
                 this.data.getPartiesRequest = res.originalRequest;
                 this.metrics.partyLookupRequests.inc();
                 this._logger.isErrorEnabled && this._logger.push({ peer: res }).error('Party lookup sent to peer');
@@ -577,7 +590,11 @@ class OutboundTransfersModel {
 
             const subscribing = this._cache.subscribeToOneMessageWithTimer(channel);
 
-            const resp = await this._requests.postFxQuotes(payload, payload.conversionTerms.counterPartyFsp);
+            const resp = await this._requests.postFxQuotes(
+                payload,
+                payload.conversionTerms.counterPartyFsp,
+                this.#createOtelHeaders()
+            );
 
             const { originalRequest } = resp;
             // Setting the fxQuoteRequest to have the fspiop payload
@@ -720,7 +737,7 @@ class OutboundTransfersModel {
             // a POST /quotes request to the switch
             try {
                 latencyTimerDone = this.metrics.quoteRequestLatency.startTimer();
-                const res = await this._requests.postQuotes(quote, this.data.to.fspId);
+                const res = await this._requests.postQuotes(quote, this.data.to.fspId, this.#createOtelHeaders());
 
                 this.data.quoteRequest = {
                     body: quote,
@@ -816,7 +833,7 @@ class OutboundTransfersModel {
 
             const subscribing = this._cache.subscribeToOneMessageWithTimer(channel);
 
-            const { originalRequest } = await this._requests.postFxTransfers(payload, payload.counterPartyFsp);
+            const { originalRequest } = await this._requests.postFxTransfers(payload, payload.counterPartyFsp, this.#createOtelHeaders());
             this.data.fxTransferRequest = { body: payload , headers: originalRequest.headers };
             this._logger.push({ originalRequest }).verbose('fxTransfers request is sent to hub');
 
@@ -931,8 +948,12 @@ class OutboundTransfersModel {
                             completedTimestamp: (new Date()).toISOString(),
                             transferState: TransferState.COMMITTED,
                         };
-                        const res = this._requests.patchTransfers(this.data.transferId,
-                            patchNotification, this.data.quoteResponseSource);
+                        const res = this._requests.patchTransfers(
+                            this.data.transferId,
+                            patchNotification,
+                            this.data.quoteResponseSource,
+                            this.#createOtelHeaders()
+                        );
                         this.data.patch = res.originalRequest;
                         this._logger.isInfoEnabled && this._logger.info(`PATCH final notification sent to peer for transfer ${this.data.transferId}`);
                     }
@@ -963,15 +984,16 @@ class OutboundTransfersModel {
             // a POST /transfers request to the switch
             try {
                 latencyTimerDone = this.metrics.transferLatency.startTimer();
+                const headers = this.#createOtelHeaders();
 
                 let res;
                 if (this._apiType  === API_TYPES.iso20022) {
                     // Pass in quote request as context if needed for ISO20022 message generation
-                    res = await this._requests.postTransfers(prepare, this.data.quoteResponseSource, {
+                    res = await this._requests.postTransfers(prepare, this.data.quoteResponseSource, headers, {
                         isoPostQuoteResponse: this.data.quoteResponse.originalIso20022QuoteResponse
                     });
                 } else {
-                    res = await this._requests.postTransfers(prepare, this.data.quoteResponseSource, {});
+                    res = await this._requests.postTransfers(prepare, this.data.quoteResponseSource, headers, {});
                 }
 
                 this.data.prepare = {
@@ -1050,7 +1072,7 @@ class OutboundTransfersModel {
             // now we have a timeout handler and a cache subscriber hooked up we can fire off
             // a GET /transfers request to the switch
             try {
-                const res = await this._requests.getTransfers(this.data.transferId);
+                const res = await this._requests.getTransfers(this.data.transferId, undefined, this.#createOtelHeaders());
                 this._logger.isVerboseEnabled && this._logger.push({ peer: res }).verbose(`getTransfers ${this.data.transferId} sent to peer`);
             }
             catch(err) {
@@ -1493,6 +1515,23 @@ class OutboundTransfersModel {
             throw err;
         }
     }
+
+    #createOtelHeaders() {
+        const { traceId } = this.data;
+        const spanId = randomBytes(8).toString('hex');
+        const flags = '01';
+
+        return Object.freeze({
+            traceparent: `00-${traceId}-${spanId}-${flags}`,
+        });
+    }
+
+    #generateTraceId() {
+        // todo: add possibility to generate traceId based on transferId
+        this.data.traceId = randomBytes(16).toString('hex');
+        this._logger.isVerboseEnabled && this._logger.verbose(`generated traceId: ${this.data.traceId}`);
+        return this.data.traceId;
+    }
 }
 
 module.exports = OutboundTransfersModel;

package/modules/api-svc/src/lib/router.js

@@ -31,19 +31,17 @@
 const { Enum } = require('@mojaloop/central-services-shared');
 const { ReturnCodes } = Enum.Http;
 
-const router = (handlerMap) => async (ctx, next) => {
+const router = (handlerMap) => async function routeHandling (ctx, next) {
     const handlers = handlerMap[ctx.state.path.pattern];
-    const handler = handlers ? handlers[ctx.method.toLowerCase()] : undefined;
-    if (!handlers || !handler) {
+    const handler = handlers?.[ctx.method.toLowerCase()];
+
+    if (!handler) {
         ctx.state.logger.isErrorEnabled && ctx.state.logger.error('No handler found');
         ctx.response.status = ReturnCodes.NOTFOUND.CODE;
         // TODO: response content according to API spec. Should probably actually be a 404 here.
         ctx.response.body = { statusCode: 404, message: 'Not found' };
     }
     else {
-        if (!ctx.state.logExcludePaths.includes(ctx.path)) {
-            ctx.state.logger.isDebugEnabled && ctx.state.logger.push({handler}).debug('Found handler');
-        }
         await handler(ctx);
     }
     await next();

package/modules/api-svc/test/unit/api/transfers/transfers.test.js

@@ -150,8 +150,7 @@ describe('Outbound Transfers API', () => {
                             2000)),
                 },
             };
-            return testPostTransfers(putBodyFn, 504,
-                postTransfersErrorTimeoutResponse);
+            return testPostTransfers(putBodyFn, 504, postTransfersErrorTimeoutResponse);
         });
 
         test('should return mojaloop error response on party resolution', () => {

package/modules/api-svc/test/unit/api/transfers/utils.js

@@ -226,6 +226,7 @@ function createPostTransfersTester({
             if(body.transferState.prepare) {
                 delete body.transferState.prepare;
             }
+            delete body.transferState.traceId;
         }
         if(body.quoteResponse) {
             delete body.quoteResponse.headers;
@@ -248,6 +249,8 @@ function createPostTransfersTester({
         if(body.quoteResponse?.originalIso20022QuoteResponse) {
             delete body.quoteResponse.originalIso20022QuoteResponse;
         }
+        delete body.traceId;
+
         expect(body).toEqual(responseBody);
         const responseValidator = new OpenAPIResponseValidator(apiSpecsOutbound.paths['/transfers'].post);
         const err = responseValidator.validateResponse(responseCode, body);

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

@@ -85,6 +85,18 @@ describe('OutboundTransfersModel Tests', () => {
     let cache;
     let metricsClient;
 
+    const createAndInitModel = async (customConfig = {}) => {
+        const model = new Model({
+            cache,
+            logger,
+            metricsClient,
+            ...config,
+            ...customConfig
+        });
+        await model.initialize(JSON.parse(JSON.stringify(transferRequest)));
+        return model;
+    };
+
     /**
      *
      * @param {Object} opts
@@ -202,17 +214,20 @@ describe('OutboundTransfersModel Tests', () => {
     });
 
     test('initializes to starting state', async () => {
-        const model = new Model({
-            cache,
-            logger,
-            metricsClient,
-            ...config,
-        });
-
-        await model.initialize(JSON.parse(JSON.stringify(transferRequest)));
+        const model = await createAndInitModel();
         expect(StateMachine.__instance.state).toBe('start');
+        expect(model.data.transferId).toEqual(expect.any(String));
+        expect(model.data.traceId).toEqual(expect.any(String));
+        expect(model.data.traceId.length).toBe(32);
     });
 
+    // test('should generate traceId based on transferId value', async () => {
+    //     const model = await createAndInitModel();
+    //     expect(model.data.transferId.length).toBe(26);
+    //     expect(model.data.traceId.length).toBe(32);
+    //     // todo: check traceID value
+    // });
+
     test('executes all three transfer stages without halting when AUTO_ACCEPT_PARTY and AUTO_ACCEPT_QUOTES are true', async () => {
         config.autoAcceptParty = true;
         config.autoAcceptQuotes = true;
@@ -520,8 +535,11 @@ describe('OutboundTransfersModel Tests', () => {
         expect(result.currentState).toBe(SDKStateEnum.WAITING_FOR_PARTY_ACCEPTANCE);
         expect(StateMachine.__instance.state).toBe('payeeResolved');
 
+        const otelHeaders = expect.objectContaining({
+            traceparent: expect.any(String)
+        });
         // check getParties mojaloop requests method was called with the correct arguments
-        expect(MojaloopRequests.__getParties).toHaveBeenCalledWith(req.to.idType, req.to.idValue, req.to.idSubValue, testFspId);
+        expect(MojaloopRequests.__getParties).toHaveBeenCalledWith(req.to.idType, req.to.idValue, req.to.idSubValue, testFspId, otelHeaders);
     });
 
     test('resolves multiple payees and halts', async () => {