chore(tm2): add prometheus exporter

contribs/gnodev/go.mod

@@ -19,9 +19,11 @@ require (
 require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -46,6 +48,10 @@ require (
 	github.com/peterbourgon/ff/v3 v3.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.19.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rivo/uniseg v0.4.3 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/rs/cors v1.10.1 // indirect

contribs/gnokeykc/go.mod

@@ -11,9 +11,11 @@ require (
 
 require (
 	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
 	github.com/danieljoos/wincred v1.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -31,6 +33,10 @@ require (
 	github.com/peterbourgon/ff/v3 v3.4.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.19.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect

go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/pelletier/go-toml v1.9.5
 	github.com/peterbourgon/ff/v3 v3.4.0
 	github.com/pmezard/go-difflib v1.0.0
+	github.com/prometheus/client_golang v1.19.0
 	github.com/rogpeppe/go-internal v1.12.0
 	github.com/rs/cors v1.10.1
 	github.com/rs/xid v1.5.0
@@ -50,7 +51,9 @@ require (
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -61,6 +64,9 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.48.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/rivo/uniseg v0.4.3 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect

tm2/pkg/bft/config/config.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	osm "github.com/gnolang/gno/tm2/pkg/os"
 	p2p "github.com/gnolang/gno/tm2/pkg/p2p/config"
-	telemetry "github.com/gnolang/gno/tm2/pkg/telemetry/config"
+	"github.com/gnolang/gno/tm2/pkg/telemetry"
 )
 
 var (

tm2/pkg/bft/consensus/state.go

@@ -2,7 +2,6 @@ package consensus
 
 import (
 	"bytes"
-	"context"
 	goerrors "errors"
 	"fmt"
 	"log/slog"
@@ -26,7 +25,6 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/p2p"
 	"github.com/gnolang/gno/tm2/pkg/service"
 	"github.com/gnolang/gno/tm2/pkg/telemetry"
-	"github.com/gnolang/gno/tm2/pkg/telemetry/metrics"
 )
 
 // -----------------------------------------------------------------------------
@@ -1000,7 +998,7 @@ func (cs *ConsensusState) createProposalBlock() (block *types.Block, blockParts
 	if telemetry.MetricsEnabled() {
 		startTime := time.Now()
 		defer func(t time.Time) {
-			metrics.BuildBlockTimer.Record(context.Background(), time.Since(t).Milliseconds())
+			telemetry.RecordBuildBlockTimer(time.Since(t))
 		}(startTime)
 	}
 
@@ -1379,6 +1377,8 @@ func (cs *ConsensusState) finalizeCommit(height int64) {
 
 	fail.Fail() // XXX
 
+	cs.recordMetrics(block)
+
 	// NewHeightStep!
 	cs.updateToState(stateCopy)
 
@@ -1394,6 +1394,15 @@ func (cs *ConsensusState) finalizeCommit(height int64) {
 	// * cs.StartTime is set to when we will start round0.
 }
 
+func (cs *ConsensusState) recordMetrics(block *types.Block) {
+	if block.Height > 1 {
+		lastBlockMeta := cs.blockStore.LoadBlockMeta(block.Height - 1)
+		if lastBlockMeta != nil {
+			telemetry.RecordBlockIntervalSeconds(block.Time.Sub(lastBlockMeta.Header.Time))
+		}
+	}
+}
+
 // -----------------------------------------------------------------------------
 
 func (cs *ConsensusState) defaultSetProposal(proposal *types.Proposal) error {

tm2/pkg/p2p/switch.go

@@ -1,7 +1,6 @@
 package p2p
 
 import (
-	"context"
 	"fmt"
 	"math"
 	"sync"
@@ -14,7 +13,6 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/random"
 	"github.com/gnolang/gno/tm2/pkg/service"
 	"github.com/gnolang/gno/tm2/pkg/telemetry"
-	"github.com/gnolang/gno/tm2/pkg/telemetry/metrics"
 )
 
 const (
@@ -269,9 +267,7 @@ func (sw *Switch) Broadcast(chID byte, msgBytes []byte) chan bool {
 	go func() {
 		wg.Wait()
 		close(successChan)
-		if telemetry.MetricsEnabled() {
-			metrics.BroadcastTxTimer.Record(context.Background(), time.Since(startTime).Milliseconds())
-		}
+		telemetry.RecordBroadcastTxTimer(time.Since(startTime))
 	}()
 
 	return successChan

tm2/pkg/telemetry/collector.go

@@ -0,0 +1,39 @@
+package telemetry
+
+import (
+	"reflect"
+	"time"
+)
+
+type Collector interface {
+	RecordBroadcastTxTimer(data time.Duration)
+	RecordBuildBlockTimer(data time.Duration)
+	RecordBlockIntervalSeconds(data time.Duration)
+}
+
+func RecordBroadcastTxTimer(data time.Duration) {
+	if promCollector != nil && !reflect.ValueOf(promCollector).IsNil() {
+		promCollector.RecordBroadcastTxTimer(data)
+	}
+	if opentlmCollector != nil && !reflect.ValueOf(opentlmCollector).IsNil() {
+		opentlmCollector.RecordBroadcastTxTimer(data)
+	}
+}
+
+func RecordBuildBlockTimer(data time.Duration) {
+	if promCollector != nil && !reflect.ValueOf(promCollector).IsNil() {
+		promCollector.RecordBuildBlockTimer(data)
+	}
+	if opentlmCollector != nil && !reflect.ValueOf(opentlmCollector).IsNil() {
+		opentlmCollector.RecordBuildBlockTimer(data)
+	}
+}
+
+func RecordBlockIntervalSeconds(data time.Duration) {
+	if promCollector != nil && !reflect.ValueOf(promCollector).IsNil() {
+		promCollector.RecordBlockIntervalSeconds(data)
+	}
+	if opentlmCollector != nil && !reflect.ValueOf(opentlmCollector).IsNil() {
+		opentlmCollector.RecordBlockIntervalSeconds(data)
+	}
+}

tm2/pkg/telemetry/init.go

@@ -6,31 +6,65 @@ package telemetry
 import (
 	"sync/atomic"
 
-	"github.com/gnolang/gno/tm2/pkg/telemetry/config"
-	"github.com/gnolang/gno/tm2/pkg/telemetry/metrics"
+	opentlmConfig "github.com/gnolang/gno/tm2/pkg/telemetry/opentlm/config"
+	"github.com/gnolang/gno/tm2/pkg/telemetry/opentlm/metrics"
+	"github.com/gnolang/gno/tm2/pkg/telemetry/prom"
 )
 
 var (
-	globalConfig    config.Config
-	globalConfigSet atomic.Bool
+	isConfigSet atomic.Bool
+
+	promCollector    Collector = nil
+	opentlmCollector Collector = nil
 )
 
+type Config struct {
+	OpenTelemetry *opentlmConfig.Config `toml:"opentelemetry"`
+	Prometheus    *prom.Config          `toml:"prometheus"`
+}
+
+func DefaultTelemetryConfig() *Config {
+	return &Config{
+		OpenTelemetry: opentlmConfig.DefaultConfig(),
+		Prometheus:    prom.DefaultConfig(),
+	}
+}
+
+func TestTelemetryConfig() *Config {
+	return DefaultTelemetryConfig()
+}
+
 // MetricsEnabled returns true if metrics have been initialized.
 func MetricsEnabled() bool {
-	return globalConfig.MetricsEnabled
+	return promCollector != nil || opentlmCollector != nil
 }
 
 // Init sets the configuration for telemetry to c, and if telemetry is enabled,
 // starts tracking.
 // Init may only be called once. Multiple calls to Init will panic.
-func Init(c config.Config) error {
-	if !globalConfigSet.CompareAndSwap(false, true) {
+func Init(c Config) error {
+	if !isConfigSet.CompareAndSwap(false, true) {
 		panic("telemetry configuration has already been set and initialised")
 	}
-	globalConfig = c
-	// Initialize metrics to be collected.
-	if c.MetricsEnabled {
-		return metrics.Init(c)
+
+	var err error
+
+	// Initialize opentelemetry metrics to be collected.
+	if c.OpenTelemetry.MetricsEnabled {
+		opentlmCollector, err = metrics.Init(c.OpenTelemetry)
+		if err != nil {
+			// NOTE(albttx): When endpoint isn't specify, this error is return
+			// and create a CONSENSUS fail error.
+			return err
+		}
+	}
+
+	// Initialize prometheus metrics to be collected
+	if c.Prometheus.MetricsEnabled {
+		promCollector, err = prom.Init(c.Prometheus)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }