From a153f23434118299921857ed7b3bee0fd677cb67 Mon Sep 17 00:00:00 2001 From: Jay Yu <103467857+jayy04@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:12:35 -0400 Subject: [PATCH] add telemetry and logs for liquidation daemon --- .../daemons/liquidation/client/grpc_helper.go | 14 ++++++++++- .../liquidation/client/sub_task_runner.go | 24 +++++++++++++++---- protocol/lib/metrics/constants.go | 1 + 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/protocol/daemons/liquidation/client/grpc_helper.go b/protocol/daemons/liquidation/client/grpc_helper.go index 691c467a01..d451dadbb1 100644 --- a/protocol/daemons/liquidation/client/grpc_helper.go +++ b/protocol/daemons/liquidation/client/grpc_helper.go @@ -5,6 +5,7 @@ import ( "fmt" "time" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/telemetry" "github.com/cosmos/cosmos-sdk/types/grpc" "github.com/cosmos/cosmos-sdk/types/query" @@ -271,9 +272,20 @@ func (c *Client) SendLiquidatableSubaccountIds( )..., ) + telemetry.ModuleSetGauge( + metrics.LiquidationDaemon, + float32(len(requests)), + metrics.NumRequests, + metrics.Count, + ) + for _, req := range requests { if _, err := c.LiquidationServiceClient.LiquidateSubaccounts(ctx, req); err != nil { - return err + return errorsmod.Wrapf( + err, + "failed to send liquidatable subaccount ids to protocol at block height %d", + blockHeight, + ) } } diff --git a/protocol/daemons/liquidation/client/sub_task_runner.go b/protocol/daemons/liquidation/client/sub_task_runner.go index 9d5a0c37e7..f9600f97e1 100644 --- a/protocol/daemons/liquidation/client/sub_task_runner.go +++ b/protocol/daemons/liquidation/client/sub_task_runner.go @@ -120,13 +120,21 @@ func (c *Client) FetchApplicationStateAtBlockHeight( // Subaccounts subaccounts, err = c.GetAllSubaccounts(queryCtx, liqFlags.QueryPageLimit) if err != nil { - return nil, nil, err + return nil, nil, errorsmod.Wrapf( + err, + "failed to fetch subaccounts at block height %d", + blockHeight, + ) } // Market prices marketPrices, err := c.GetAllMarketPrices(queryCtx, liqFlags.QueryPageLimit) if err != nil { - return nil, nil, err + return nil, nil, errorsmod.Wrapf( + err, + "failed to fetch market prices at block height %d", + blockHeight, + ) } marketPricesMap := lib.UniqueSliceToMap(marketPrices, func(m pricestypes.MarketPrice) uint32 { return m.Id @@ -135,13 +143,21 @@ func (c *Client) FetchApplicationStateAtBlockHeight( // Perpetuals perpetuals, err := c.GetAllPerpetuals(queryCtx, liqFlags.QueryPageLimit) if err != nil { - return nil, nil, err + return nil, nil, errorsmod.Wrapf( + err, + "failed to fetch perpetuals at block height %d", + blockHeight, + ) } // Liquidity tiers liquidityTiers, err := c.GetAllLiquidityTiers(queryCtx, liqFlags.QueryPageLimit) if err != nil { - return nil, nil, err + return nil, nil, errorsmod.Wrapf( + err, + "failed to fetch liquidity tiers at block height %d", + blockHeight, + ) } liquidityTiersMap := lib.UniqueSliceToMap(liquidityTiers, func(l perptypes.LiquidityTier) uint32 { return l.Id diff --git a/protocol/lib/metrics/constants.go b/protocol/lib/metrics/constants.go index 8493fa8dc5..0ac766bf5b 100644 --- a/protocol/lib/metrics/constants.go +++ b/protocol/lib/metrics/constants.go @@ -314,6 +314,7 @@ const ( GetSubaccountsFromKey = "get_subaccounts_from_key" LiquidatableSubaccountIds = "liquidatable_subaccount_ids" LiquidationDaemon = "liquidation_daemon" + NumRequests = "num_requests" NegativeTncSubaccountIds = "negative_tnc_subaccount_ids" PageLimit = "page_limit" SendLiquidatableSubaccountIds = "send_liquidatable_subaccount_ids"