account-lookup-service 15.6.0-iso.20 → 15.6.0-iso.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "15.6.0-iso.20",
+  "version": "15.6.0-iso.21",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -93,12 +93,12 @@
     "@mojaloop/central-services-error-handling": "13.0.2",
     "@mojaloop/central-services-health": "15.0.0",
     "@mojaloop/central-services-logger": "11.5.1",
-    "@mojaloop/central-services-metrics": "12.4.1",
-    "@mojaloop/central-services-shared": "18.13.0",
+    "@mojaloop/central-services-metrics": "12.4.2",
+    "@mojaloop/central-services-shared": "18.14.1",
     "@mojaloop/central-services-stream": "11.3.1",
     "@mojaloop/database-lib": "11.0.6",
     "@mojaloop/event-sdk": "14.1.1",
-    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.0",
+    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1",
     "@mojaloop/ml-schema-transformer-lib": "2.4.1",
     "@mojaloop/sdk-standard-components": "19.6.2",
     "@now-ims/hapi-now-auth": "2.1.0",
@@ -106,7 +106,7 @@
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "12.1.0",
-    "cron": "3.3.0",
+    "cron": "3.3.1",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",

package/src/domain/oracle/oracle.js

@@ -49,9 +49,15 @@ exports.createOracle = async (payload) => {
     'Create Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
+
   try {
+    step = 'getPartyIdTypeByName-1'
     const partyIdTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
+    step = 'getEndpointTypeByType-2'
     const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
+    step = 'getAllOracleEndpointsByMatchCondition-3'
     const existingActiveOracle = await oracleEndpoint.getAllOracleEndpointsByMatchCondition(
       payload,
       partyIdTypeModel.partyIdTypeId,
@@ -77,13 +83,23 @@ exports.createOracle = async (payload) => {
     oracleEntity.createdBy = 'Admin'
     oracleEntity.partyIdTypeId = partyIdTypeModel.partyIdTypeId
     oracleEntity.endpointTypeId = endpointTypeModel.endpointTypeId
+    step = 'createOracleEndpoint-4'
     await oracleEndpoint.createOracleEndpoint(oracleEntity)
     histTimerEnd({ success: true })
     return true
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'createOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -100,6 +116,8 @@ exports.getOracle = async (query) => {
     'Get Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
     let oracleEndpointModelList
     let isCurrency; let isType = false
@@ -111,12 +129,16 @@ exports.getOracle = async (query) => {
       isType = true
     }
     if (isCurrency && isType) {
+      step = 'getOracleEndpointByTypeAndCurrency-1'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByTypeAndCurrency(query.type, query.currency)
     } else if (isCurrency && !isType) {
+      step = 'getOracleEndpointByCurrency-2'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByCurrency(query.currency)
     } else if (isType && !isCurrency) {
+      step = 'getOracleEndpointByType-3'
       oracleEndpointModelList = await cachedOracleEndpoint.getOracleEndpointByType(query.type)
     } else {
+      step = 'getAllOracleEndpoint-4'
       oracleEndpointModelList = await oracleEndpoint.getAllOracleEndpoint()
     }
     for (const oracleEndpointModel of oracleEndpointModelList) {
@@ -137,7 +159,16 @@ exports.getOracle = async (query) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'getOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -155,11 +186,17 @@ exports.updateOracle = async (params, payload) => {
     'Update Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
+    step = 'getOracleEndpointById-1'
     const currentOracleEndpointList = await oracleEndpoint.getOracleEndpointById(params.ID)
     if (currentOracleEndpointList.length > 0) {
+      step = 'getPartyIdTypeByName-2'
       const partyIdTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
+      step = 'getEndpointTypeByType-3'
       const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
+      step = 'getAllOracleEndpointsByMatchCondition-4'
       const existingActiveOracle = await oracleEndpoint.getAllOracleEndpointsByMatchCondition(
         payload,
         partyIdTypeModel.partyIdTypeId,
@@ -175,6 +212,7 @@ exports.updateOracle = async (params, payload) => {
       const currentOracleEndpoint = currentOracleEndpointList[0]
       const newOracleEntry = {}
       if (payload.oracleIdType && payload.oracleIdType !== currentOracleEndpoint.idType) {
+        step = 'getPartyIdTypeByName-5'
         const partyTypeModel = await partyIdType.getPartyIdTypeByName(payload.oracleIdType)
         newOracleEntry.partyIdTypeId = partyTypeModel.partyIdTypeId
       }
@@ -182,10 +220,12 @@ exports.updateOracle = async (params, payload) => {
         newOracleEntry.value = payload.endpoint.value
       }
       if (payload.endpoint && payload.endpoint.endpointType && payload.endpoint.endpointType !== currentOracleEndpoint.endpointType) {
+        step = 'getEndpointTypeByType-6'
         const endpointTypeModel = await endpointType.getEndpointTypeByType(payload.endpoint.endpointType)
         newOracleEntry.endpointTypeId = endpointTypeModel.endpointTypeId
       }
       if (payload.currency && payload.currency !== currentOracleEndpoint.currency) {
+        step = 'getCurrencyById-7'
         const currencyModel = await currency.getCurrencyById(payload.currency)
         if (currencyModel) {
           newOracleEntry.currencyId = payload.currency
@@ -196,6 +236,7 @@ exports.updateOracle = async (params, payload) => {
       if (payload.isDefault && payload.isDefault !== currentOracleEndpoint.isDefault) {
         newOracleEntry.isDefault = payload.isDefault
       }
+      step = 'updateOracleEndpointById-8'
       await oracleEndpoint.updateOracleEndpointById(params.ID, newOracleEntry)
       histTimerEnd({ success: true })
       return true
@@ -205,7 +246,16 @@ exports.updateOracle = async (params, payload) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'updateOracle',
+      step
+    })
+    throw fspiopError
   }
 }
 
@@ -222,6 +272,7 @@ exports.deleteOracle = async (params) => {
     'Delete Oracle',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   try {
     await oracleEndpoint.destroyOracleEndpointById(params.ID)
     histTimerEnd({ success: true })
@@ -229,6 +280,14 @@ exports.deleteOracle = async (params) => {
   } catch (err) {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'deleteOracle'
+    })
+    throw fspiopError
   }
 }

package/src/domain/participants/participants.js

@@ -58,6 +58,7 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
     'Get participants by ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const log = logger.child('getParticipantsByTypeAndID')
   const type = params.Type
   const partySubIdOrType = params.SubId
@@ -70,9 +71,11 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
     : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
 
   let fspiopError
+  let step
 
   try {
     log.info('processing started...', { source, params })
+    step = 'validateParticipant-1'
     const requesterParticipantModel = await participant.validateParticipant(source)
 
     if (!requesterParticipantModel) {
@@ -80,7 +83,7 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
       logger.warn(errMessage, { requesterName: source })
       throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
     }
-
+    step = 'oracleRequest-2'
     const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
     if (response?.data && Array.isArray(response.data.partyList) && response.data.partyList.length > 0) {
       const options = {
@@ -96,6 +99,7 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
         clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE]
       }
       clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+      step = 'sendRequest-3'
       await participant.sendRequest(
         clonedHeaders,
         source,
@@ -106,6 +110,7 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
         childSpan
       )
     } else {
+      step = 'sendErrorToParticipant-4'
       await participant.sendErrorToParticipant(
         source,
         errorCallbackEndpointType,
@@ -123,6 +128,14 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
   } catch (err) {
     log.warn('error in getParticipantsByTypeAndID', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'getParticipantsByTypeAndID',
+      step
+    })
     try {
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -133,7 +146,6 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
         childSpan
       )
     } catch (exc) {
-      fspiopError = ErrorHandler.Factory.reformatFSPIOPError(exc)
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
       log.error('error in final participant.sendErrorToParticipant', exc)
@@ -168,6 +180,8 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     'Put participants by type and ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
     logger.info('putParticipantsByTypeAndID::begin')
     const type = params.Type
@@ -175,8 +189,10 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
     const errorCallbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE])
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, undefined, payload, cache)
         if (response && response.data) {
           const responsePayload = {
@@ -202,8 +218,10 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
             clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
+          step = 'sendErrorToParticipant-4'
           await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
             ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
         }
@@ -212,6 +230,7 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.sourceFspNotFound)
       }
     } else {
+      step = 'sendErrorToParticipant-5'
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
     }
@@ -219,15 +238,25 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     histTimerEnd({ success: true })
   } catch (err) {
     logger.error('error in putParticipantsByTypeAndID:', err)
+    let fspiopError
     try {
       const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+      fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+        fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params)
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
       logger.error('error in participant.sendErrorToParticipant:', exc)
     }
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'putParticipantsByTypeAndID',
+      step
+    })
     histTimerEnd({ success: false })
   }
 }
