Merge pull request #607 from shutter-network/feat/keyper-dkg-metrics

feat: update isKeyper metric when handling messages and add successfull_dkg metric

Author: blockchainluffy

rolling-shutter/keyper/keyper.go

@@ -147,7 +147,7 @@ func (kpr *KeyperCore) Start(ctx context.Context, runner service.Runner) error {
 	messageSender := fx.NewRPCMessageSender(shuttermintClient, config.Ethereum.PrivateKey.Key)
 
 	if kpr.config.Metrics.Enabled {
-		keypermetrics.InitMetrics(*kpr.config)
+		keypermetrics.InitMetrics(kpr.dbpool, *kpr.config)
 		epochkghandler.InitMetrics()
 		deployment.InitMetrics()
 		kpr.metricsServer = metricsserver.New(kpr.config.Metrics)

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -2,10 +2,13 @@ package keypermetrics
 
 import (
 	"context"
+	"strconv"
 
+	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/rs/zerolog/log"
 
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/kprconfig"
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/chainsync"
 )
@@ -85,7 +88,17 @@ var MetricsKeyperBatchConfigInfo = prometheus.NewGaugeVec(
 	},
 	[]string{"batch_config_index", "keyper_addresses"})
 
-func InitMetrics(config kprconfig.Config) {
+var MetricsKeyperDKGstatus = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Namespace: "shutter",
+		Subsystem: "keyper",
+		Name:      "dkg_status",
+		Help:      "Is DKG successful",
+	},
+	[]string{"eon"},
+)
+
+func InitMetrics(dbpool *pgxpool.Pool, config kprconfig.Config) {
 	prometheus.MustRegister(MetricsKeyperCurrentBlockL1)
 	prometheus.MustRegister(MetricsKeyperCurrentBlockShuttermint)
 	prometheus.MustRegister(MetricsKeyperCurrentEon)
@@ -94,6 +107,36 @@ func InitMetrics(config kprconfig.Config) {
 	prometheus.MustRegister(MetricsKeyperCurrentPhase)
 	prometheus.MustRegister(MetricsKeyperCurrentBatchConfigIndex)
 	prometheus.MustRegister(MetricsKeyperBatchConfigInfo)
+	prometheus.MustRegister(MetricsKeyperDKGstatus)
+
+	queries := database.New(dbpool)
+	eons, err := queries.GetAllEons(context.Background())
+	if err != nil {
+		log.Error().Err(err).Msg("keypermetrics | Failed to get all eons")
+		return
+	}
+	keyperIndex, isKeyper, err := queries.GetKeyperIndex(context.Background(), eons[len(eons)-1].KeyperConfigIndex, config.GetAddress())
+	if err != nil {
+		log.Error().Err(err).Msg("keypermetrics | Failed to get keyper index")
+		return
+	}
+	if isKeyper {
+		MetricsKeyperIsKeyper.WithLabelValues(strconv.FormatInt(keyperIndex, 10)).Set(1)
+	} else {
+		MetricsKeyperIsKeyper.WithLabelValues(strconv.FormatInt(keyperIndex, 10)).Set(0)
+	}
+
+	dkgResult, err := queries.GetDKGResultForKeyperConfigIndex(context.Background(), eons[len(eons)-1].KeyperConfigIndex)
+	if err != nil {
+		MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatInt(eons[len(eons)-1].Eon, 10)).Set(0)
+		log.Error().Err(err).Msg("keypermetrics | Failed to get dkg result")
+		return
+	}
+	if dkgResult.Success {
+		MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatInt(eons[len(eons)-1].Eon, 10)).Set(1)
+	} else {
+		MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatInt(eons[len(eons)-1].Eon, 10)).Set(0)
+	}
 
 	version, err := chainsync.GetClientVersion(context.Background(), config.Ethereum.EthereumURL)
 	if err != nil {
@@ -112,6 +155,8 @@ func InitMetrics(config kprconfig.Config) {
 			},
 		},
 	)
+	executionClientVersion.Set(1)
+
 	prometheus.MustRegister(executionClientVersion)
 	metricsKeyperEthAddress := prometheus.NewGauge(
 		prometheus.GaugeOpts{

rolling-shutter/keyper/smobserver/smstate.go

@@ -489,6 +489,7 @@ func (st *ShuttermintState) finalizeDKG(
 	dkgresultmsg := shmsg.NewDKGResult(eon, err == nil)
 
 	if err != nil {
+		keypermetrics.MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatUint(eon, 10)).Set(0)
 		log.Error().Err(err).Uint64("eon", eon).Bool("success", false).
 			Msg("DKG process failed")
 		dkgerror = sql.NullString{String: err.Error(), Valid: true}
@@ -497,6 +498,7 @@ func (st *ShuttermintState) finalizeDKG(
 			return err
 		}
 	} else {
+		keypermetrics.MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatUint(eon, 10)).Set(1)
 		log.Info().Uint64("eon", eon).Bool("success", true).Msg("DKG process succeeded")
 		pureResult, err = shdb.EncodePureDKGResult(&dkgresult)
 		if err != nil {

rolling-shutter/keyperimpl/gnosis/metrics.go

@@ -118,5 +118,6 @@ func InitMetrics(beaconClient *beaconapiclient.Client) {
 			},
 		},
 	)
+	beaconClientVersion.Set(1)
 	prometheus.MustRegister(beaconClientVersion)
 }