@mojaloop/sdk-scheme-adapter 24.2.0-csi-1210.3 → 24.2.0-csi-1210.5

package/docker-compose.yml

@@ -7,11 +7,11 @@ services:
   sdk-scheme-adapter-api-svc:
     networks:
         - mojaloop-net
-    image: mojaloop/sdk-scheme-adapter:v24.2.0-csi-1210.0
+    image: mojaloop/sdk-scheme-adapter:local
     container_name: sdk-scheme-adapter-api-svc
-#    build:
-#      context: ./
-#      dockerfile: ./Dockerfile
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
     env_file: ./modules/api-svc/test/config/integration.env
     ports:
       - "4000:4000"

package/modules/api-svc/package.json

@@ -73,7 +73,7 @@
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.5.6",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
-    "@mojaloop/sdk-standard-components": "v19.9.0-snapshot.1",
+    "@mojaloop/sdk-standard-components": "v19.9.0-snapshot.2",
     "ajv": "8.17.1",
     "axios": "1.8.1",
     "body-parser": "1.20.3",

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

@@ -39,6 +39,7 @@ const {
     TransfersModel,
 } = require('../lib/model');
 const { CacheKeyPrefixes } = require('../lib/model/common');
+const { generateTraceparent } = require('../lib/utils');
 
 const { ReturnCodes } = Enum.Http;
 
@@ -48,6 +49,18 @@ const extractBodyHeadersSourceFspId = ctx => ({
     headers: { ...ctx.request.headers },
 });
 
+const extractTraceHeaders = ctx => {
+    const { traceparent = generateTraceparent(), tracestate } = ctx.request.headers;
+
+    const traceHeaders = {
+        traceparent,
+        ...(tracestate && { tracestate })
+    };
+    ctx.state?.logger?.isVerboseEnabled && ctx.state.logger.push({ traceHeaders }).verbose('extracted traceHeaders');
+
+    return traceHeaders;
+};
+
 /**
  * @param {Object} ctx - the Koa context object
  * @returns {InboundTransfersModel}
@@ -116,7 +129,7 @@ const getParticipantsByTypeAndId = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.getParticipants(idType, idValue, subIdValue, sourceFspId);
+            const response = await model.getParticipants(idType, idValue, subIdValue, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled GET /participants/{idType}/{idValue}');
@@ -148,16 +161,7 @@ const getPartiesByTypeAndId = async (ctx) => {
             // use the transfers model to execute asynchronous stages with the switch
             const model = createInboundTransfersModel(ctx);
 
-            let response;
-
-            // use the model to handle the request
-            if (ctx.request.header?.tracestate && ctx.request.header?.traceparent) {
-                const { tracestate, traceparent } = ctx.request.header;
-                response = await model.getParties(idType, idValue, subIdValue, sourceFspId, { tracestate, traceparent });
-            } else {
-                response = await model.getParties(idType, idValue, subIdValue, sourceFspId);
-            }
-
+            const response = await model.getParties(idType, idValue, subIdValue, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled GET /parties/{idType}/{idValue} request');
@@ -210,15 +214,7 @@ const postQuotes = async (ctx) => {
             // use the transfers model to execute asynchronous stages with the switch
             const model = createInboundTransfersModel(ctx);
 
-            let response;
-
-            // use the model to handle the request
-            if (ctx.request.header?.tracestate && ctx.request.header?.traceparent) {
-                const { tracestate, traceparent } = ctx.request.header;
-                response = await model.quoteRequest(quoteRequest, sourceFspId, { tracestate, traceparent });
-            } else {
-                response = await model.quoteRequest(quoteRequest, sourceFspId);
-            }
+            const response = await model.quoteRequest(quoteRequest, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled POST /quotes request');
@@ -259,7 +255,7 @@ const postTransfers = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.prepareTransfer(transferRequest, sourceFspId);
+            const response = await model.prepareTransfer(transferRequest, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled POST /transfers request');
@@ -289,7 +285,7 @@ const getTransfersById = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.getTransfer(transferId, sourceFspId);
+            const response = await model.getTransfer(transferId, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({response}).
@@ -320,7 +316,7 @@ const postTransactionRequests = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.transactionRequest(transactionRequest, sourceFspId);
+            const response = await model.transactionRequest(transactionRequest, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled POST /transactionRequests request');
@@ -577,7 +573,7 @@ const getQuoteById = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.getQuoteRequest(quoteId, sourceFspId);
+            const response = await model.getQuoteRequest(quoteId, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled GET /quotes request');
@@ -619,7 +615,9 @@ const putTransactionRequestsById = async (ctx) => {
                 const model = createInboundTransfersModel(ctx);
 
                 // use the model to handle the request
-                const response = await model.putTransactionRequest(putTransactionRequest, transactionRequestId, sourceFspId);
+                const response = await model.putTransactionRequest(
+                    putTransactionRequest, transactionRequestId, sourceFspId, extractTraceHeaders(ctx)
+                );
 
                 // log the result
                 ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled PUT /transactionRequests/{ID} request');
@@ -800,7 +798,7 @@ const getBulkQuotesById = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.getBulkQuote(bulkQuoteId, sourceFspId);
+            const response = await model.getBulkQuote(bulkQuoteId, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({response}).
@@ -830,7 +828,7 @@ const postBulkQuotes = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.bulkQuoteRequest(bulkQuoteRequest, sourceFspId);
+            const response = await model.bulkQuoteRequest(bulkQuoteRequest, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled POST /bulkQuotes request');
@@ -895,7 +893,7 @@ const getBulkTransfersById = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.getBulkTransfer(bulkTransferId, sourceFspId);
+            const response = await model.getBulkTransfer(bulkTransferId, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({response}).
@@ -925,7 +923,7 @@ const postBulkTransfers = async (ctx) => {
             const model = createInboundTransfersModel(ctx);
 
             // use the model to handle the request
-            const response = await model.prepareBulkTransfer(bulkPrepareRequest, sourceFspId);
+            const response = await model.prepareBulkTransfer(bulkPrepareRequest, sourceFspId, extractTraceHeaders(ctx));
 
             // log the result
             ctx.state.logger.isDebugEnabled && ctx.state.logger.push({ response }).debug('Inbound transfers model handled POST /bulkTransfers request');
@@ -995,8 +993,8 @@ const postFxQuotes = async (ctx) => {
 
     const model = createInboundTransfersModel(ctx);
 
-    model.postFxQuotes({ body, headers }, sourceFspId)
-        .then(response => logger.push({ response }).verbose(`${logPrefix} is done`))
+    model.postFxQuotes({ body, headers }, sourceFspId, extractTraceHeaders(ctx))
+        .then(response => logger.push({ response }).debug(`${logPrefix} is done`))
         .catch(err => logger.push({ err }).error(`${logPrefix} error`));
 
     prepareResponse(ctx);
@@ -1040,8 +1038,8 @@ const postFxTransfers = async (ctx) => {
     const logPrefix = 'Handling POST fxTransfers request';
 
     const model = createInboundTransfersModel(ctx);
-    model.postFxTransfers({ body, headers }, sourceFspId)
-        .then(response => logger.push({ response }).verbose(`${logPrefix} is done`))
+    model.postFxTransfers({ body, headers }, sourceFspId, extractTraceHeaders(ctx))
+        .then(response => logger.push({ response }).debug(`${logPrefix} is done`))
         .catch(err => logger.push({ err }).error(`${logPrefix} error`));
 
     prepareResponse(ctx);

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

@@ -36,6 +36,8 @@ const shared = require('./lib/shared');
 const { BackendRequests, HTTPResponseError } = require('./lib/requests');
 const { SDKStateEnum, CacheKeyPrefixes } = require('./common');
 
+const TRACESTATE_KEY_CALLBACK_START_TS = 'tx_callback_start_ts';
+
 /**
  *  Models the operations required for performing inbound transfers
  */
@@ -124,7 +126,7 @@ class InboundTransfersModel {
         catch(err) {
             this._logger.isErrorEnabled && this._logger.push({ err, transactionRequestId }).error('Error in getOTP');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
             return this._mojaloopRequests.putAuthorizationsError(transactionRequestId, mojaloopError, sourceFspId);
         }
     }
