CR: register default prometheus opencensus gatherers as Metric to Def…

…aultRegistry

cmd/algod/main.go

@@ -384,7 +384,6 @@ func run() int {
 			sendHeartbeat := func() {
 				values := make(map[string]float64)
 				metrics.DefaultRegistry().AddMetrics(values)
-				metrics.AddOpenCensusMetrics(values)
 
 				heartbeatDetails := baseHeartbeatEvent
 				heartbeatDetails.Metrics = values

daemon/algod/api/server/common/metrics.go

@@ -46,7 +46,6 @@ func Metrics(ctx lib.ReqContext, context echo.Context) {
 
 	var buf strings.Builder
 	metrics.DefaultRegistry().WriteMetrics(&buf, "")
-	metrics.WriteOpenCensusMetrics(&buf, "")
 	w.Write([]byte(buf.String()))
 }
 

network/p2p/dht/dht.go

@@ -35,6 +35,7 @@ import (
 
 	"github.com/algorand/go-algorand/config"
 	algoproto "github.com/algorand/go-algorand/protocol"
+	"github.com/algorand/go-algorand/util/metrics"
 )
 
 const minBackoff = time.Second * 5
@@ -60,6 +61,7 @@ func MakeDHT(ctx context.Context, h host.Host, networkID algoproto.NetworkID, cf
 		if err := view.Register(dhtmetrics.DefaultViews...); err != nil {
 			return nil, err
 		}
+		metrics.DefaultRegistry().Register(&metrics.OpencensusDefaultMetrics)
 	}
 
 	return dht.New(ctx, h, dhtCfg...)

network/p2p/p2p.go

@@ -28,6 +28,7 @@ import (
 	"github.com/algorand/go-algorand/logging"
 	pstore "github.com/algorand/go-algorand/network/p2p/peerstore"
 	"github.com/algorand/go-algorand/network/phonebook"
+	"github.com/algorand/go-algorand/util/metrics"
 	"github.com/algorand/go-deadlock"
 
 	"github.com/libp2p/go-libp2p"
@@ -126,6 +127,8 @@ func MakeHost(cfg config.Local, datadir string, pstore *pstore.PeerStore) (host.
 	var disableMetrics = func(cfg *libp2p.Config) error { return nil }
 	if !cfg.EnableMetricReporting {
 		disableMetrics = libp2p.DisableMetrics()
+	} else {
+		metrics.DefaultRegistry().Register(&metrics.PrometheusDefaultMetrics)
 	}
 
 	host, err := libp2p.New(

util/metrics/opencensus.go

@@ -28,6 +28,26 @@ import (
 	"golang.org/x/exp/slices"
 )
 
+type defaultOpencensusGatherer struct {
+	names []string
+}
+
+// WriteMetric return opencensus data converted to algorand format
+func (og *defaultOpencensusGatherer) WriteMetric(buf *strings.Builder, parentLabels string) {
+	metrics := collectOpenCensusMetrics(og.names)
+	for _, metric := range metrics {
+		metric.WriteMetric(buf, parentLabels)
+	}
+}
+
+// AddMetric return opencensus data converted to algorand format
+func (og *defaultOpencensusGatherer) AddMetric(values map[string]float64) {
+	metrics := collectOpenCensusMetrics(og.names)
+	for _, metric := range metrics {
+		metric.AddMetric(values)
+	}
+}
+
 type statExporter struct {
 	names   map[string]struct{}
 	metrics []Metric
@@ -47,22 +67,6 @@ func collectOpenCensusMetrics(names []string) []Metric {
 	return exporter.metrics
 }
 
-// WriteOpenCensusMetrics return opencensus data converted to algorand format
-func WriteOpenCensusMetrics(buf *strings.Builder, parentLabels string, names ...string) {
-	metrics := collectOpenCensusMetrics(names)
-	for _, metric := range metrics {
-		metric.WriteMetric(buf, parentLabels)
-	}
-}
-
-// AddOpenCensusMetrics return opencensus data converted to algorand format
-func AddOpenCensusMetrics(values map[string]float64, names ...string) {
-	metrics := collectOpenCensusMetrics(names)
-	for _, metric := range metrics {
-		metric.AddMetric(values)
-	}
-}
-
 // statCounter stores single int64 value per stat with labels
 type statCounter struct {
 	name        string

util/metrics/prometheus.go

@@ -26,19 +26,23 @@ import (
 	iopc "github.com/prometheus/client_model/go"
 )
 
-// WritePrometheusMetrics return prometheus converted to algorand format.
+type defaultPrometheusGatherer struct {
+	names []string
+}
+
+// WriteMetric return prometheus converted to algorand format.
 // Supports only counter and gauge types and ignores go_ metrics.
-func WritePrometheusMetrics(buf *strings.Builder, parentLabels string, names ...string) {
-	metrics := collectOpenCensusMetrics(names)
+func (pg *defaultPrometheusGatherer) WriteMetric(buf *strings.Builder, parentLabels string) {
+	metrics := collectOpenCensusMetrics(pg.names)
 	for _, metric := range metrics {
 		metric.WriteMetric(buf, parentLabels)
 	}
 }
 
-// AddPrometheusMetrics return prometheus data converted to algorand format.
+// AddMetric return prometheus data converted to algorand format.
 // Supports only counter and gauge types and ignores go_ metrics.
-func AddPrometheusMetrics(values map[string]float64, names ...string) {
-	metrics := collectPrometheusMetrics(names)
+func (pg *defaultPrometheusGatherer) AddMetric(values map[string]float64) {
+	metrics := collectPrometheusMetrics(pg.names)
 	for _, metric := range metrics {
 		metric.AddMetric(values)
 	}

util/metrics/registry.go

@@ -37,6 +37,12 @@ func DefaultRegistry() *Registry {
 	return defaultRegistry
 }
 
+// PrometheusDefaultMetrics is the default prometheus gatherer implementing the Metric interface
+var PrometheusDefaultMetrics = defaultPrometheusGatherer{}
+
+// OpencensusDefaultMetrics is the default prometheus gatherer implementing the Metric interface
+var OpencensusDefaultMetrics = defaultOpencensusGatherer{}
+
 func init() {
 	defaultRegistry = MakeRegistry()
 }