Merge branch 'main' into feat/keyper-dkg-metrics

Author: blockchainluffy

rolling-shutter/keyper/keyper.go

@@ -147,7 +147,11 @@ 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
 		epochkghandler.InitMetrics()
 		deployment.InitMetrics()
 		kpr.metricsServer = metricsserver.New(kpr.config.Metrics)

rolling-shutter/keyper/keypermetrics/metrics.go

@@ -97,7 +97,7 @@ var MetricsKeyperDKGstatus = prometheus.NewGaugeVec(
 	[]string{"eon"},
 )
 
-func InitMetrics(dbpool *pgxpool.Pool, config *kprconfig.Config) {
+func InitMetrics(dbpool *pgxpool.Pool, config kprconfig.Config) {
 	prometheus.MustRegister(MetricsKeyperCurrentBlockL1)
 	prometheus.MustRegister(MetricsKeyperCurrentBlockShuttermint)
 	prometheus.MustRegister(MetricsKeyperCurrentEon)
@@ -136,4 +136,37 @@ 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)
+	if err != nil {
+		log.Error().Err(err).Msg("execution_client_version metrics | Failed to get execution client version")
+		return
+	}
+
+	executionClientVersion := prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "shutter",
+			Subsystem: "keyper",
+			Name:      "execution_client_version",
+			Help:      "Version of the execution client",
+			ConstLabels: prometheus.Labels{
+				"version": version,
+			},
+		},
+	)
+	prometheus.MustRegister(executionClientVersion)
+	metricsKeyperEthAddress := prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "shutter",
+			Subsystem: "keyper",
+			Name:      "address",
+			Help:      "Ethereum address of the Keyper",
+			ConstLabels: prometheus.Labels{
+				"address": config.GetAddress().Hex(),
+			},
+		},
+	)
+	metricsKeyperEthAddress.Set(1)
+
+	prometheus.MustRegister(metricsKeyperEthAddress)
 }

rolling-shutter/keyperimpl/gnosis/keyper.go

@@ -71,6 +71,10 @@ 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)

rolling-shutter/keyperimpl/gnosis/metrics.go

@@ -1,6 +1,13 @@
 package gnosis
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"context"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/rs/zerolog/log"
+
+	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient"
+)
 
 var metricsTxPointer = prometheus.NewGaugeVec(
 	prometheus.GaugeOpts{
@@ -93,3 +100,23 @@ func init() {
 	prometheus.MustRegister(metricsKeysSentTimeDelta)
 	prometheus.MustRegister(metricsKeySharesSentTimeDelta)
 }
+
+func InitMetrics(beaconClient *beaconapiclient.Client) {
+	version, err := beaconClient.GetBeaconNodeVersion(context.Background())
+	if err != nil {
+		log.Error().Err(err).Msg("beacon_client_version metrics | Failed to get beacon node version")
+		return
+	}
+	beaconClientVersion := prometheus.NewGauge(
+		prometheus.GaugeOpts{
+			Namespace: "shutter",
+			Subsystem: "gnosis",
+			Name:      "beacon_client_version",
+			Help:      "Version of the beacon client",
+			ConstLabels: prometheus.Labels{
+				"version": version,
+			},
+		},
+	)
+	prometheus.MustRegister(beaconClientVersion)
+}

rolling-shutter/medley/beaconapiclient/beaconapiclient.go

@@ -1,6 +1,10 @@
 package beaconapiclient
 
 import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 )
@@ -20,3 +24,33 @@ func New(rawURL string) (*Client, error) {
 		url: parsedURL,
 	}, nil
 }
+
+func (c *Client) GetBeaconNodeVersion(ctx context.Context) (string, error) {
+	path := c.url.JoinPath("/eth/v1/node/version")
+	req, err := http.NewRequestWithContext(ctx, "GET", path.String(), http.NoBody)
+	if err != nil {
+		return "", err
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", fmt.Errorf("failed to get beacon node version from consensus node: %w", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return "", fmt.Errorf("unexpected status code: %d", resp.StatusCode)
+	}
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	var result struct {
+		Data struct {
+			Version string `json:"version"`
+		} `json:"data"`
+	}
+	err = json.Unmarshal(body, &result)
+	if err != nil {
+		return "", err
+	}
+	return result.Data.Version, nil
+}

rolling-shutter/medley/chainsync/client.go

@@ -8,6 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/pkg/errors"
 	"github.com/shutter-network/shop-contracts/bindings"
 
@@ -148,3 +149,13 @@ func (s *Client) ChainID(ctx context.Context) (*big.Int, error) {
 func (s *Client) Start(_ context.Context, runner service.Runner) error {
 	return runner.StartService(s.getServices()...)
 }
+
+func GetClientVersion(ctx context.Context, ethereumURL string) (string, error) {
+	client, err := rpc.DialContext(ctx, ethereumURL)
+	if err != nil {
+		return "", err
+	}
+	var version string
+	err = client.CallContext(ctx, &version, "web3_clientVersion")
+	return version, err
+}