@@ -133,7 +135,7 @@ class InboundTransfersModel {
     /**
      * Queries the backend API for the specified party and makes a callback to the originator with our dfspId if found
      */
-    async getParticipants(idType, idValue, idSubValue, sourceFspId) {
+    async getParticipants(idType, idValue, idSubValue, sourceFspId, headers) {
         try {
             // make a call to the backend to resolve the party lookup
             const response = await this._backendRequests.getParties(idType, idValue, idSubValue);
@@ -143,15 +145,22 @@ class InboundTransfersModel {
             }
 
             // make a callback to the source fsp with our dfspId indicating we own the party
-            return this._mojaloopRequests.putParticipants(idType, idValue, idSubValue, { fspId: this._dfspId },
-                sourceFspId);
+            return this._mojaloopRequests.putParticipants(
+                idType,
+                idValue,
+                idSubValue,
+                { fspId: this._dfspId },
+                sourceFspId,
+                headers
+            );
         }
-        catch(err) {
+        catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err, idValue }).error('Error in getParticipants');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putParticipantsError(idType, idValue, idSubValue,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putParticipantsError(
+                idType, idValue, idSubValue, mojaloopError, sourceFspId, headers
+            );
         }
     }
 
@@ -173,26 +182,16 @@ class InboundTransfersModel {
                 party: shared.internalPartyToMojaloopParty(response, this._dfspId, this._supportedCurrencies)
             };
 
-            let { tracestate = undefined, traceparent = undefined } = headers;
-
-            if (tracestate && traceparent) {
-                const TRACESTATE_KEY_CALLBACK_START_TS = 'tx_callback_start_ts';
-                tracestate += `,${TRACESTATE_KEY_CALLBACK_START_TS}=${Date.now()}`;
-                return this._mojaloopRequests.putParties(idType, idValue, idSubValue, mlParty, sourceFspId, { tracestate, traceparent });
+            if (headers.tracestate && headers.traceparent) {
+                headers.tracestate += `,${TRACESTATE_KEY_CALLBACK_START_TS}=${Date.now()}`;
             }
-
-            // make a callback to the source fsp with the party info
-            const partyInfo = await this._mojaloopRequests.putParties(idType, idValue, idSubValue, mlParty, sourceFspId);
-
-            return partyInfo;
-
+            return this._mojaloopRequests.putParties(idType, idValue, idSubValue, mlParty, sourceFspId, headers);
         }
-        catch(err) {
+        catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err, idValue }).error('Error in getParties');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putPartiesError(idType, idValue, idSubValue,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putPartiesError(idType, idValue, idSubValue, mojaloopError, sourceFspId, headers);
         }
     }
 
