Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add error metrics #1140

Merged
merged 6 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: operations
  • Loading branch information
kleyow committed Jan 4, 2025
commit 8b62a701ab8ea7f1e336b1a3853e449908df34a5
2 changes: 1 addition & 1 deletion src/api/ledgerAccountTypes/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async function create (request, h) {
return h.response().code(201)
}
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'ledgerAccountTypesCreate')
}
}

Expand Down
26 changes: 13 additions & 13 deletions src/api/participants/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const create = async function (request, h) {
}
return h.response(entityItem(participant, ledgerAccountIds)).code(201)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantCreate')
}
}

Expand Down Expand Up @@ -152,7 +152,7 @@ const createHubAccount = async function (request, h) {
const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
return h.response(entityItem(participant, ledgerAccountIds)).code(201)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantCreateHubAccount')
}
}

Expand Down Expand Up @@ -186,7 +186,7 @@ const update = async function (request) {
const ledgerAccountIds = Util.transpose(ledgerAccountTypes)
return entityItem(updatedEntity, ledgerAccountIds)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantUpdate')
}
}

Expand All @@ -195,7 +195,7 @@ const addEndpoint = async function (request, h) {
await ParticipantService.addEndpoint(request.params.name, request.payload)
return h.response().code(201)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantAddEndpoint')
}
}

Expand Down Expand Up @@ -225,7 +225,7 @@ const getEndpoint = async function (request) {
return endpoints
}
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantGetEndpoint')
}
}

Expand All @@ -234,7 +234,7 @@ const addLimitAndInitialPosition = async function (request, h) {
await ParticipantService.addLimitAndInitialPosition(request.params.name, request.payload)
return h.response().code(201)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantAddLimitAndInitialPosition')
}
}

Expand All @@ -256,7 +256,7 @@ const getLimits = async function (request) {
}
return limits
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantGetLimits')
}
}

Expand All @@ -279,7 +279,7 @@ const getLimitsForAllParticipants = async function (request) {
}
return limits
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, ' participantGetLimitsForAllParticipants')
}
}

Expand All @@ -298,23 +298,23 @@ const adjustLimits = async function (request, h) {
}
return h.response(updatedLimit).code(200)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantAdjustLimits')
}
}

const getPositions = async function (request) {
try {
return await ParticipantService.getPositions(request.params.name, request.query)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantGetPositions')
}
}

const getAccounts = async function (request) {
try {
return await ParticipantService.getAccounts(request.params.name, request.query)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantGetAccounts')
}
}

Expand All @@ -331,7 +331,7 @@ const updateAccount = async function (request, h) {
}
return h.response().code(200)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantUpdateAccount')
}
}

Expand All @@ -341,7 +341,7 @@ const recordFunds = async function (request, h) {
await ParticipantService.recordFundsInOut(request.payload, request.params, enums)
return h.response().code(202)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'participantRecordFunds')
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/api/settlementModels/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ const update = async function (request) {
const settlementDelayIds = Util.transpose(Enum.SettlementDelay)
return entityItem(updatedEntity, ledgerAccountIds, settlementGranularityIds, settlementInterchangeIds, settlementDelayIds)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'settlementModelUpdate')
}
}
const create = async function (request, h) {
try {
await SettlementService.createSettlementModel(request.payload)
return h.response().code(201)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'settlementModelCreate')
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/api/transactions/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const getById = async function (request) {
}
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, 'The requested resource could not be found.')
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'transactionsGetById')
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/handlers/admin/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const createRecordFundsInOut = async (payload, transactionTimestamp, enums) => {
await TransferService.reconciliationTransferPrepare(payload, transactionTimestamp, enums, trx)
await TransferService.reconciliationTransferReserve(payload, transactionTimestamp, enums, trx)
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'adminCreateRecordFundsInOut')
}
})
}
Expand Down Expand Up @@ -114,7 +114,7 @@ const transferExists = async (payload, transferId) => {

const transfer = async (error, messages) => {
if (error) {
util.rethrowFspiopError(error)
util.rethrowFspiopError(error, 'adminTransfer')
}
let message = {}
try {
Expand Down Expand Up @@ -158,7 +158,7 @@ const transfer = async (error, messages) => {
await Kafka.commitMessageSync(Consumer, kafkaTopic, message)
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'adminTransfer')
}
}

Expand All @@ -181,7 +181,7 @@ const registerTransferHandler = async () => {
await Consumer.createHandler(transferHandler.topicName, transferHandler.config, transferHandler.command)
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerTransferHandler')
}
}

Expand All @@ -198,7 +198,7 @@ const registerAllHandlers = async () => {
await registerTransferHandler()
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerAllHandlers')
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/handlers/bulk/fulfil/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const bulkFulfil = async (error, messages) => {
const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.MODIFIED_REQUEST)
const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action }
await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkFulfil')
}

// TODO: move FSPIOP-Source validation before Transfer Duplicate Check to accept only Payee's first request
Expand All @@ -134,7 +134,7 @@ const bulkFulfil = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkFulfil')
}
try {
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'individualTransferFulfils'))
Expand Down Expand Up @@ -240,20 +240,20 @@ const bulkFulfil = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkFulfil')
}
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorGeneric--${actionLetter}8`))

const eventDetail = { functionality: Enum.Events.Event.Type.NOTIFICATION, action }
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(validationFspiopError)
util.rethrowFspiopError(validationFspiopError, 'bulkFulfil')
}
} catch (err) {
Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}--BP0`)
histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId })
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'bulkFulfil')
}
}

Expand Down Expand Up @@ -319,7 +319,7 @@ const registerBulkFulfilHandler = async () => {
await Consumer.createHandler(bulkFulfilHandler.topicName, bulkFulfilHandler.config, bulkFulfilHandler.command)
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerBulkFulfilHandler')
}
}

Expand All @@ -342,7 +342,7 @@ const registerAllHandlers = async () => {
}
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerAllHandlers')
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/handlers/bulk/get/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const getBulkTransfer = async (error, messages) => {
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorBulkTransferNotFound--${actionLetter}3`))
const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.BULK_TRANSFER_ID_NOT_FOUND, 'Provided Bulk Transfer ID was not found on the server.')
await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkGetGetBulkTransfer')
}
// The SD says this should be 404 response which I think will not be constent with single transfers
// which responds with CLIENT_ERROR instead
Expand All @@ -108,7 +108,7 @@ const getBulkTransfer = async (error, messages) => {
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorNotBulkTransferParticipant--${actionLetter}2`))
const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.CLIENT_ERROR)
await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkGetGetBulkTransfer')
}
const isPayeeRequest = participants.payeeFsp === message.value.from
Util.breadcrumb(location, { path: 'validationPassed' })
Expand Down Expand Up @@ -152,7 +152,7 @@ const getBulkTransfer = async (error, messages) => {
}

/**
* @function registerBulkFulfilHandler
* @function registerGetBulkTransferHandler
*
* @async
* @description Registers the handler for bulk-transfer topic. Gets Kafka config from default.json
Expand All @@ -175,7 +175,7 @@ const registerGetBulkTransferHandler = async () => {
await Consumer.createHandler(bulkGetHandler.topicName, bulkGetHandler.config, bulkGetHandler.command)
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerGetBulkTransferHandler')
}
}

Expand All @@ -198,7 +198,7 @@ const registerAllHandlers = async () => {
}
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerAllHandlers')
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/handlers/bulk/prepare/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const bulkPrepare = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkPrepare')
}

const { isValid, reasons, payerParticipantId, payeeParticipantId } = await Validator.validateBulkTransfer(payload, headers)
Expand All @@ -185,7 +185,7 @@ const bulkPrepare = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkPrepare')
}
try {
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, 'individualTransfers'))
Expand Down Expand Up @@ -223,7 +223,7 @@ const bulkPrepare = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkPrepare')
}
} else { // handle validation failure
Logger.isErrorEnabled && Logger.error(Util.breadcrumb(location, { path: 'validationFailed' }))
Expand Down Expand Up @@ -259,7 +259,7 @@ const bulkPrepare = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: fspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(fspiopError)
util.rethrowFspiopError(fspiopError, 'bulkPrepare')
}
// produce validation error callback notification to payer
Logger.isInfoEnabled && Logger.info(Util.breadcrumb(location, `callbackErrorGeneric--${actionLetter}7`))
Expand All @@ -268,12 +268,12 @@ const bulkPrepare = async (error, messages) => {
params.message.value.content.uriParams = { id: bulkTransferId }

await Kafka.proceed(Config.KAFKA_CONFIG, params, { consumerCommit, fspiopError: validationFspiopError.toApiErrorObject(Config.ERROR_HANDLING), eventDetail, fromSwitch, hubName: Config.HUB_NAME })
util.rethrowFspiopError(validationFspiopError)
util.rethrowFspiopError(validationFspiopError, 'bulkPrepare')
}
} catch (err) {
Logger.isErrorEnabled && Logger.error(`${Util.breadcrumb(location)}::${err.message}--BP0`)
histTimerEnd({ success: false, fspId: Config.INSTRUMENTATION_METRICS_LABELS.fspId })
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'bulkPrepare')
}
}

Expand Down Expand Up @@ -301,7 +301,7 @@ const registerBulkPrepareHandler = async () => {
await Consumer.createHandler(bulkPrepareHandler.topicName, bulkPrepareHandler.config, bulkPrepareHandler.command)
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerBulkPrepareHandler')
}
}

Expand All @@ -324,7 +324,7 @@ const registerAllHandlers = async () => {
}
return true
} catch (err) {
util.rethrowFspiopError(err)
util.rethrowFspiopError(err, 'registerAllHandlers')
}
}

Expand Down
Loading