@@ -251,14 +280,18 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
     'Put participants error by type and ID',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   try {
     const partySubIdOrType = params.SubId || undefined
     const callbackEndpointType = partySubIdOrType
       ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
       : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
+    step = 'validateParticipant-1'
     const destinationParticipant = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.DESTINATION])
     if (destinationParticipant) {
       const decodedPayload = decodePayload(dataUri, { asParsed: false })
+      step = 'sendErrorToParticipant-2'
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.DESTINATION],
         callbackEndpointType,
@@ -267,6 +300,7 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         params
       )
     } else {
+      step = 'sendErrorToParticipant-3'
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
         callbackEndpointType,
@@ -280,16 +314,25 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
   } catch (err) {
     logger.error('error in putParticipantsErrorByTypeAndID:', err)
     try {
+      const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
       const callbackEndpointType = params.SubId
         ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
         : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
         callbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err).toApiErrorObject(),
+        fspiopError.toApiErrorObject(),
         headers,
         params
       )
+      const extensions = err.extensions || []
+      const system = extensions.find((element) => element.key === 'system')?.value || ''
+      errorCounter.inc({
+        code: fspiopError?.apiErrorCode,
+        system,
+        operation: 'putParticipantsErrorByTypeAndID',
+        step
+      })
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
@@ -316,8 +359,10 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
     'Post participants',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const childSpan = span ? span.getChild('postParticipants') : undefined
   let fspiopError
