remove all the otel and slog changes

Author: technicallyty

iavlx/commit_multi_tree.go

@@ -4,14 +4,14 @@ import (
 	"bytes"
 	"fmt"
 	io "io"
-	"log/slog"
 	"os"
 	"path/filepath"
 	"sync"
 
 	dbm "github.com/cosmos/cosmos-db"
 	protoio "github.com/cosmos/gogoproto/io"
 
+	"cosmossdk.io/log"
 	"cosmossdk.io/store/mem"
 	"cosmossdk.io/store/metrics"
 	pruningtypes "cosmossdk.io/store/pruning/types"
@@ -23,7 +23,7 @@ import (
 type CommitMultiTree struct {
 	dir        string
 	opts       Options
-	logger     *slog.Logger
+	logger     log.Logger
 	trees      []storetypes.CommitStore    // always ordered by tree name
 	treeKeys   []storetypes.StoreKey       // always ordered by tree name
 	storeTypes []storetypes.StoreType      // store types by tree index
@@ -377,7 +377,7 @@ func (db *CommitMultiTree) SetMetrics(metrics metrics.StoreMetrics) {
 	db.logger.Warn("SetMetrics is not implemented for CommitMultiTree")
 }
 
-func LoadDB(path string, opts *Options, logger *slog.Logger) (*CommitMultiTree, error) {
+func LoadDB(path string, opts *Options, logger log.Logger) (*CommitMultiTree, error) {
 	// n := len(treeNames)
 	//trees := make([]*CommitTree, n)
 	//treesByName := make(map[string]int, n)

iavlx/commit_tree.go

@@ -3,10 +3,10 @@ package iavlx
 import (
 	"fmt"
 	"io"
-	"log/slog"
 	"sync"
 	"sync/atomic"
 
+	"cosmossdk.io/log"
 	pruningtypes "cosmossdk.io/store/pruning/types"
 	storetypes "cosmossdk.io/store/types"
 )
@@ -28,13 +28,13 @@ type CommitTree struct {
 
 	pendingOrphans [][]NodeID
 
-	logger *slog.Logger
+	logger log.Logger
 
 	lastCommitId storetypes.CommitID
 	commitCtx    *commitContext
 }
 
-func NewCommitTree(dir string, opts Options, logger *slog.Logger) (*CommitTree, error) {
+func NewCommitTree(dir string, opts Options, logger log.Logger) (*CommitTree, error) {
 	ts, err := NewTreeStore(dir, opts, logger)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create tree store: %w", err)

iavlx/tree_store.go

@@ -3,16 +3,17 @@ package iavlx
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/tidwall/btree"
+
+	"cosmossdk.io/log"
 )
 
 type TreeStore struct {
-	logger *slog.Logger
+	logger log.Logger
 	dir    string
 
 	currentWriter         *ChangesetWriter
@@ -39,7 +40,7 @@ type changesetEntry struct {
 	changeset atomic.Pointer[Changeset]
 }
 
-func NewTreeStore(dir string, options Options, logger *slog.Logger) (*TreeStore, error) {
+func NewTreeStore(dir string, options Options, logger log.Logger) (*TreeStore, error) {
 	ts := &TreeStore{
 		dir:           dir,
 		changesets:    &btree.Map[uint32, *changesetEntry]{},

server/api/server.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"fmt"
 	"net"
 	"net/http"
 	"strings"
@@ -23,6 +24,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	cmtlogwrapper "github.com/cosmos/cosmos-sdk/server/log"
+	"github.com/cosmos/cosmos-sdk/telemetry"
 	grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
 )
 
@@ -33,6 +35,7 @@ type Server struct {
 	ClientCtx         client.Context
 	GRPCSrv           *grpc.Server
 	logger            log.Logger
+	metrics           *telemetry.Metrics
 
 	// Start() is blocking and generally called from a separate goroutine.
 	// Close() can be called asynchronously and access shared memory
@@ -188,6 +191,31 @@ func (s *Server) Close() error {
 	return s.listener.Close()
 }
 
+func (s *Server) SetTelemetry(m *telemetry.Metrics) {
+	s.mtx.Lock()
+	s.registerMetrics(m)
+	s.mtx.Unlock()
+}
+
+func (s *Server) registerMetrics(m *telemetry.Metrics) {
+	s.metrics = m
+
+	metricsHandler := func(w http.ResponseWriter, r *http.Request) {
+		format := strings.TrimSpace(r.FormValue("format"))
+
+		gr, err := s.metrics.Gather(format)
+		if err != nil {
+			writeErrorResponse(w, http.StatusBadRequest, fmt.Sprintf("failed to gather metrics: %s", err))
+			return
+		}
+
+		w.Header().Set("Content-Type", gr.ContentType)
+		_, _ = w.Write(gr.Metrics)
+	}
+
+	s.Router.HandleFunc("/metrics", metricsHandler).Methods("GET")
+}
+
 // errorResponse defines the attributes of a JSON error response.
 type errorResponse struct {
 	Code  int    `json:"code,omitempty"`

server/config/config.go

@@ -1,14 +1,16 @@
 package config
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 
 	"github.com/spf13/viper"
+	"google.golang.org/grpc"
 
 	pruningtypes "cosmossdk.io/store/pruning/types"
 
-	_ "github.com/cosmos/cosmos-sdk/telemetry"
+	"github.com/cosmos/cosmos-sdk/telemetry"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
@@ -124,6 +126,21 @@ type APIConfig struct {
 	// Ref: https://github.com/cosmos/cosmos-sdk/issues/6420
 }
 
+// BlockRange represents a range of block heights as [start_block, end_block] (inclusive).
+// It is used to map gRPC historical connections to specific block height ranges for routing
+// historical queries to appropriate archive nodes.
+//
+// Example:
+//   - [0, 1000] represents blocks from genesis (0) through block 1000
+//   - [1001, 2000] represents blocks from 1001 through 2000
+//
+// Both start and end blocks must be non-negative, and start must be less than or equal to end.
+type BlockRange [2]int
+
+// HistoricalGRPCConnections is a map of block ranges to gRPC client connections
+// used for routing requests to different backend nodes based on block height.
+type HistoricalGRPCConnections map[BlockRange]*grpc.ClientConn
+
 // GRPCConfig defines configuration for the gRPC server.
 type GRPCConfig struct {
 	// Enable defines if the gRPC server should be enabled.
@@ -142,6 +159,9 @@ type GRPCConfig struct {
 
 	// SkipCheckHeader defines if the gRPC server should bypass header checking.
 	SkipCheckHeader bool `mapstructure:"skip-check-header"`
+
+	// HistoricalGRPCAddressBlockRange maps block ranges to gRPC addresses for routing historical queries.
+	HistoricalGRPCAddressBlockRange map[BlockRange]string `mapstructure:"-"`
 }
 
 // GRPCWebConfig defines configuration for the gRPC-web server.
@@ -190,12 +210,13 @@ type Config struct {
 	BaseConfig `mapstructure:",squash"`
 
 	// Telemetry defines the application telemetry configuration
-	API       APIConfig       `mapstructure:"api"`
-	GRPC      GRPCConfig      `mapstructure:"grpc"`
-	GRPCWeb   GRPCWebConfig   `mapstructure:"grpc-web"`
-	StateSync StateSyncConfig `mapstructure:"state-sync"`
-	Streaming StreamingConfig `mapstructure:"streaming"`
-	Mempool   MempoolConfig   `mapstructure:"mempool"`
+	Telemetry telemetry.Config `mapstructure:"telemetry"`
+	API       APIConfig        `mapstructure:"api"`
+	GRPC      GRPCConfig       `mapstructure:"grpc"`
+	GRPCWeb   GRPCWebConfig    `mapstructure:"grpc-web"`
+	StateSync StateSyncConfig  `mapstructure:"state-sync"`
+	Streaming StreamingConfig  `mapstructure:"streaming"`
+	Mempool   MempoolConfig    `mapstructure:"mempool"`
 }
 
 // SetMinGasPrices sets the validator's minimum gas prices.
@@ -233,6 +254,10 @@ func DefaultConfig() *Config {
 			IAVLDisableFastNode: false,
 			AppDBBackend:        "",
 		},
+		Telemetry: telemetry.Config{
+			Enabled:      false,
+			GlobalLabels: [][]string{},
+		},
 		API: APIConfig{
 			Enable:             false,
 			Swagger:            false,
@@ -273,6 +298,26 @@ func GetConfig(v *viper.Viper) (Config, error) {
 	if err := v.Unmarshal(conf); err != nil {
 		return Config{}, fmt.Errorf("error extracting app config: %w", err)
 	}
+	raw := v.GetString("grpc.historical-grpc-address-block-range")
+	if len(raw) > 0 {
+		data := make(map[string]BlockRange)
+		if err := json.Unmarshal([]byte(raw), &data); err != nil {
+			return Config{}, fmt.Errorf("failed to parse historical-grpc-address-block-range as JSON: %w (value: %s)", err, raw)
+		}
+		historicalGRPCAddressBlockRange := make(map[BlockRange]string, len(data))
+		for address, blockRange := range data {
+			if blockRange[0] < 0 || blockRange[1] < 0 {
+				return Config{}, fmt.Errorf("invalid block range [%d, %d] for address %s: block numbers cannot be negative",
+					blockRange[0], blockRange[1], address)
+			}
+			if blockRange[0] > blockRange[1] {
+				return Config{}, fmt.Errorf("invalid block range [%d, %d] for address %s: start block must be <= end block",
+					blockRange[0], blockRange[1], address)
+			}
+			historicalGRPCAddressBlockRange[blockRange] = address
+		}
+		conf.GRPC.HistoricalGRPCAddressBlockRange = historicalGRPCAddressBlockRange
+	}
 	return *conf, nil
 }