chore: set client metrics to one

Author: blockchainluffy

rolling-shutter/keyper/keyper.go

@@ -147,11 +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 {
-<<<<<<< feat/keyper-dkg-metrics
-		keypermetrics.InitMetrics(kpr.dbpool, kpr.config)
-=======
-		keypermetrics.InitMetrics(*kpr.config)
->>>>>>> main
+		keypermetrics.InitMetrics(kpr.dbpool, *kpr.config)
 		epochkghandler.InitMetrics()
 		deployment.InitMetrics()
 		kpr.metricsServer = metricsserver.New(kpr.config.Metrics)

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -10,6 +10,7 @@ import (
 
 	"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"
 )
 
 var MetricsKeyperCurrentBlockL1 = prometheus.NewGauge(
@@ -136,8 +137,8 @@ func InitMetrics(dbpool *pgxpool.Pool, config kprconfig.Config) {
 	} else {
 		MetricsKeyperDKGstatus.WithLabelValues(strconv.FormatInt(eons[len(eons)-1].Eon, 10)).Set(0)
 	}
-  
-  version, err := chainsync.GetClientVersion(context.Background(), config.Ethereum.EthereumURL)
+
+	version, err := chainsync.GetClientVersion(context.Background(), config.Ethereum.EthereumURL)
 	if err != nil {
 		log.Error().Err(err).Msg("execution_client_version metrics | Failed to get execution client version")
 		return
@@ -154,6 +155,8 @@ func InitMetrics(dbpool *pgxpool.Pool, config kprconfig.Config) {
 			},
 		},
 	)
+	executionClientVersion.Set(1)
+
 	prometheus.MustRegister(executionClientVersion)
 	metricsKeyperEthAddress := prometheus.NewGauge(
 		prometheus.GaugeOpts{

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -71,10 +71,6 @@ func New(c *Config) *Keyper {
 func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 	var err error
 
-	if kpr.config.Metrics.Enabled {
-		InitMetrics(kpr.beaconAPIClient)
-	}
-
 	kpr.newBlocks = make(chan *syncevent.LatestBlock)
 	kpr.newKeyperSets = make(chan *syncevent.KeyperSet)
 	kpr.newEonPublicKeys = make(chan keyper.EonPublicKey)
@@ -150,6 +146,10 @@ func (kpr *Keyper) Start(ctx context.Context, runner service.Runner) error {
 		return err
 	}
 
+	if kpr.config.Metrics.Enabled {
+		InitMetrics(kpr.beaconAPIClient)
+	}
+
 	// Set all transaction pointer ages to infinity. They will be reset to zero when the next
 	// decryption keys arrive, telling us the agreed upon pointer value. Pointer values that are
 	// not in the db yet are not affected. They will be initialized to zero when we first access

rolling-shutter/keyperimpl/gnosis/metrics.go

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