+  let step
   try {
     logger.info('postParticipants::begin')
     const type = params.Type
@@ -330,8 +375,10 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
       : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
 
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], childSpan)
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, undefined, payload, cache)
         if (response && response.status === Enums.Http.ReturnCodes.CREATED.CODE) {
           const responsePayload = {
@@ -357,12 +404,14 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
             clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = payload.fspId
             clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
           }
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options, childSpan)
           if (childSpan && !childSpan.isFinished) {
             await childSpan.finish()
           }
         } else {
           fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
+          step = 'sendErrorToParticipant-4'
           await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
             fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params, childSpan)
         }
@@ -382,6 +431,14 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
   } catch (err) {
     logger.error('error in postParticipants:', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'postParticipants',
+      step
+    })
     try {
       const errorCallbackEndpointType = params.SubId
         ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
@@ -419,11 +476,12 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
     'Post participants batch',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const requestId = requestPayload.requestId
   const log = logger.child({ context: 'postParticipantsBatch', requestId })
   const childSpan = span ? span.getChild('postParticipantsBatch') : undefined
   let fspiopError
-
+  let step
   try {
     log.info('postParticipantsBatch::begin', { headers, requestPayload })
     const typeMap = new Map()
@@ -438,7 +496,7 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
         }]).toApiErrorObject(Config.ERROR_HANDLING)
       })
     }
-
+    step = 'validateParticipant-1'
     const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], childSpan)
     if (!requesterParticipantModel) {
       const errMessage = ERROR_MESSAGES.sourceFspNotFound
@@ -472,6 +530,7 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
         partyList: value
       }
       log.info(`postParticipantsBatch::oracleBatchRequest::type=${key}`, { payload })