@@ -213,16 +212,21 @@ class InboundTransfersModel {
         // have a record of the request in the cache.
         await this._save();
 
+        const log = this._logger.push({
+            transferId: this.data.transferId,
+            quoteId: quoteRequest.quoteId
+        });
+
         try {
             const internalForm = shared.mojaloopQuoteRequestToInternal(quoteRequest);
 
             // Check the transactionRequestId exists in cache
             if(quoteRequest.transactionRequestId) {
                 const previousTxnReq = await this._cache.get(`txnReqModel_${quoteRequest.transactionRequestId}`);
-                if(previousTxnReq) {
+                if (previousTxnReq) {
                     internalForm.homeR2PTransactionId = previousTxnReq.homeR2PTransactionId;
                 } else {
-                    this._logger.isErrorEnabled && this._logger.error(`No previous transactionRequest found in cache with transactionRequestId: ${quoteRequest.transactionRequestId}. Unable to fetch homeR2PTransactionId.`);
+                    log.isErrorEnabled && log.error(`No previous transactionRequest found in cache with transactionRequestId: ${quoteRequest.transactionRequestId}. Unable to fetch homeR2PTransactionId.`);
                 }
             }
 
@@ -258,40 +262,32 @@ class InboundTransfersModel {
             };
             await this._save();
 
-            let res;
-
-            let { tracestate = undefined, traceparent = undefined } = headers;
-
-
-            // make a callback to the source fsp with the quote response
-            if (tracestate && traceparent) {
-                const TRACESTATE_KEY_CALLBACK_START_TS = 'tx_callback_start_ts';
-                tracestate += `,${TRACESTATE_KEY_CALLBACK_START_TS}=${Date.now()}`;
-                res = await this._mojaloopRequests.putQuotes(quoteRequest.quoteId, mojaloopResponse, sourceFspId, { tracestate, traceparent }, { isoPostQuote: request.isoPostQuote });
-            } else {
-                res = await this._mojaloopRequests.putQuotes(quoteRequest.quoteId, mojaloopResponse, sourceFspId, undefined, { isoPostQuote: request.isoPostQuote });
+            if (headers.tracestate && headers.traceparent) {
+                headers.tracestate += `,${TRACESTATE_KEY_CALLBACK_START_TS}=${Date.now()}`;
             }
+            const res = await this._mojaloopRequests.putQuotes(quoteRequest.quoteId, mojaloopResponse, sourceFspId, headers, { isoPostQuote: request.isoPostQuote });
+
             this.data.quoteResponse = {
-                headers: res.originalRequest.headers,
+                headers: res.originalRequest?.headers,
                 body: mojaloopResponse,
             };
             this.data.currentState = SDKStateEnum.WAITING_FOR_QUOTE_ACCEPTANCE;
             await this._save();
+
+            log.isInfoEnabled && log.info('quoteRequest is done');
             return res;
-        }
-        catch(err) {
-            this._logger.push({ err }).error('Error in quoteRequest');
+        }  catch (err) {
+            log.push({ err }).error('Error in quoteRequest');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putQuotesError(quoteRequest.quoteId,
-                mojaloopError, sourceFspId);
+            log.isInfoEnabled && log.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putQuotesError(quoteRequest.quoteId, mojaloopError, sourceFspId, headers);
         }
     }
 
     /**
      * Notifies backend about the transactionRequest callback
      */
-    async putTransactionRequest(request, transactionRequestId, sourceFspId) {
+    async putTransactionRequest(request, transactionRequestId, sourceFspId, headers) {
         const putTransactionRequest = request.body;
 
         try {
@@ -316,12 +312,11 @@ class InboundTransfersModel {
             // make a call to the backend about this notification anyway
             await this._backendRequests.putRequestToPayNotification(internalForm, transactionRequestId);
         }
-        catch(err) {
+        catch (err) {
             this._logger.push({ err, transactionRequestId }).error('Error in putTransactionRequest');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putQuotesError(transactionRequestId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return await this._mojaloopRequests.putQuotesError(transactionRequestId, mojaloopError, sourceFspId, headers);
         }
     }
 
@@ -329,7 +324,7 @@ class InboundTransfersModel {
      * This is executed as when GET /quotes/{ID} request is made to get the response of a previous POST /quotes request.
      * Gets the quoteResponse from the cache and makes a callback to the originator with result
      */
-    async getQuoteRequest(quoteId, sourceFspId) {
+    async getQuoteRequest(quoteId, sourceFspId, headers) {
         try {
             // Get the quoteResponse data for the quoteId from the cache to be sent as a response to GET /quotes/{ID}
             const quoteResponse = await this._cache.get(`quoteResponse_${quoteId}`);
@@ -339,16 +334,16 @@ class InboundTransfersModel {
                 const err = new Error('Quote Id not found');
                 const mojaloopError = await this._handleError(err, Errors.MojaloopApiErrorCodes.QUOTE_ID_NOT_FOUND);
                 this._logger.push({ mojaloopError, quoteId }).warn(`Sending error response to ${sourceFspId}`);
-                return await this._mojaloopRequests.putQuotesError(quoteId, mojaloopError, sourceFspId);
+                return await this._mojaloopRequests.putQuotesError(quoteId, mojaloopError, sourceFspId, headers);
             }
             // Make a PUT /quotes/{ID} callback to the source fsp with the quote response
-            return this._mojaloopRequests.putQuotes(quoteId, quoteResponse, sourceFspId);
+            return this._mojaloopRequests.putQuotes(quoteId, quoteResponse, sourceFspId, headers);
         }
         catch(err) {
             this._logger.push({ err, quoteId }).error('Error in getQuoteRequest');
             const mojaloopError = await this._handleError(err);
-            this._logger.isVerboseEnabled && this._logger.push({ mojaloopError }).verbose(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putQuotesError(quoteId, mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putQuotesError(quoteId, mojaloopError, sourceFspId, headers);
         }
     }
 
@@ -356,7 +351,7 @@ class InboundTransfersModel {
      * Asks the backend for a response to an incoming transactoin request and makes a callback to the originator with
      * the result
      */
-    async transactionRequest(transactionRequest, sourceFspId) {
+    async transactionRequest(transactionRequest, sourceFspId, headers) {
         try {
             const internalForm = shared.mojaloopTransactionRequestToInternal(transactionRequest);
 
@@ -372,14 +367,17 @@ class InboundTransfersModel {
             const mojaloopResponse = shared.internalTransactionRequestResponseToMojaloop(response);
 
             // make a callback to the source fsp with the quote response
-            return this._mojaloopRequests.putTransactionRequests(transactionRequest.transactionRequestId, mojaloopResponse, sourceFspId);
+            return this._mojaloopRequests.putTransactionRequests(
+                transactionRequest.transactionRequestId, mojaloopResponse, sourceFspId, headers
+            );
         }
-        catch(err) {
+        catch (err) {
             this._logger.push({ err }).error(`Error in transactionRequest ${transactionRequest?.transactionRequestId}`);
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putTransactionRequestsError(transactionRequest.transactionRequestId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putTransactionRequestsError(
+                transactionRequest.transactionRequestId, mojaloopError, sourceFspId, headers
+            );
         }
     }
 
@@ -388,7 +386,7 @@ class InboundTransfersModel {
      * Validates an incoming transfer prepare request and makes a callback to the originator with
      * the result
      */
-    async prepareTransfer(request, sourceFspId) {
+    async prepareTransfer(request, sourceFspId, headers) {
         const prepareRequest = request.body;
         try {
             // retrieve our quote data
@@ -408,8 +406,10 @@ class InboundTransfersModel {
                 // This is a different to the a typical mojaloop sdk-scheme-adapter setup which allows this as an option.
 
                 // Check whether to allow transfers without a previous quote.
-                if(!this._allowTransferWithoutQuote) {
-                    throw new Error(`Corresponding quote not found for transfer ${prepareRequest.transferId}`);
+                if (!this._allowTransferWithoutQuote) {
+                    const errMessage = `Corresponding quote not found for transfer ${prepareRequest.transferId}`;
+                    this._logger.isWarnEnabled && this._logger.warn(errMessage);
+                    throw new Error(errMessage);
                 }
 
                 if (!this.data) {
@@ -425,18 +425,19 @@ class InboundTransfersModel {
             // Calculate or retrieve fulfilment and condition
             let fulfilment = null;
             let condition = null;
-            if(quote) {
+            if (quote) {
                 fulfilment = quote.fulfilment;
                 condition = quote.mojaloopResponse.condition;
-            }
-            else {
+            } else {
                 fulfilment = this._ilp.calculateFulfil(prepareRequest.ilpPacket);
                 condition = this._ilp.calculateConditionFromFulfil(fulfilment);
             }
 
             // check incoming ILP matches our persisted values
-            if(this._checkIlp && (prepareRequest.condition !== condition)) {
-                throw new Error(`ILP condition in transfer prepare for ${prepareRequest.transferId} does not match quote`);
+            if (this._checkIlp && (prepareRequest.condition !== condition)) {
+                const errMessage = `ILP condition in transfer prepare for ${prepareRequest.transferId} does not match quote`;
+                this._logger.isWarnEnabled && this._logger.warn(errMessage);
+                throw new Error(errMessage);
             }
 
             if (this._rejectTransfersOnExpiredQuotes) {
@@ -446,7 +447,7 @@ class InboundTransfersModel {
                     const error = Errors.MojaloopApiErrorObjectFromCode(Errors.MojaloopApiErrorCodes.QUOTE_EXPIRED);
                     this._logger.isErrorEnabled && this._logger.error(`Error in prepareTransfer: quote expired for transfer ${prepareRequest.transferId}, system time=${now} > quote time=${expiration}`);
                     await this.updateStateWithError(error);
-                    return this._mojaloopRequests.putTransfersError(prepareRequest.transferId, error, sourceFspId);
+                    return this._mojaloopRequests.putTransfersError(prepareRequest.transferId, error, sourceFspId, headers);
                 }
             }
 
@@ -461,7 +462,7 @@ class InboundTransfersModel {
                 return 'No response from backend';
             }
 
-            this._logger.isDebugEnabled && this._logger.debug(`Transfer accepted by backend returning homeTransactionId: ${response.homeTransactionId} for mojaloop transferId: ${prepareRequest.transferId}`);
+            this._logger.isVerboseEnabled && this._logger.verbose(`Transfer accepted by backend returning homeTransactionId: ${response.homeTransactionId} for mojaloop transferId: ${prepareRequest.transferId}`);
             this.data.homeTransactionId = response.homeTransactionId;
 
             // create a  mojaloop transfer fulfil response
@@ -477,29 +478,32 @@ class InboundTransfersModel {
             };
 
             // make a callback to the source fsp with the transfer fulfilment
-            const res = await this._mojaloopRequests.putTransfers(prepareRequest.transferId, mojaloopResponse,
-                sourceFspId);
+            const res = await this._mojaloopRequests.putTransfers(
+                prepareRequest.transferId, mojaloopResponse, sourceFspId, headers
+            );
 
             this.data.fulfil = {
                 headers: res.originalRequest.headers,
                 body: mojaloopResponse,
             };
             this.data.currentState = response.transferState || (this._reserveNotification ? SDKStateEnum.RESERVED : SDKStateEnum.COMPLETED);
+
             await this._save();
             return res;
         } catch(err) {
-            this._logger.isErrorEnabled && this._logger.push({ err }).error(`Error in prepareTransfer: ${request?.body?.transferId}`);
+            this._logger.isErrorEnabled && this._logger.push({ err }).error(`Error in prepareTransfer: ${prepareRequest?.transferId}`);
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putTransfersError(prepareRequest.transferId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putTransfersError(
+                prepareRequest.transferId, mojaloopError, sourceFspId, headers
+            );
         }
     }
 
     /**
     * Queries details of a transfer
     */
-    async getTransfer(transferId, sourceFspId) {
+    async getTransfer(transferId, sourceFspId, headers) {
         try {
             // make a call to the backend to get transfer details
             const response = await this._backendRequests.getTransfers(transferId);
@@ -541,19 +545,17 @@ class InboundTransfersModel {
             };
 
             // make a callback to the source fsp with the transfer fulfilment
-            return this._mojaloopRequests.putTransfers(transferId, mojaloopResponse,
-                sourceFspId);
+            return this._mojaloopRequests.putTransfers(transferId, mojaloopResponse, sourceFspId, headers);
         }
         catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err, transferId }).error('Error in getTransfers');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putTransfersError(transferId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putTransfersError(transferId, mojaloopError, sourceFspId, headers);
         }
     }
 
-    async postFxQuotes(request, sourceFspId) {
+    async postFxQuotes(request, sourceFspId, headers) {
         const { body } = request;
         try {
             this.data = dto.fxQuoteRequestStateDto(request);
@@ -579,11 +581,11 @@ class InboundTransfersModel {
                 response: beResponse,
                 mojaloopResponse,
                 fulfilment
-                // todo: think, if we need to store ilpPacket as well
+                // think, if we need to store ilpPacket as well
             };
             await this.saveFxState();
 
-            const res = await this._mojaloopRequests.putFxQuotes(body.conversionRequestId, mojaloopResponse, sourceFspId);
+            const res = await this._mojaloopRequests.putFxQuotes(body.conversionRequestId, mojaloopResponse, sourceFspId, headers);
 
             this.data.fxQuoteResponse = {
                 headers: res.originalRequest.headers,
@@ -595,15 +597,16 @@ class InboundTransfersModel {
 
             return res;
         } catch (err) {
-            this._logger.push({ err }).error('Error in postFxQuotes');
+            this._logger.push({ err }).error(`Error in postFxQuotes  [conversionRequestId: ${body.conversionRequestId}]`);
             const mojaloopError = await this._handleError(err);
             this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests
-                .putFxQuotesError(body.conversionRequestId, mojaloopError, sourceFspId);
+            return this._mojaloopRequests.putFxQuotesError(
+                body.conversionRequestId, mojaloopError, sourceFspId, headers
+            );
         }
     }
 
-    async postFxTransfers(request, sourceFspId) {
+    async postFxTransfers(request, sourceFspId, headers) {
         const { body } = request;
         try {
             // todo: assume commitRequestId from fxTransfer should be same as conversionTerms.conversionId from fxQuotes
@@ -634,7 +637,7 @@ class InboundTransfersModel {
                     this._logger.error(`Error in prepareFxTransfer: fxQuote expired for fxTransfer ${body.commitRequestId}, system time=${now} > fxQuote time=${expiration}`);
                     await this.updateStateWithError(error);
                     // todo: maybe, throw error here, and process it in catch block?
-                    return this._mojaloopRequests.putFxTransfersError(body.commitRequestId, error, sourceFspId);
+                    return this._mojaloopRequests.putFxTransfersError(body.commitRequestId, error, sourceFspId, headers);
                 }
             }
 
@@ -651,23 +654,23 @@ class InboundTransfersModel {
 
             // create a  mojaloop fxTransfer fulfil response
             const mojaloopResponse = shared.internalFxTransferResponseToMojaloop(beResponse, fulfilment);
-            const res = await this._mojaloopRequests.putFxTransfers(body.commitRequestId, mojaloopResponse, sourceFspId);
+            const res = await this._mojaloopRequests.putFxTransfers(body.commitRequestId, mojaloopResponse, sourceFspId, headers);
 
             this.data.fulfil = {
                 headers: res.originalRequest.headers,
                 body: mojaloopResponse,
             };
-
             this.data.currentState = beResponse.conversionState;
             await this.saveFxState();
 
             return res;
         } catch (err) {
-            this._logger.push({ err }).error('Error in postFxTransfer');
+            this._logger.push({ err }).error(`Error in postFxTransfer  [commitRequestId: ${body.commitRequestId}]`);
             const mojaloopError = await this._handleError(err);
             this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests
-                .putFxTransfersError(body.commitRequestId, mojaloopError, sourceFspId);
+            return this._mojaloopRequests.putFxTransfersError(
+                body.commitRequestId, mojaloopError, sourceFspId, headers
+            );
         }
     }
 
@@ -675,7 +678,7 @@ class InboundTransfersModel {
      * Asks the backend for a response to an incoming bulk quotes request and makes a callback to the originator with
      * the results.
      */
-    async bulkQuoteRequest(bulkQuoteRequest, sourceFspId) {
+    async bulkQuoteRequest(bulkQuoteRequest, sourceFspId, headers) {
         const { bulkQuoteId } = bulkQuoteRequest;
         const fulfilments = {};
         try {
@@ -703,7 +706,7 @@ class InboundTransfersModel {
                 const mojaloopIndividualQuote = mojaloopResponse.individualQuoteResults.find(
                     (quoteResult) => quoteResult.quoteId === quote.quoteId
                 );
-                if(!mojaloopIndividualQuote.errorInformation) {
+                if (!mojaloopIndividualQuote.errorInformation) {
                     const quoteRequest = {
                         transactionId: quote.transactionId,
                         quoteId: quote.quoteId,
@@ -718,8 +721,7 @@ class InboundTransfersModel {
                         transferAmount: mojaloopIndividualQuote.transferAmount,
                         note: mojaloopIndividualQuote.note || '',
                     };
-                    const { fulfilment, ilpPacket, condition } = this._ilp.getQuoteResponseIlp(
-                        quoteRequest, quoteResponse);
+                    const { fulfilment, ilpPacket, condition } = this._ilp.getQuoteResponseIlp(quoteRequest, quoteResponse);
 
                     // mutate individual quotes in `mojaloopResponse`
                     mojaloopIndividualQuote.ilpPacket = ilpPacket;
@@ -739,21 +741,20 @@ class InboundTransfersModel {
             });
 
             // make a callback to the source fsp with the quote response
-            return this._mojaloopRequests.putBulkQuotes(bulkQuoteId, mojaloopResponse, sourceFspId);
+            return this._mojaloopRequests.putBulkQuotes(bulkQuoteId, mojaloopResponse, sourceFspId, headers);
         }
         catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err }).error('Error in bulkQuotesRequest');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putBulkQuotesError(bulkQuoteId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putBulkQuotesError(bulkQuoteId, mojaloopError, sourceFspId, headers);
         }
     }
 
     /**
     * Queries details of a bulk quote
     */
-    async getBulkQuote(bulkQuoteId, sourceFspId) {
+    async getBulkQuote(bulkQuoteId, sourceFspId, headers) {
         try {
             // make a call to the backend to get bulk quote details
             const response = await this._backendRequests.getBulkQuotes(bulkQuoteId);
@@ -766,15 +767,13 @@ class InboundTransfersModel {
             const mojaloopResponse = shared.internalBulkQuotesResponseToMojaloop(response);
 
             // make a callback to the source fsp with the bulk quote response
-            return this._mojaloopRequests.putBulkQuotes(bulkQuoteId, mojaloopResponse,
-                sourceFspId);
+            return this._mojaloopRequests.putBulkQuotes(bulkQuoteId, mojaloopResponse, sourceFspId, headers);
         }
         catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err, bulkQuoteId }).error('Error in getBulkQuote');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putBulkQuotesError(bulkQuoteId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putBulkQuotesError(bulkQuoteId, mojaloopError, sourceFspId, headers);
         }
     }
 
@@ -782,7 +781,7 @@ class InboundTransfersModel {
      * Validates  an incoming bulk transfer prepare request and makes a callback to the originator with
      * the result
      */
-    async prepareBulkTransfer(bulkPrepareRequest, sourceFspId) {
+    async prepareBulkTransfer(bulkPrepareRequest, sourceFspId, headers) {
         try {
             // retrieve bulk quote data
             const bulkQuote = await this._cache.get(`bulkQuotes_${bulkPrepareRequest.bulkQuoteId}`);
@@ -790,7 +789,9 @@ class InboundTransfersModel {
             if (!bulkQuote) {
                 // Check whether to allow transfers without a previous quote.
                 if (!this._allowTransferWithoutQuote) {
-                    throw new Error(`Corresponding bulk quotes not found for bulk transfers ${bulkPrepareRequest.bulkTransferId}`);
+                    const errMessage = `Corresponding bulk quotes not found for bulk transfers ${bulkPrepareRequest.bulkTransferId}`;
+                    this._logger.isWarnEnabled && this._logger.warn(errMessage);
+                    throw new Error(errMessage);
                 }
             }
 
@@ -846,7 +847,7 @@ class InboundTransfersModel {
                     // TODO: Verify and align with actual schema for bulk transfers error endpoint
                     const error = Errors.MojaloopApiErrorObjectFromCode(Errors.MojaloopApiErrorCodes.QUOTE_EXPIRED);
                     this._logger.isErrorEnabled && this._logger.error(`Error in prepareBulkTransfers: bulk quotes expired for bulk transfers ${bulkPrepareRequest.bulkTransferId}, system time=${now.toISOString()} > quote time=${expiration.toISOString()}`);
-                    return this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.bulkTransferId, error, sourceFspId);
+                    return this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.bulkTransferId, error, sourceFspId, headers);
                 }
             }
 
@@ -863,8 +864,7 @@ class InboundTransfersModel {
                 this._logger.isErrorEnabled && this._logger.push({ ...individualTransferErrors }).error('Error in prepareBulkTransfers');
                 this._logger.isDebugEnabled && this._logger.push({ ...individualTransferErrors }).debug(`Sending error response to ${sourceFspId}`);
 
-                return await this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.transferId,
-                    mojaloopErrorResponse, sourceFspId);
+                return this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.transferId,  mojaloopErrorResponse, sourceFspId, headers);
             }
 
             // project the incoming bulk transfer prepare into an internal bulk transfer request
@@ -884,21 +884,20 @@ class InboundTransfersModel {
             const mojaloopResponse = shared.internalBulkTransfersResponseToMojaloop(response, fulfilments);
 
             // make a callback to the source fsp with the transfer fulfilment
-            return this._mojaloopRequests.putBulkTransfers(bulkPrepareRequest.bulkTransferId, mojaloopResponse, sourceFspId);
+            return this._mojaloopRequests.putBulkTransfers(bulkPrepareRequest.bulkTransferId, mojaloopResponse, sourceFspId, headers);
         }
         catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err }).error('Error in prepareBulkTransfers');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return await this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.bulkTransferId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putBulkTransfersError(bulkPrepareRequest.bulkTransferId, mojaloopError, sourceFspId, headers);
         }
     }
 
     /**
     * Queries details of a bulk transfer
     */
-    async getBulkTransfer(bulkTransferId, sourceFspId) {
+    async getBulkTransfer(bulkTransferId, sourceFspId, headers) {
         try {
             // make a call to the backend to get bulk transfer details
             const response = await this._backendRequests.getBulkTransfers(bulkTransferId);
@@ -944,15 +943,13 @@ class InboundTransfersModel {
             };
 
             // make a callback to the source fsp with the bulk transfer fulfilments
-            return this._mojaloopRequests.putBulkTransfers(bulkTransferId, mojaloopResponse,
-                sourceFspId);
+            return this._mojaloopRequests.putBulkTransfers(bulkTransferId, mojaloopResponse, sourceFspId, headers);
         }
         catch (err) {
             this._logger.isErrorEnabled && this._logger.push({ err, bulkTransferId }).error('Error in getBulkTransfer');
             const mojaloopError = await this._handleError(err);
-            this._logger.isDebugEnabled && this._logger.push({ mojaloopError }).debug(`Sending error response to ${sourceFspId}`);
-            return this._mojaloopRequests.putBulkTransfersError(bulkTransferId,
-                mojaloopError, sourceFspId);
+            this._logger.isInfoEnabled && this._logger.push({ mojaloopError }).info(`Sending error response to ${sourceFspId}`);
+            return this._mojaloopRequests.putBulkTransfersError(bulkTransferId, mojaloopError, sourceFspId, headers);
         }
     }
 

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

@@ -33,6 +33,7 @@ const { Enum, Util: { id: idGenerator } } = require('@mojaloop/central-services-
 const { Ilp, MojaloopRequests } = require('@mojaloop/sdk-standard-components');
 
 const { API_TYPES } = require('../../constants');
+const { generateTraceparent } = require('../../lib/utils');
 const dto = require('../dto');
 const shared = require('./lib/shared');
 const PartiesModel = require('./PartiesModel');
@@ -1233,7 +1234,7 @@ class OutboundTransfersModel {
      * Modifies the data being stored in the cache for UI before it is stored.
      * Works on a copy of original object to avoid side effects
      */
-    _modifyDataForUi( data ){
+    _modifyDataForUi(data) {
         // deep cloning to avoid side effects
         let modifiedData = JSON.parse(JSON.stringify(data));
         // Removing iso quote response and extension lists
@@ -1516,21 +1517,18 @@ class OutboundTransfersModel {
         }
     }
 
-    #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;
+        const { traceId, transferId } = this.data;
+        this._logger.isInfoEnabled && this._logger.push({ traceId, transferId }).info('traceId is generated');
+        return traceId;
+    }
+
+    #createOtelHeaders() {
+        return Object.freeze({
+            traceparent: generateTraceparent(this.data.traceId),
+        });
     }
 }
 

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

@@ -26,6 +26,7 @@
  ******/
 
 const { hostname } = require('node:os');
+const { randomBytes } = require('node:crypto');
 const { WSO2Auth, Logger } = require('@mojaloop/sdk-standard-components');
 
 const SDK_LOGGER_HIERARCHY = Logger.Logger.logLevels.reverse();
@@ -79,8 +80,15 @@ const transformHeadersIsoToFspiop = (isoHeaders) => {
     return fspiopHeaders;
 };
 
+const generateTraceparent = (traceId = randomBytes(16).toString('hex')) => {
+    const spanId = randomBytes(8).toString('hex');
+    const flags = '01';
+    return `00-${traceId}-${spanId}-${flags}`;
+};
+
 module.exports = {
     createAuthClient,
     createLogger,
+    generateTraceparent,
     transformHeadersIsoToFspiop
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.2.0-csi-1210.3",
+  "version": "24.2.0-csi-1210.5",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",