metrics: split out /Transaction/AssembleBlock metrics (#4795)

algorand · Nov 17, 2022 · 06e61a9 · 06e61a9
1 parent d22fa42
commit 06e61a9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/data/pools/transactionPool.go b/data/pools/transactionPool.go
@@ -737,16 +737,24 @@ func (pool *TransactionPool) recomputeBlockEvaluator(committedTxIds map[transact
 			for _, tx := range txgroup {
 				pool.statusCache.put(tx, err.Error())
 			}
-
-			switch err.(type) {
+			// metrics here are duplicated for historic reasons. stats is hardly used and should be removed in favor of asmstats
+			switch terr := err.(type) {
 			case *ledgercore.TransactionInLedgerError:
 				asmStats.CommittedCount++
 				stats.RemovedInvalidCount++
 			case transactions.TxnDeadError:
-				asmStats.InvalidCount++
+				if int(terr.LastValid-terr.FirstValid) > 20 {
+					// cutoff value  here is picked as a somewhat arbitrary cutoff trying to separate longer lived transactions from very short lived ones
+					asmStats.ExpiredLongLivedCount++
+				}
+				asmStats.ExpiredCount++
 				stats.ExpiredCount++
-			case transactions.MinFeeError, *ledgercore.LeaseInLedgerError:
-				asmStats.InvalidCount++
+			case *ledgercore.LeaseInLedgerError:
+				asmStats.LeaseErrorCount++
+				stats.RemovedInvalidCount++
+				pool.log.Infof("Cannot re-add pending transaction to pool: %v", err)
+			case transactions.MinFeeError:
+				asmStats.MinFeeErrorCount++
 				stats.RemovedInvalidCount++
 				pool.log.Infof("Cannot re-add pending transaction to pool: %v", err)
 			default:

diff --git a/ledger/ledgercore/error.go b/ledger/ledgercore/error.go
@@ -54,8 +54,8 @@ func MakeLeaseInLedgerError(txid transactions.Txid, lease Txlease) *LeaseInLedge
 // Error implements the error interface for the LeaseInLedgerError stuct
 func (lile *LeaseInLedgerError) Error() string {
 	// format the lease as address.
-	addr := basics.Address(lile.lease.Lease)
-	return fmt.Sprintf("transaction %v using an overlapping lease %s", lile.txid, addr.String())
+	leaseValue := basics.Address(lile.lease.Lease)
+	return fmt.Sprintf("transaction %v using an overlapping lease (sender, lease):(%s, %s)", lile.txid, lile.lease.Sender.String(), leaseValue.String())
 }
 
 // BlockInLedgerError is returned when a block cannot be added because it has already been done

diff --git a/logging/telemetryspec/metric.go b/logging/telemetryspec/metric.go
@@ -44,6 +44,10 @@ type AssembleBlockStats struct {
 	StartCount                int
 	IncludedCount             int // number of transactions that are included in a block
 	InvalidCount              int // number of transaction groups that are included in a block
+	MinFeeErrorCount          int // number of transactions excluded because the fee is too low
+	ExpiredCount              int // number of transactions removed because of expiration
+	ExpiredLongLivedCount     int // number of expired transactions with non-super short LastValid values
+	LeaseErrorCount           int // number of transactions removed because it has an already used lease
 	MinFee                    uint64
 	MaxFee                    uint64
 	AverageFee                uint64
@@ -100,6 +104,10 @@ func (m AssembleBlockStats) String() string {
 	b.WriteString(fmt.Sprintf("StartCount:%d, ", m.StartCount))
 	b.WriteString(fmt.Sprintf("IncludedCount:%d, ", m.IncludedCount))
 	b.WriteString(fmt.Sprintf("InvalidCount:%d, ", m.InvalidCount))
+	b.WriteString(fmt.Sprintf("MinFeeErrorCount:%d, ", m.MinFeeErrorCount))
+	b.WriteString(fmt.Sprintf("ExpiredCount:%d, ", m.ExpiredCount))
+	b.WriteString(fmt.Sprintf("ExpiredLongLivedCount:%d, ", m.ExpiredLongLivedCount))
+	b.WriteString(fmt.Sprintf("LeaseErrorCount:%d, ", m.LeaseErrorCount))
 	b.WriteString(fmt.Sprintf("MinFee:%d, ", m.MinFee))
 	b.WriteString(fmt.Sprintf("MaxFee:%d, ", m.MaxFee))
 	b.WriteString(fmt.Sprintf("AverageFee:%d, ", m.AverageFee))