+      step = 'oracleBatchRequest-2'
       const response = await oracle.oracleBatchRequest(headers, method, requestPayload, key, payload)
       if (Array.isArray(response?.data?.partyList) && response.data.partyList.length > 0) {
         for (const party of response.data.partyList) {
@@ -504,6 +563,14 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
   } catch (err) {
     log.error('error in postParticipantsBatch', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'postParticipantsBatch',
+      step
+    })
     try {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR,
         fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, undefined, requestPayload)
@@ -539,7 +606,9 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     'Delete participants',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const log = logger.child('deleteParticipants')
+  let step
   try {
     log.debug('deleteParticipants::begin', { headers, params })
     const type = params.Type
@@ -547,8 +616,10 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     const callbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT
     const errorCallbackEndpointType = partySubIdOrType ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
     if (Object.values(Enums.Accounts.PartyAccountTypes).includes(type)) {
+      step = 'validateParticipant-1'
       const requesterParticipantModel = await participant.validateParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE])
       if (requesterParticipantModel) {
+        step = 'oracleRequest-2'
         const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
         if (response) {
           const responsePayload = {
@@ -562,8 +633,10 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
           const clonedHeaders = { ...headers }
           clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION] = headers[Enums.Http.Headers.FSPIOP.SOURCE]
           clonedHeaders[Enums.Http.Headers.FSPIOP.SOURCE] = Config.HUB_NAME
+          step = 'sendRequest-3'
           await participant.sendRequest(clonedHeaders, clonedHeaders[Enums.Http.Headers.FSPIOP.DESTINATION], callbackEndpointType, Enums.Http.RestMethods.PUT, responsePayload, options)
         } else {
+          step = 'sendErrorToParticipant-4'
           await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
             ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
         }
@@ -573,6 +646,7 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
     } else {
+      step = 'sendErrorToParticipant-5'
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
     }
@@ -581,9 +655,18 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
   } catch (err) {
     log.error('error in deleteParticipants', err)
     try {
+      const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR)
       const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
-        ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.DELETE_PARTY_INFO_ERROR).toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+        fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params)
+      const extensions = err.extensions || []
+      const system = extensions.find((element) => element.key === 'system')?.value || ''
+      errorCounter.inc({
+        code: fspiopError?.apiErrorCode,
+        system,
+        operation: 'deleteParticipants',
+        step
+      })
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -87,6 +87,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     'Get party by Type and Id',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
   const type = params.Type
   const partySubId = params.SubId
@@ -99,7 +100,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
 
   let requester
   let fspiopError
-
+  let step
   try {
     requester = await validateRequester({ source, proxy, proxyCache })
 
@@ -114,8 +115,10 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     // the requester has specified a destination routing header. We should respect that and forward the request directly to the destination
     // without consulting any oracles.
     if (destination) {
+      step = 'validateParticipant-1'
       const destParticipantModel = await participant.validateParticipant(destination)
       if (!destParticipantModel) {
+        step = 'lookupProxyByDfspId-2'
         const proxyId = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
 
         if (!proxyId) {
@@ -125,6 +128,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         destination = proxyId
       }
       // all ok, go ahead and forward the request
+      step = 'sendRequest-3'
       await participant.sendRequest(headers, destination, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
 
       histTimerEnd({ success: true })
@@ -132,6 +136,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
       return
     }
 
+    step = 'oracleRequest-4'
     const response = await oracle.oracleRequest(headers, method, params, query, undefined, cache)
     if (Array.isArray(response?.data?.partyList) && response.data.partyList.length > 0) {
       // Oracle's API is a standard rest-style end-point Thus a GET /party on the oracle will return all participant-party records. We must filter the results based on the callbackEndpointType to make sure we remove records containing partySubIdOrType when we are in FSPIOP_CALLBACK_URL_PARTIES_GET mode:
@@ -159,6 +164,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         if (!destination) {
           clonedHeaders[Headers.FSPIOP.DESTINATION] = fspId
         }
+        step = 'validateParticipant-5'
         const schemeParticipant = await participant.validateParticipant(fspId)
         if (schemeParticipant) {
           sentCount++
@@ -169,6 +175,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         // If the participant is not in the scheme and proxy routing is enabled,
         // we should check if there is a proxy for it and send the request to the proxy
         if (proxyEnabled) {
+          step = 'lookupProxyByDfspId-6'
           const proxyName = await proxyCache.lookupProxyByDfspId(fspId)
           if (!proxyName) {
             log.warn('no proxyMapping for participant!  TODO: Delete reference in oracle...', { fspId })
@@ -180,6 +187,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
           }
         }
       })
+      step = 'sendRequests-7'
       await Promise.all(sending)
       log.info('participant.sendRequests to filtered oracle partyList are done', { sentCount })
       // todo: think what if sentCount === 0 here
@@ -188,6 +196,7 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
       let filteredProxyNames = []
 
       if (proxyEnabled) {
+        step = 'getAllProxiesNames-8'
         const proxyNames = await Util.proxies.getAllProxiesNames(Config.SWITCH_ENDPOINT)
         filteredProxyNames = proxyNames.filter(name => name !== proxy)
       }
@@ -203,16 +212,19 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
         })
         fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
         const errorCallbackEndpointType = utils.errorPartyCbType(partySubId)
+        step = 'sendErrorToParticipant-9'
         await participant.sendErrorToParticipant(requester, errorCallbackEndpointType,
           fspiopError.toApiErrorObject(config.ERROR_HANDLING), callbackHeaders, params, childSpan)
       } else {
         const alsReq = utils.alsRequestDto(source, params)
         log.info('starting setSendToProxiesList flow: ', { filteredProxyNames, alsReq, proxyCacheTtlSec })
+        step = 'setSendToProxiesList-10'
         const isCached = await proxyCache.setSendToProxiesList(alsReq, filteredProxyNames, proxyCacheTtlSec)
         if (!isCached) {
           throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
         }
 
+        step = 'sending-11'
         const sending = filteredProxyNames.map(
           proxyName => participant.sendRequest(headers, proxyName, callbackEndpointType, RestMethods.GET, undefined, options, childSpan)
             .then(({ status, data } = {}) => ({ status, data }))
@@ -232,6 +244,14 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
   } catch (err) {
     fspiopError = await handleErrorOnSendingCallback(err, headers, params, requester)
     histTimerEnd({ success: false })
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'getPartiesByTypeAndID',
+      step
+    })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)
   }

package/src/domain/parties/parties.js

@@ -65,6 +65,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     'Put parties by type and id',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const type = params.Type
   const partySubId = params.SubId
   const source = headers[Headers.FSPIOP.SOURCE]
@@ -74,13 +75,16 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
   log.info('parties::putPartiesByTypeAndID::begin', { source, destination, proxy, params })
 
   let sendTo
+  let step
   try {
+    step = 'validateParticipant-1'
     const requesterParticipant = await participant.validateParticipant(source)
     if (!requesterParticipant) {
       if (!proxyEnabled || !proxy) {
         const errMessage = ERROR_MESSAGES.partySourceFspNotFound
         throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
       }
+      step = 'addDfspIdToProxyMapping-1'
       const isCached = await proxyCache.addDfspIdToProxyMapping(source, proxy)
       // think,if we should throw error if isCached === false?
       log.info('addDfspIdToProxyMapping is done', { source, proxy, isCached })
@@ -88,6 +92,7 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
 
     if (proxyEnabled && proxy) {
       const alsReq = utils.alsRequestDto(destination, params) // or source?
+      step = 'receivedSuccessResponse-2'
       const isExists = await proxyCache.receivedSuccessResponse(alsReq)
       if (!isExists) {
         log.warn('destination is NOT in scheme, and no cached sendToProxiesList', { destination, alsReq })
@@ -96,13 +101,15 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
         const mappingPayload = {
           fspId: source
         }
+        step = 'oracleRequest-3'
         await oracle.oracleRequest(headers, RestMethods.POST, params, null, mappingPayload, cache)
         log.info('oracle was updated with mappingPayload', { mappingPayload, params })
       }
     }
-
+    step = 'validateParticipant-4'
     const destinationParticipant = await participant.validateParticipant(destination)
     if (!destinationParticipant) {
+      step = 'lookupProxyByDfspId-5'
       const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
       if (!proxyName) {
         const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
@@ -120,12 +127,21 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
       partyIdentifier: params.ID,
       ...(partySubId && { partySubIdOrType: partySubId })
     }
+    step = 'sendRequest-6'
     await participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.PUT, decodedPayload.body.toString(), options)
 
     log.info('parties::putPartiesByTypeAndID::callback was sent', { sendTo, options })
     histTimerEnd({ success: true })
   } catch (err) {
-    await handleErrorOnSendingCallback(err, headers, params, sendTo)
+    const fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'putPartiesByTypeAndID',
+      step
+    })
     histTimerEnd({ success: false })
   }
 }
@@ -149,6 +165,7 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     'Put parties error by type and id',
     ['success']
   ).startTimer()
+  const errorCounter = Metrics.getCounter('errorCount')
   const partySubId = params.SubId
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const callbackEndpointType = utils.errorPartyCbType(partySubId)
@@ -158,12 +175,14 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
 
   let sendTo
   let fspiopError
+  let step
 
   try {
     const proxy = proxyEnabled && headers[Headers.FSPIOP.PROXY]
     if (proxy) {
       if (isNotValidPayeeCase(payload)) {
         const swappedHeaders = utils.swapSourceDestinationHeaders(headers)
+        step = 'oracleRequest-1'
         await oracle.oracleRequest(swappedHeaders, RestMethods.DELETE, params, null, null, cache)
         getPartiesByTypeAndID(swappedHeaders, params, RestMethods.GET, {}, span, cache, proxyCache)
         // todo: - think if we need to send errorCallback?
@@ -173,18 +192,20 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
       }
 
       const alsReq = utils.alsRequestDto(destination, params) // or source?
+      step = 'receivedErrorResponse-2'
       const isLast = await proxyCache.receivedErrorResponse(alsReq, proxy)
       if (!isLast) {
         log.info('got NOT last error callback from proxy:', { proxy, alsReq })
         return
       }
     }
-
+    step = 'validateParticipant-3'
     const destinationParticipant = await participant.validateParticipant(destination)
 
     if (destinationParticipant) {
       sendTo = destination
     } else {
+      step = 'lookupProxyByDfspId-4'
       const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
       if (!proxyName) {
         const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
@@ -199,6 +220,14 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     histTimerEnd({ success: true })
   } catch (err) {
     fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'putPartiesErrorByTypeAndID',
+      step
+    })
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/timeout/index.js

@@ -57,20 +57,31 @@ const sendTimeoutCallback = async (cacheKey) => {
     'Egress - Interscheme parties lookup timeout callback',
     ['success']
   ).startTimer()
-
+  const errorCounter = Metrics.getCounter('errorCount')
+  let step
   const [, destination, partyType, partyId] = cacheKey.split(':')
   const { errorInformation, params, headers, endpointType, span } = await timeoutCallbackDto({ destination, partyId, partyType })
   logger.debug('sendTimeoutCallback details:', { destination, partyType, partyId, cacheKey })
 
   try {
+    step = 'validateParticipant-1'
     await validateParticipant(destination)
     await span.audit({ headers, errorInformation }, AuditEventAction.start)
+    step = 'sendErrorToParticipant-2'
     await Participant.sendErrorToParticipant(destination, endpointType, errorInformation, headers, params, undefined, span)
     histTimerEnd({ success: true })
   } catch (err) {
     logger.warn('error in sendTimeoutCallback: ', err)
     histTimerEnd({ success: false })
     const fspiopError = reformatFSPIOPError(err)
+    const extensions = err.extensions || []
+    const system = extensions.find((element) => element.key === 'system')?.value || ''
+    errorCounter.inc({
+      code: fspiopError?.apiErrorCode,
+      system,
+      operation: 'sendTimeoutCallback',
+      step
+    })
     await finishSpan(span, fspiopError)
     throw fspiopError
   }

package/src/models/currency/currency.js

@@ -39,7 +39,16 @@ const getCurrencyById = async (currencyId) => {
   try {
     return Db.from('currency').findOne({ currencyId, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/endpointType/endpointType.js

@@ -39,7 +39,16 @@ const getEndpointTypeByType = async (type) => {
   try {
     return Db.from('endpointType').findOne({ type, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/facade.js

@@ -123,6 +123,10 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
       throw err
     }
   } catch (err) {
+    const extensions = [{
+      key: 'system',
+      value: '["@hapi/catbox-memory","http"]'
+    }]
     Logger.isErrorEnabled && Logger.error(`error in oracleRequest: ${err?.stack}`)
     // If the error was a 400 from the Oracle, we'll modify the error to generate a response to the
     // initiator of the request.
@@ -131,15 +135,32 @@ exports.oracleRequest = async (headers, method, params = {}, query = {}, payload
       err.apiErrorCode.code === ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_COMMUNICATION_ERROR.code
     ) {
       if (err.extensions.some(ext => (ext.key === 'status' && ext.value === Enums.Http.ReturnCodes.BADREQUEST.CODE))) {
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
+        throw ErrorHandler.Factory.createFSPIOPError(
+          ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND,
+          undefined,
+          undefined,
+          undefined,
+          extensions
+        )
         // Added error 404 to cover a special case of the Mowali implementation
         // which uses mojaloop/als-oracle-pathfinder and currently returns 404
         // and in which case the Mowali implementation expects back `DESTINATION_FSP_ERROR`.
       } else if (err.extensions.some(ext => (ext.key === 'status' && ext.value === Enums.Http.ReturnCodes.NOTFOUND.CODE))) {
-        throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR)
+        throw ErrorHandler.Factory.createFSPIOPError(
+          ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR,
+          undefined,
+          undefined,
+          undefined,
+          extensions
+        )
       }
     }
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/oracleEndpoint.js

@@ -27,6 +27,10 @@
 
 const Db = require('../../lib/db')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const extensions = [{
+  key: 'system',
+  value: '["db"]'
+}]
 
 const getOracleEndpointByType = async (type) => {
   try {
@@ -43,7 +47,12 @@ const getOracleEndpointByType = async (type) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -64,7 +73,12 @@ const getOracleEndpointByTypeAndCurrency = async (type, currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -84,7 +98,12 @@ const getOracleEndpointByCurrency = async (currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -104,7 +123,12 @@ const getOracleEndpointById = async (oracleEndpointId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -122,7 +146,12 @@ const getAllOracleEndpoint = async () => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -142,7 +171,12 @@ const getAllOracleEndpointsByMatchCondition = async (oracleEndpointModel, partyI
           'oracleEndpoint.isActive', 'oracleEndpoint.partyIdTypeId', 'oracleEndpoint.endpointTypeId', 'oracleEndpoint.currencyId')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -150,7 +184,12 @@ const createOracleEndpoint = async (oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').insert(oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -158,7 +197,12 @@ const updateOracleEndpointById = async (id, oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId: id }, oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -166,7 +210,12 @@ const setIsActiveOracleEndpoint = async (oracleType, isActive) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleType }, { isActive })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -174,7 +223,12 @@ const destroyOracleEndpointById = async (oracleEndpointId) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId }, { isActive: false })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/models/oracle/oracleEndpointCached.js

@@ -31,6 +31,10 @@ const Metrics = require('@mojaloop/central-services-metrics')
 const OracleEndpointUncached = require('./oracleEndpoint')
 
 let cacheClient
+const extensions = [{
+  key: 'system',
+  value: '["db","@hapi/catbox-memory"]'
+}]
 
 const getCacheKey = (params) => {
   return cacheClient.createKey(`${Object.values(params).join('__')}`)
@@ -87,7 +91,12 @@ exports.getOracleEndpointByTypeAndCurrency = async (partyIdType, currency) => {
   try {
     return await getOracleEndpointCached({ partyIdType, currency })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -95,7 +104,12 @@ exports.getOracleEndpointByType = async (partyIdType) => {
   try {
     return await getOracleEndpointCached({ partyIdType })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -103,6 +117,11 @@ exports.getOracleEndpointByCurrency = async (currency) => {
   try {
     return await getOracleEndpointCached({ currency })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }

package/src/models/participantEndpoint/facade.js

@@ -126,7 +126,16 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName: requestedParticipant })
     logger.warn('error in sendRequest: ', err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -151,7 +160,16 @@ exports.validateParticipant = async (fsp) => {
   } catch (err) {
     histTimerEnd({ success: false })
     logger.warn('error in validateParticipant: ', err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 
@@ -191,7 +209,16 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
   } catch (err) {
     histTimerEndGetParticipantEndpoint({ success: false, endpointType, participantName })
     logger.warn('error in getEndpoint: ', err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 
   // Send error to participant
@@ -235,6 +262,15 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
   } catch (err) {
     histTimerEndSendRequestToParticipant({ success: false, endpointType, participantName })
     logger.warn('error in sendErrorToParticipant: ', err)
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["http"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }

package/src/models/partyIdType/partyIdType.js

@@ -32,7 +32,16 @@ const getPartyIdTypeByName = async (name) => {
   try {
     return Db.from('partyIdType').findOne({ name, isActive: true })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(err)
+    const extensions = [{
+      key: 'system',
+      value: '["db"]'
+    }]
+    throw ErrorHandler.Factory.reformatFSPIOPError(
+      err,
+      undefined,
+      undefined,
+      extensions
+    )
   }
 }
 

package/src/server.js

@@ -105,6 +105,14 @@ const createServer = async (port, api, routes, isAdmin, proxyCacheConfig, proxyM
   await Plugins.registerPlugins(server, api, isAdmin)
 
   server.route(routes)
+
+  // Initialize the error count metric
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   // TODO: follow instructions https://github.com/anttiviljami/openapi-backend/blob/master/DOCS.md#postresponsehandler-handler
   await server.start()
 

package/test/unit/domain/oracle/oracle.test.js

@@ -37,6 +37,7 @@ const partyIdType = require('../../../../src/models/partyIdType')
 const Db = require('../../../../src/lib/db')
 const oracleEndpointCached = require('../../../../src/models/oracle/oracleEndpointCached')
 const Logger = require('@mojaloop/central-services-logger')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 Logger.isDebugEnabled = jest.fn(() => true)
 Logger.isErrorEnabled = jest.fn(() => true)
@@ -90,6 +91,13 @@ let sandbox
 let SpanStub
 
 describe('Oracle tests', () => {
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(() => {
     sandbox = Sinon.createSandbox()
     Db.partyIdType = {

package/test/unit/domain/participants/participants.test.js

@@ -34,6 +34,7 @@ const Sinon = require('sinon')
 const Enums = require('@mojaloop/central-services-shared').Enum
 const Logger = require('@mojaloop/central-services-logger')
 const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 const participantsDomain = require('../../../../src/domain/participants/participants')
 const participant = require('../../../../src/models/participantEndpoint/facade')
@@ -49,6 +50,12 @@ const { Headers } = Enums.Http
 describe('participant Tests', () => {
   describe('getParticipantsByTypeAndID', () => {
     let sandbox
+    // Initialize Metrics for testing
+    Metrics.getCounter(
+      'errorCount',
+      'Error count',
+      ['code', 'system', 'operation', 'step']
+    )
 
     beforeEach(() => {
       sandbox = Sinon.createSandbox()

package/test/unit/domain/parties/parties.test.js

@@ -37,6 +37,7 @@ const { createProxyCache } = require('@mojaloop/inter-scheme-proxy-cache-lib')
 const { Enum, Util } = require('@mojaloop/central-services-shared')
 const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
 const Logger = require('@mojaloop/central-services-logger')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 const Config = require('../../../../src/lib/config')
 const Db = require('../../../../src/lib/db')
@@ -65,6 +66,13 @@ let sandbox
 describe('Parties Tests', () => {
   let proxyCache
 
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(async () => {
     await Util.Endpoints.initializeCache(Config.CENTRAL_SHARED_ENDPOINT_CACHE_CONFIG, libUtil.hubNameConfig)
     sandbox = Sinon.createSandbox()

package/test/unit/domain/timeout/index.test.js

@@ -33,8 +33,16 @@
 
 const Participant = require('../../../../src/models/participantEndpoint/facade')
 const TimeoutDomain = require('../../../../src/domain/timeout')
+const Metrics = require('@mojaloop/central-services-metrics')
 
 describe('Timeout Domain', () => {
+  // Initialize Metrics for testing
+  Metrics.getCounter(
+    'errorCount',
+    'Error count',
+    ['code', 'system', 'operation', 'step']
+  )
+
   beforeEach(() => {
     jest.clearAllMocks()
     jest.spyOn(Participant, 'validateParticipant').mockResolvedValue({})