Add metrics

Author: philipsu522

internal/consensus/metrics.go

@@ -69,6 +69,9 @@ type Metrics struct {
 	// Number of block parts transmitted by each peer.
 	BlockParts metrics.Counter `metrics_labels:"peer_id"`
 
+	// Number of tx requests transmitted by each peer.
+	TxsSent metrics.Counter `metrics_labels:"peer_id"`
+
 	// Histogram of durations for each step in the consensus protocol.
 	StepDuration metrics.Histogram `metrics_labels:"step" metrics_buckettype:"exprange" metrics_bucketsizes:"0.1, 100, 8"`
 	stepStart    time.Time
@@ -82,6 +85,10 @@ type Metrics struct {
 	// was relevant to the block the node is trying to gather or not.
 	BlockGossipPartsReceived metrics.Counter `metrics_labels:"matches_current"`
 
+	ProposalBlockCreated metrics.Counter `metrics_labels:"success"`
+	ProposalTxsCount     metrics.Gauge
+	MissingTxsCount      metrics.Gauge
+
 	// QuroumPrevoteMessageDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the earliest prevote that achieved a quorum
 	// during the prevote step.

internal/consensus/reactor.go

@@ -1202,6 +1202,7 @@ func (r *Reactor) handleDataMessage(ctx context.Context, envelope *p2p.Envelope,
 			txKeys = append(txKeys, *txKey)
 		}
 		txs := r.state.blockExec.GetTxsForKeys(txKeys)
+		r.Metrics.TxsSent.With("peer_id", string(envelope.From)).Add(1)
 		// TODO(psu): send all txs in 1 msg
 		for _, tx := range txs {
 			//logger.Info("PSULOG: Sending mempool ch for tx", "tx", tx)

internal/consensus/state.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"runtime/debug"
 	"sort"
+	"strconv"
 	"sync"
 	"time"
 
@@ -1029,6 +1030,7 @@ func (cs *State) handleMsg(ctx context.Context, mi msgInfo, fsyncUponCompletion
 		err = cs.setProposal(msg.Proposal, mi.ReceiveTime)
 		if cs.config.GossipTransactionHashOnly && !cs.isProposer(cs.privValidatorPubKey.Address()) {
 			created := cs.tryCreateProposalBlock(msg.Proposal.Height, msg.Proposal.Round, msg.Proposal.Header, msg.Proposal.LastCommit, msg.Proposal.Evidence, msg.Proposal.ProposerAddress)
+			cs.metrics.ProposalBlockCreated.With("success", strconv.FormatBool(created)).Add(1)
 			if created {
 				if fsyncUponCompletion {
 					if err := cs.wal.FlushAndSync(); err != nil { // fsync
@@ -2467,12 +2469,17 @@ func (cs *State) tryCreateProposalBlock(height int64, round int32, header types.
 		cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
 		return false
 	}
-
-	if cs.Proposal == nil || len(cs.blockExec.GetMissingTxs(cs.Proposal.TxKeys)) != 0 {
+	if cs.Proposal == nil {
+		return false
+	}
+	txKeys := cs.Proposal.TxKeys
+	cs.metrics.ProposalTxsCount.Set(float64(len(cs.Proposal.TxKeys)))
+	missingTxKeys := cs.blockExec.GetMissingTxs(txKeys)
+	if len(missingTxKeys) != 0 {
 		//cs.logger.Info("PSULOG - cannot create block, either proposal is missing or we have missing keys", "proposal", cs.Proposal)
+		cs.metrics.MissingTxsCount.Set(float64(len(cs.blockExec.GetMissingTxs(cs.Proposal.TxKeys))))
 		return false
 	} else {
-		txKeys := cs.Proposal.TxKeys
 		//block := types.MakeBlock(height, cs.blockExec.GetTxsForKeys(txKeys), lastCommit, evidence, false)
 		block := cs.state.MakeBlock(height, cs.blockExec.GetTxsForKeys(txKeys), lastCommit, evidence, proposerAddress, false)
 		// We have full proposal block. Set txs in proposal block from mempool

internal/mempool/reactor.go

@@ -120,7 +120,7 @@ func (r *Reactor) handleMempoolMessage(ctx context.Context, envelope *p2p.Envelo
 	switch msg := envelope.Message.(type) {
 	case *protomem.Txs:
 		protoTxs := msg.GetTxs()
-		logger.Info("PSULOG - handling mempool message", "peer", envelope.From, "txs", protoTxs)
+		//logger.Info("PSULOG - handling mempool message", "peer", envelope.From, "txs", protoTxs)
 		if len(protoTxs) == 0 {
 			return errors.New("empty txs received from peer")
 		}