updates

cosmos · Nov 20, 2023 · 41d7f76 · 41d7f76
1 parent 9617032
commit 41d7f76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 71 deletions.
diff --git a/store/metrics/metrics.go b/store/metrics/metrics.go
diff --git a/store/root/store.go b/store/root/store.go
@@ -5,14 +5,16 @@ import (
 	"fmt"
 	"io"
 	"slices"
+	"time"
 
 	"github.com/cockroachdb/errors"
 
+	"github.com/cosmos/cosmos-sdk/telemetry"
+
 	"cosmossdk.io/log"
 	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/kv/branch"
 	"cosmossdk.io/store/v2/kv/trace"
-	"cosmossdk.io/store/v2/metrics"
 	"cosmossdk.io/store/v2/pruning"
 )
 
@@ -58,17 +60,13 @@ type Store struct {
 
 	// pruningManager manages pruning of the SS and SC backends
 	pruningManager *pruning.Manager
-
-	// telemetry reflects a telemetry agent responsible for emitting metrics (if any)
-	telemetry metrics.StoreMetrics
 }
 
 func New(
 	logger log.Logger,
 	initVersion uint64,
 	ss store.VersionedDatabase,
 	sc store.Committer,
-	m metrics.StoreMetrics,
 ) (store.RootStore, error) {
 	rootKVStore, err := branch.New(defaultStoreKey, ss)
 	if err != nil {
@@ -84,7 +82,6 @@ func New(
 		stateCommitment: sc,
 		rootKVStore:     rootKVStore,
 		pruningManager:  pruningManager,
-		telemetry:       m,
 	}, nil
 }
 
@@ -164,7 +161,7 @@ func (s *Store) GetLatestVersion() (uint64, error) {
 }
 
 func (s *Store) Query(storeKey string, version uint64, key []byte, prove bool) (store.QueryResult, error) {
-	defer s.telemetry.MeasureSince("root_store", "query")
+	defer telemetry.MeasureSince(time.Now(), "root_store", "query")
 
 	val, err := s.stateStore.Get(storeKey, version, key)
 	if err != nil {
@@ -210,7 +207,7 @@ func (s *Store) GetBranchedKVStore(_ string) store.BranchedKVStore {
 }
 
 func (s *Store) LoadLatestVersion() error {
-	defer s.telemetry.MeasureSince("root_store", "load_latest_version")
+	defer telemetry.MeasureSince(time.Now(), "root_store", "load_latest_version")
 
 	lv, err := s.GetLatestVersion()
 	if err != nil {
@@ -221,7 +218,7 @@ func (s *Store) LoadLatestVersion() error {
 }
 
 func (s *Store) LoadVersion(version uint64) error {
-	defer s.telemetry.MeasureSince("root_store", "load_version")
+	defer telemetry.MeasureSince(time.Now(), "root_store", "load_version")
 
 	return s.loadVersion(version)
 }
@@ -290,7 +287,7 @@ func (s *Store) Branch() store.BranchedRootStore {
 // by constructing a CommitInfo object, which in turn creates and writes a batch
 // of the current changeset to the SC tree.
 func (s *Store) WorkingHash() ([]byte, error) {
-	defer s.telemetry.MeasureSince("root_store", "working_hash")
+	defer telemetry.MeasureSince(time.Now(), "root_store", "working_hash")
 
 	if s.workingHash == nil {
 		if err := s.writeSC(); err != nil {
@@ -316,7 +313,7 @@ func (s *Store) Write() {
 //
 // Note, Commit() commits SC and SC synchronously.
 func (s *Store) Commit() ([]byte, error) {
-	defer s.telemetry.MeasureSince("root_store", "commit")
+	defer telemetry.MeasureSince(time.Now(), "root_store", "commit")
 
 	if s.workingHash == nil {
 		return nil, fmt.Errorf("working hash is nil; must call WorkingHash() before Commit()")

diff --git a/store/root/store_test.go b/store/root/store_test.go
@@ -11,7 +11,6 @@ import (
 	"cosmossdk.io/log"
 	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment/iavl"
-	"cosmossdk.io/store/v2/metrics"
 	"cosmossdk.io/store/v2/storage/sqlite"
 )
 
@@ -33,7 +32,7 @@ func (s *RootStoreTestSuite) SetupTest() {
 
 	sc := iavl.NewIavlTree(dbm.NewMemDB(), noopLog, iavl.DefaultConfig())
 
-	rs, err := New(noopLog, 1, ss, sc, metrics.NoOpMetrics{})
+	rs, err := New(noopLog, 1, ss, sc)
 	s.Require().NoError(err)
 
 	rs.SetTracer(io.Discard)