From 60ee56a23eed36051ee82a1ac3fca2ea288fab32 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Fri, 7 Jul 2023 10:41:36 -0400 Subject: [PATCH 1/3] Add a metric to display pruning of the node's peer --- metrics/metrics.go | 5 +++++ node/modules/lp2p/pubsub.go | 1 + 2 files changed, 6 insertions(+) diff --git a/metrics/metrics.go b/metrics/metrics.go index ee7bd8695cc..cc2aa2ed8fe 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -116,6 +116,7 @@ var ( PubsubDeliverMessage = stats.Int64("pubsub/delivered", "Counter for total delivered messages", stats.UnitDimensionless) PubsubRejectMessage = stats.Int64("pubsub/rejected", "Counter for total rejected messages", stats.UnitDimensionless) PubsubDuplicateMessage = stats.Int64("pubsub/duplicate", "Counter for total duplicate messages", stats.UnitDimensionless) + PubsubPruneMessage = stats.Int64("pubsub/prune", "Counter for total prune messages", stats.UnitDimensionless) PubsubRecvRPC = stats.Int64("pubsub/recv_rpc", "Counter for total received RPCs", stats.UnitDimensionless) PubsubSendRPC = stats.Int64("pubsub/send_rpc", "Counter for total sent RPCs", stats.UnitDimensionless) PubsubDropRPC = stats.Int64("pubsub/drop_rpc", "Counter for total dropped RPCs", stats.UnitDimensionless) @@ -326,6 +327,10 @@ var ( Measure: PubsubDuplicateMessage, Aggregation: view.Count(), } + PubsubPruneMessageView = &view.View{ + Measure: PubsubPruneMessage, + Aggregation: view.Count(), + } PubsubRecvRPCView = &view.View{ Measure: PubsubRecvRPC, Aggregation: view.Count(), diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index 33a03f844f0..2b3efce6c44 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -559,6 +559,7 @@ func (trw *tracerWrapper) Trace(evt *pubsub_pb.TraceEvent) { } case pubsub_pb.TraceEvent_PRUNE: + stats.Record(context.TODO(), metrics.PubsubPruneMessage.M(1)) if trw.traceMessage(evt.GetPrune().GetTopic()) { if trw.lp2pTracer != nil { trw.lp2pTracer.Trace(evt) From 1b61d137339e616ef42df57e464fabf073904adc Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Fri, 7 Jul 2023 13:51:15 -0400 Subject: [PATCH 2/3] Add temp debug logging --- node/modules/lp2p/pubsub.go | 1 + 1 file changed, 1 insertion(+) diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index 2b3efce6c44..31a9991e659 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -560,6 +560,7 @@ func (trw *tracerWrapper) Trace(evt *pubsub_pb.TraceEvent) { case pubsub_pb.TraceEvent_PRUNE: stats.Record(context.TODO(), metrics.PubsubPruneMessage.M(1)) + log.Errorf("********************TRACE EVENT PRUNE****************************") if trw.traceMessage(evt.GetPrune().GetTopic()) { if trw.lp2pTracer != nil { trw.lp2pTracer.Trace(evt) From e54b32208c1360ee24e3cbd28e3ef95d50f67e63 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Fri, 7 Jul 2023 14:17:21 -0400 Subject: [PATCH 3/3] fix --- metrics/metrics.go | 1 + node/modules/lp2p/pubsub.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/metrics/metrics.go b/metrics/metrics.go index cc2aa2ed8fe..822974f81ea 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -765,6 +765,7 @@ var ChainNodeViews = append([]*view.View{ PubsubDeliverMessageView, PubsubRejectMessageView, PubsubDuplicateMessageView, + PubsubPruneMessageView, PubsubRecvRPCView, PubsubSendRPCView, PubsubDropRPCView, diff --git a/node/modules/lp2p/pubsub.go b/node/modules/lp2p/pubsub.go index 31a9991e659..2b3efce6c44 100644 --- a/node/modules/lp2p/pubsub.go +++ b/node/modules/lp2p/pubsub.go @@ -560,7 +560,6 @@ func (trw *tracerWrapper) Trace(evt *pubsub_pb.TraceEvent) { case pubsub_pb.TraceEvent_PRUNE: stats.Record(context.TODO(), metrics.PubsubPruneMessage.M(1)) - log.Errorf("********************TRACE EVENT PRUNE****************************") if trw.traceMessage(evt.GetPrune().GetTopic()) { if trw.lp2pTracer != nil { trw.lp2pTracer.Trace(evt)