Merge pull request #111 from ethstorage/metrics-base

add RecordBandwidth metrics
ethstorage · Jan 9, 2024 · adc366a · adc366a
2 parents 26c220f + 13763e8
commit adc366a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/ethstorage/metrics/metrics.go b/ethstorage/metrics/metrics.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum/go-ethereum/common"
 	pb "github.com/libp2p/go-libp2p-pubsub/pb"
+	libp2pmetrics "github.com/libp2p/go-libp2p/core/metrics"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -47,6 +48,8 @@ type Metricer interface {
 	Document() []metrics.DocumentedMetric
 	RecordGossipEvent(evType int32)
 	SetPeerScores(map[string]float64)
+
+	RecordBandwidth(ctx context.Context, bwc *libp2pmetrics.BandwidthCounter)
 	RecordUp()
 	RecordInfo(version string)
 	Serve(ctx context.Context, hostname string, port int) error
@@ -82,8 +85,9 @@ type Metrics struct {
 	SyncClientPerfCallTotal           *prometheus.CounterVec
 	SyncClientPerfCallDurationSeconds *prometheus.HistogramVec
 
-	PeerCount     prometheus.Gauge
-	DropPeerCount prometheus.Counter
+	PeerCount      prometheus.Gauge
+	DropPeerCount  prometheus.Counter
+	BandwidthTotal *prometheus.GaugeVec
 
 	SyncServerHandleReqTotal                  *prometheus.CounterVec
 	SyncServerHandleReqDurationSeconds        *prometheus.HistogramVec
@@ -583,6 +587,22 @@ func (m *Metrics) ServerRecordTimeUsed(method string) func() {
 	}
 }
 
+func (m *Metrics) RecordBandwidth(ctx context.Context, bwc *libp2pmetrics.BandwidthCounter) {
+	tick := time.NewTicker(10 * time.Second)
+	defer tick.Stop()
+
+	for {
+		select {
+		case <-tick.C:
+			bwTotals := bwc.GetBandwidthTotals()
+			m.BandwidthTotal.WithLabelValues("in").Set(float64(bwTotals.TotalIn))
+			m.BandwidthTotal.WithLabelValues("out").Set(float64(bwTotals.TotalOut))
+		case <-ctx.Done():
+			return
+		}
+	}
+}
+
 // RecordInfo sets a pseudo-metric that contains versioning and
 // config info for the es node.
 func (m *Metrics) RecordInfo(version string) {
@@ -661,6 +681,9 @@ func (m *noopMetricer) RecordGossipEvent(evType int32) {
 func (m *noopMetricer) SetPeerScores(scores map[string]float64) {
 }
 
+func (n *noopMetricer) RecordBandwidth(ctx context.Context, bwc *libp2pmetrics.BandwidthCounter) {
+}
+
 func (n *noopMetricer) RecordInfo(version string) {
 }
 

diff --git a/ethstorage/p2p/node.go b/ethstorage/p2p/node.go
@@ -178,7 +178,7 @@ func (n *NodeP2P) init(resourcesCtx context.Context, rollupCfg *rollup.EsConfig,
 		}
 
 		if m != nil {
-			// go m.RecordBandwidth(resourcesCtx, bwc)
+			go m.RecordBandwidth(resourcesCtx, bwc)
 		}
 	}
 	return nil