update metrics

cmd/algorand-indexer/daemon.go

@@ -207,8 +207,15 @@ func handleBlock(block *rpcs.EncodedBlockCert, imp importer.Importer) error {
 	// Ignore round 0 (which is empty).
 	if block.Block.Round() > 0 {
 		metrics.BlockImportTimeSeconds.Observe(dt.Seconds())
-		metrics.ImportedTxnsPerBlock.Observe(float64(len(block.Block.Payset)))
+		//metrics.ImportedTxnsPerBlock.WithLabelValues().Set(float64(len(block.Block.Payset)))
 		metrics.ImportedRoundGauge.Set(float64(block.Block.Round()))
+		txnCountByType := make(map[string]int)
+		for _, txn := range block.Block.Payset {
+			txnCountByType[string(txn.Txn.Type)]++
+		}
+		for k, v := range txnCountByType {
+			metrics.ImportedTxnsPerBlock.WithLabelValues(k).Set(float64(v))
+		}
 	}
 
 	logger.Infof("round r=%d (%d txn) imported in %s", block.Block.Round(), len(block.Block.Payset), dt.String())

fetcher/fetcher.go

@@ -13,6 +13,7 @@ import (
 	"github.com/algorand/go-algorand-sdk/client/v2/algod"
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/rpcs"
+	"github.com/algorand/indexer/util/metrics"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -111,7 +112,13 @@ func (bot *fetcherImpl) catchupLoop(ctx context.Context) error {
 	var blockbytes []byte
 	aclient := bot.Algod()
 	for {
+		start := time.Now()
+
 		blockbytes, err = aclient.BlockRaw(bot.nextRound).Do(ctx)
+
+		dt := time.Since(start)
+		metrics.AlgodRawBlockTimeSeconds.Observe(dt.Seconds())
+
 		if err != nil {
 			// If context has expired.
 			if ctx.Err() != nil {
@@ -150,7 +157,13 @@ func (bot *fetcherImpl) followLoop(ctx context.Context) error {
 					"r=%d error getting status %d", retries, bot.nextRound)
 				continue
 			}
+			start := time.Now()
+
 			blockbytes, err = aclient.BlockRaw(bot.nextRound).Do(ctx)
+
+			dt := time.Since(start)
+			metrics.AlgodRawBlockTimeSeconds.Observe(dt.Seconds())
+
 			if err == nil {
 				break
 			} else if ctx.Err() != nil { // if context has expired

util/metrics/metrics.go

@@ -10,6 +10,7 @@ func RegisterPrometheusMetrics() {
 	prometheus.Register(ImportedRoundGauge)
 	prometheus.Register(BlockUploadTimeSeconds)
 	prometheus.Register(PostgresEvalTimeSeconds)
+	prometheus.Register(AlgodRawBlockTimeSeconds)
 }
 
 // Prometheus metric names broken out for reuse.
@@ -19,6 +20,7 @@ const (
 	ImportedTxnsPerBlockName = "imported_tx_per_block"
 	ImportedRoundGaugeName   = "imported_round"
 	PostgresEvalName         = "postgres_eval_time_sec"
+	AlgodRawBlockTimeName    = "algod_raw_block_time_sec"
 )
 
 // AllMetricNames is a reference for all the custom metric names.
@@ -28,6 +30,7 @@ var AllMetricNames = []string{
 	ImportedTxnsPerBlockName,
 	ImportedRoundGaugeName,
 	PostgresEvalName,
+	AlgodRawBlockTimeName,
 }
 
 // Initialize the prometheus objects.
@@ -46,12 +49,14 @@ var (
 			Help:      "Block upload time in seconds.",
 		})
 
-	ImportedTxnsPerBlock = prometheus.NewSummary(
-		prometheus.SummaryOpts{
+	ImportedTxnsPerBlock = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
 			Subsystem: "indexer_daemon",
 			Name:      ImportedTxnsPerBlockName,
 			Help:      "Transactions per block.",
-		})
+		},
+		[]string{"txn_type"},
+	)
 
 	ImportedRoundGauge = prometheus.NewGauge(
 		prometheus.GaugeOpts{
@@ -66,4 +71,11 @@ var (
 			Name:      PostgresEvalName,
 			Help:      "Time spent calling Eval function in seconds.",
 		})
+
+	AlgodRawBlockTimeSeconds = prometheus.NewSummary(
+		prometheus.SummaryOpts{
+			Subsystem: "indexer_daemon",
+			Name:      AlgodRawBlockTimeName,
+			Help:      "Total response time from Algod's raw block endpoint in seconds.",
+		})
 )