From 9a90c999ac25e692898994eebb625824ee504c7b Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Thu, 29 Nov 2018 12:42:13 +0100
Subject: [PATCH] swarm/shed: push metrics prefix up

---
 swarm/shed/db.go                 | 5 +++--
 swarm/shed/db_test.go            | 6 +++---
 swarm/shed/example_store_test.go | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/swarm/shed/db.go b/swarm/shed/db.go
index 0e4a9a533a..78c62fdc84 100644
--- a/swarm/shed/db.go
+++ b/swarm/shed/db.go
@@ -63,7 +63,8 @@ type DB struct {
 
 // NewDB constructs a new DB and validates the schema
 // if it exists in database on the given path.
-func NewDB(path string) (db *DB, err error) {
+// prefix is used for metrics collection for the given DB.
+func NewDB(path string, prefix string) (db *DB, err error) {
 	ldb, err := leveldb.OpenFile(path, &opt.Options{
 		OpenFilesCacheCapacity: openFileLimit,
 	})
@@ -88,7 +89,7 @@ func NewDB(path string) (db *DB, err error) {
 		}
 	}
 
-	db.Meter("shed/db")
+	db.Meter(prefix)
 
 	return db, nil
 }
diff --git a/swarm/shed/db_test.go b/swarm/shed/db_test.go
index 45325beeb8..65fdac4a61 100644
--- a/swarm/shed/db_test.go
+++ b/swarm/shed/db_test.go
@@ -55,7 +55,7 @@ func TestDB_persistence(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	db, err := NewDB(dir)
+	db, err := NewDB(dir, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -73,7 +73,7 @@ func TestDB_persistence(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	db2, err := NewDB(dir)
+	db2, err := NewDB(dir, "")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -101,7 +101,7 @@ func newTestDB(t *testing.T) (db *DB, cleanupFunc func()) {
 		t.Fatal(err)
 	}
 	cleanupFunc = func() { os.RemoveAll(dir) }
-	db, err = NewDB(dir)
+	db, err = NewDB(dir, "")
 	if err != nil {
 		cleanupFunc()
 		t.Fatal(err)
diff --git a/swarm/shed/example_store_test.go b/swarm/shed/example_store_test.go
index 2ed0be1413..908a1e446d 100644
--- a/swarm/shed/example_store_test.go
+++ b/swarm/shed/example_store_test.go
@@ -52,7 +52,7 @@ type Store struct {
 // and possible conflicts with schema from existing database is checked
 // automatically.
 func New(path string) (s *Store, err error) {
-	db, err := shed.NewDB(path)
+	db, err := shed.NewDB(path, "")
 	if err != nil {
 		return nil, err
 	}