Merge pull request #25 from samcm/remove/general-slots

feat(consensus): Remove slots from general exporter
ethpandaops · Jun 14, 2022 · 0f416b2 · 0f416b2
2 parents 135a549 + 3fa0c76
commit 0f416b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 53 deletions.
diff --git a/pkg/exporter/consensus/jobs/beacon.go b/pkg/exporter/consensus/jobs/beacon.go
@@ -242,6 +242,10 @@ func (b *Beacon) GetFinality(ctx context.Context, stateID string) error {
 }
 
 func (b *Beacon) handleSingleBlock(blockID string, block *spec.VersionedSignedBeaconBlock) error {
+	if block == nil {
+		return errors.New("block is nil")
+	}
+
 	if b.currentVersion != block.Version.String() {
 		b.Transactions.Reset()
 		b.Slashings.Reset()

diff --git a/pkg/exporter/consensus/jobs/general.go b/pkg/exporter/consensus/jobs/general.go
@@ -18,7 +18,6 @@ type General struct {
 	client      eth2client.Service
 	api         api.ConsensusClient
 	log         logrus.FieldLogger
-	Slots       prometheus.GaugeVec
 	NodeVersion prometheus.GaugeVec
 	ClientName  prometheus.GaugeVec
 	Peers       prometheus.GaugeVec
@@ -36,17 +35,6 @@ func NewGeneralJob(client eth2client.Service, ap api.ConsensusClient, log logrus
 		client: client,
 		api:    ap,
 		log:    log,
-		Slots: *prometheus.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Namespace:   namespace,
-				Name:        "slot_number",
-				Help:        "The slot number of the beacon chain.",
-				ConstLabels: constLabels,
-			},
-			[]string{
-				"identifier",
-			},
-		),
 		NodeVersion: *prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace:   namespace,
@@ -99,14 +87,6 @@ func (g *General) tick(ctx context.Context) {
 		g.log.WithError(err).Error("Failed to get node version")
 	}
 
-	checkpoints := []string{"head", "justified", "finalized"}
-
-	for _, checkpoint := range checkpoints {
-		if err := g.GetBeaconSlot(ctx, checkpoint); err != nil {
-			g.log.WithError(err).Error("Failed to get beacon slot: ", checkpoint)
-		}
-	}
-
 	if err := g.GetPeers(ctx); err != nil {
 		g.log.WithError(err).Error("Failed to get peers")
 	}
@@ -129,34 +109,6 @@ func (g *General) GetNodeVersion(ctx context.Context) error {
 	return nil
 }
 
-func (g *General) GetBeaconSlot(ctx context.Context, identifier string) error {
-	provider, isProvider := g.client.(eth2client.BeaconBlockHeadersProvider)
-	if !isProvider {
-		return errors.New("client does not implement eth2client.BeaconBlockHeadersProvider")
-	}
-
-	block, err := provider.BeaconBlockHeader(ctx, identifier)
-	if err != nil {
-		return err
-	}
-
-	if block == nil {
-		return errors.New("block is nil")
-	}
-
-	if block.Header == nil {
-		return errors.New("block header is nil")
-	}
-
-	if block.Header.Message == nil {
-		return errors.New("block header message is nil")
-	}
-
-	g.ObserveSlot(identifier, uint64(block.Header.Message.Slot))
-
-	return nil
-}
-
 func (g *General) GetPeers(ctx context.Context) error {
 	peers, err := g.api.NodePeers(ctx)
 	if err != nil {
@@ -173,7 +125,3 @@ func (g *General) GetPeers(ctx context.Context) error {
 
 	return nil
 }
-
-func (g *General) ObserveSlot(identifier string, slot uint64) {
-	g.Slots.WithLabelValues(identifier).Set(float64(slot))
-}
diff --git a/pkg/exporter/consensus/metrics.go b/pkg/exporter/consensus/metrics.go
@@ -49,7 +49,6 @@ func NewMetrics(client eth2client.Service, ap api.ConsensusClient, log logrus.Fi
 		eventMetrics:   jobs.NewEventJob(client, ap, log, namespace, constLabels),
 	}
 
-	prometheus.MustRegister(m.generalMetrics.Slots)
 	prometheus.MustRegister(m.generalMetrics.NodeVersion)
 	prometheus.MustRegister(m.generalMetrics.Peers)