Add gnosis specific metrics

Author: jannikluhn

rolling-shutter/keyperimpl/gnosis/database/gnosiskeyper.sqlc.gen.go

@@ -112,4 +112,7 @@ SELECT * FROM validator_registrations_synced_until LIMIT 1;
 SELECT nonce FROM validator_registrations
 WHERE validator_index = $1 AND block_number <= $2 AND tx_index <= $3 AND log_index <= $4
 ORDER BY block_number DESC, tx_index DESC, log_index DESC
-LIMIT 1;
+LIMIT 1;
+
+-- name: GetNumValidatorRegistrations :one
+SELECT COUNT(*) FROM validator_registrations;

rolling-shutter/keyperimpl/gnosis/database/sql/queries/gnosiskeyper.sql

@@ -3,6 +3,7 @@ package gnosis
 import (
 	"context"
 	"database/sql"
+	"fmt"
 	"math"
 
 	"github.com/jackc/pgx/v4"
@@ -290,5 +291,8 @@ func (h *DecryptionKeysHandler) HandleMessage(ctx context.Context, msg p2pmsg.Me
 	if err != nil {
 		return []p2pmsg.Message{}, errors.Wrap(err, "failed to set tx pointer")
 	}
+	eonString := fmt.Sprint(keys.Eon)
+	metricsTxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
+	metricsTxPointerAge.WithLabelValues(eonString).Set(0)
 	return []p2pmsg.Message{}, nil
 }

rolling-shutter/keyperimpl/gnosis/handlers.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
+	"fmt"
 
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
@@ -294,5 +295,8 @@ func (i *MessagingMiddleware) advanceTxPointer(ctx context.Context, msg *p2pmsg.
 	if err != nil {
 		return errors.Wrap(err, "failed to set tx pointer")
 	}
+	eonString := fmt.Sprint(msg.Eon)
+	metricsTxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
+	metricsTxPointerAge.WithLabelValues(eonString).Set(0)
 	return nil
 }

rolling-shutter/keyperimpl/gnosis/messagingmiddleware.go

@@ -0,0 +1,69 @@
+package gnosis
+
+import "github.com/prometheus/client_golang/prometheus"
+
+var metricsTxPointer = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "tx_pointer",
+		Help:      "Current value of the tx pointer",
+	},
+	[]string{"eon"},
+)
+
+var metricsTxPointerAge = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "tx_pointer_age_blocks",
+		Help:      "Current age of the tx pointer",
+	},
+	[]string{"eon"},
+)
+
+var metricsLatestTxSubmittedEventIndex = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "latest_tx_submitted_event_index",
+		Help:      "Index of the latest TxSubmitted event",
+	},
+	[]string{"eon"},
+)
+
+var metricsTxSubmittedEventsSyncedUntil = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "tx_submitted_events_synced_until",
+		Help:      "Block number until which TxSubmitted events have been synced",
+	},
+)
+
+var metricsValidatorRegistrationsSyncedUntil = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "validator_registrations_synced_until",
+		Help:      "Block number until which validator registration events have been synced",
+	},
+)
+
+var metricsNumValidatorRegistrations = prometheus.NewGauge(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "gnosis",
+		Name:      "num_validator_registrations_total",
+		Help:      "Number of synced validator registrations",
+	},
+)
+
+func init() {
+	prometheus.MustRegister(metricsTxPointer)
+	prometheus.MustRegister(metricsTxPointerAge)
+	prometheus.MustRegister(metricsLatestTxSubmittedEventIndex)
+	prometheus.MustRegister(metricsTxSubmittedEventsSyncedUntil)
+	prometheus.MustRegister(metricsValidatorRegistrationsSyncedUntil)
+	prometheus.MustRegister(metricsNumValidatorRegistrations)
+}

rolling-shutter/keyperimpl/gnosis/metrics.go

@@ -163,6 +163,7 @@ func getTxPointer(ctx context.Context, db *pgxpool.Pool, eon int64, maxTxPointer
 	var txPointer int64
 	var txPointerAge int64
 	var txPointerOutdated bool
+	eonString := fmt.Sprint(eon)
 	txPointerDB, err := gnosisKeyperDB.GetTxPointer(ctx, eon)
 	if err == pgx.ErrNoRows {
 		log.Info().Int64("eon", eon).Msg("initializing tx pointer")
@@ -192,6 +193,7 @@ func getTxPointer(ctx context.Context, db *pgxpool.Pool, eon int64, maxTxPointer
 		if txPointerDB.Age.Valid {
 			txPointerOutdated = txPointerAge > maxTxPointerAge
 		} else {
+			txPointerAge = math.MaxInt64
 			txPointerOutdated = true
 		}
 	}
@@ -214,6 +216,8 @@ func getTxPointer(ctx context.Context, db *pgxpool.Pool, eon int64, maxTxPointer
 			return 0, errors.Wrap(err, "failed to query transaction submitted event count from db")
 		}
 	}
+	metricsTxPointer.WithLabelValues(eonString).Set(float64(txPointer))
+	metricsTxPointerAge.WithLabelValues(eonString).Set(float64(txPointerAge))
 	return txPointer, nil
 }
 

rolling-shutter/keyperimpl/gnosis/newslot.go

@@ -94,6 +94,7 @@ func (s *SequencerSyncer) syncRange(
 		Int("num-inserted-events", len(filteredEvents)).
 		Int("num-discarded-events", len(events)-len(filteredEvents)).
 		Msg("synced sequencer contract")
+	metricsTxSubmittedEventsSyncedUntil.Set(float64(end))
 	return nil
 }
 
@@ -178,6 +179,7 @@ func (s *SequencerSyncer) insertTransactionSubmittedEvents(
 		if err != nil {
 			return errors.Wrap(err, "failed to insert transaction submitted event into db")
 		}
+		metricsLatestTxSubmittedEventIndex.WithLabelValues(string(event.Eon)).Set(float64(nextEventIndex))
 		nextEventIndices[event.Eon]++
 		log.Debug().
 			Int64("index", nextEventIndex).

rolling-shutter/keyperimpl/gnosis/sequencersyncer.go

@@ -96,12 +96,19 @@ func (v *ValidatorSyncer) syncRange(ctx context.Context, start, end uint64) erro
 	if err != nil {
 		return err
 	}
+	numRegistrations, err := db.GetNumValidatorRegistrations(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to get number of validator registrations")
+	}
 	log.Info().
 		Uint64("start-block", start).
 		Uint64("end-block", end).
 		Int("num-inserted-events", len(filteredEvents)).
 		Int("num-discarded-events", len(events)-len(filteredEvents)).
+		Int64("num-registrations", numRegistrations).
 		Msg("synced validator registry")
+	metricsNumValidatorRegistrations.Set(float64(numRegistrations))
+	metricsValidatorRegistrationsSyncedUntil.Set(float64(end))
 	return nil
 }