Skip to content

Commit 0e9ab78

Browse files
StephenButtolphStephenButtolph
authored
Remove db namespace (#3068)
1 parent cb2a177 commit 0e9ab78

File tree

8 files changed

+55
-68
lines changed

8 files changed

+55
-68
lines changed

‎database/leveldb/db.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ type config struct {
186186
}
187187

188188
// New returns a wrapped LevelDB object.
189-
func New(file string, configBytes []byte, log logging.Logger, namespace string, reg prometheus.Registerer) (database.Database, error) {
189+
func New(file string, configBytes []byte, log logging.Logger, reg prometheus.Registerer) (database.Database, error) {
190190
parsedConfig := config{
191191
BlockCacheCapacity: DefaultBlockCacheSize,
192192
DisableSeeksCompaction: true,
@@ -236,7 +236,7 @@ func New(file string, configBytes []byte, log logging.Logger, namespace string,
236236
closeCh: make(chan struct{}),
237237
}
238238
if parsedConfig.MetricUpdateFrequency > 0 {
239-
metrics, err := newMetrics(namespace, reg)
239+
metrics, err := newMetrics(reg)
240240
if err != nil {
241241
// Drop any close error to report the original error
242242
_ = db.Close()

‎database/leveldb/db_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestInterface(t *testing.T) {
1818
for name, test := range database.Tests {
1919
t.Run(name, func(t *testing.T) {
2020
folder := t.TempDir()
21-
db, err := New(folder, nil, logging.NoLog{}, "", prometheus.NewRegistry())
21+
db, err := New(folder, nil, logging.NoLog{}, prometheus.NewRegistry())
2222
require.NoError(t, err)
2323

2424
test(t, db)
@@ -30,7 +30,7 @@ func TestInterface(t *testing.T) {
3030

3131
func newDB(t testing.TB) database.Database {
3232
folder := t.TempDir()
33-
db, err := New(folder, nil, logging.NoLog{}, "", prometheus.NewRegistry())
33+
db, err := New(folder, nil, logging.NoLog{}, prometheus.NewRegistry())
3434
require.NoError(t, err)
3535
return db
3636
}

‎database/leveldb/metrics.go‎

Lines changed: 37 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -62,117 +62,99 @@ type metrics struct {
6262
priorStats, currentStats *leveldb.DBStats
6363
}
6464

65-
func newMetrics(namespace string, reg prometheus.Registerer) (metrics, error) {
65+
func newMetrics(reg prometheus.Registerer) (metrics, error) {
6666
m := metrics{
6767
writesDelayedCount: prometheus.NewCounter(prometheus.CounterOpts{
68-
Namespace: namespace,
69-
Name: "writes_delayed",
70-
Help: "number of cumulative writes that have been delayed due to compaction",
68+
Name: "writes_delayed",
69+
Help: "number of cumulative writes that have been delayed due to compaction",
7170
}),
7271
writesDelayedDuration: prometheus.NewGauge(prometheus.GaugeOpts{
73-
Namespace: namespace,
74-
Name: "writes_delayed_duration",
75-
Help: "amount of time (in ns) that writes have been delayed due to compaction",
72+
Name: "writes_delayed_duration",
73+
Help: "amount of time (in ns) that writes have been delayed due to compaction",
7674
}),
7775
writeIsDelayed: prometheus.NewGauge(prometheus.GaugeOpts{
78-
Namespace: namespace,
79-
Name: "write_delayed",
80-
Help: "1 if there is currently a write that is being delayed due to compaction",
76+
Name: "write_delayed",
77+
Help: "1 if there is currently a write that is being delayed due to compaction",
8178
}),
8279

8380
aliveSnapshots: prometheus.NewGauge(prometheus.GaugeOpts{
84-
Namespace: namespace,
85-
Name: "alive_snapshots",
86-
Help: "number of currently alive snapshots",
81+
Name: "alive_snapshots",
82+
Help: "number of currently alive snapshots",
8783
}),
8884
aliveIterators: prometheus.NewGauge(prometheus.GaugeOpts{
89-
Namespace: namespace,
90-
Name: "alive_iterators",
91-
Help: "number of currently alive iterators",
85+
Name: "alive_iterators",
86+
Help: "number of currently alive iterators",
9287
}),
9388

9489
ioWrite: prometheus.NewCounter(prometheus.CounterOpts{
95-
Namespace: namespace,
96-
Name: "io_write",
97-
Help: "cumulative amount of io write during compaction",
90+
Name: "io_write",
91+
Help: "cumulative amount of io write during compaction",
9892
}),
9993
ioRead: prometheus.NewCounter(prometheus.CounterOpts{
100-
Namespace: namespace,
101-
Name: "io_read",
102-
Help: "cumulative amount of io read during compaction",
94+
Name: "io_read",
95+
Help: "cumulative amount of io read during compaction",
10396
}),
10497

10598
blockCacheSize: prometheus.NewGauge(prometheus.GaugeOpts{
106-
Namespace: namespace,
107-
Name: "block_cache_size",
108-
Help: "total size of cached blocks",
99+
Name: "block_cache_size",
100+
Help: "total size of cached blocks",
109101
}),
110102
openTables: prometheus.NewGauge(prometheus.GaugeOpts{
111-
Namespace: namespace,
112-
Name: "open_tables",
113-
Help: "number of currently opened tables",
103+
Name: "open_tables",
104+
Help: "number of currently opened tables",
114105
}),
115106

116107
levelTableCount: prometheus.NewGaugeVec(
117108
prometheus.GaugeOpts{
118-
Namespace: namespace,
119-
Name: "table_count",
120-
Help: "number of tables allocated by level",
109+
Name: "table_count",
110+
Help: "number of tables allocated by level",
121111
},
122112
levelLabels,
123113
),
124114
levelSize: prometheus.NewGaugeVec(
125115
prometheus.GaugeOpts{
126-
Namespace: namespace,
127-
Name: "size",
128-
Help: "amount of bytes allocated by level",
116+
Name: "size",
117+
Help: "amount of bytes allocated by level",
129118
},
130119
levelLabels,
131120
),
132121
levelDuration: prometheus.NewGaugeVec(
133122
prometheus.GaugeOpts{
134-
Namespace: namespace,
135-
Name: "duration",
136-
Help: "amount of time (in ns) spent in compaction by level",
123+
Name: "duration",
124+
Help: "amount of time (in ns) spent in compaction by level",
137125
},
138126
levelLabels,
139127
),
140128
levelReads: prometheus.NewCounterVec(
141129
prometheus.CounterOpts{
142-
Namespace: namespace,
143-
Name: "reads",
144-
Help: "amount of bytes read during compaction by level",
130+
Name: "reads",
131+
Help: "amount of bytes read during compaction by level",
145132
},
146133
levelLabels,
147134
),
148135
levelWrites: prometheus.NewCounterVec(
149136
prometheus.CounterOpts{
150-
Namespace: namespace,
151-
Name: "writes",
152-
Help: "amount of bytes written during compaction by level",
137+
Name: "writes",
138+
Help: "amount of bytes written during compaction by level",
153139
},
154140
levelLabels,
155141
),
156142

157143
memCompactions: prometheus.NewCounter(prometheus.CounterOpts{
158-
Namespace: namespace,
159-
Name: "mem_comps",
160-
Help: "total number of memory compactions performed",
144+
Name: "mem_comps",
145+
Help: "total number of memory compactions performed",
161146
}),
162147
level0Compactions: prometheus.NewCounter(prometheus.CounterOpts{
163-
Namespace: namespace,
164-
Name: "level_0_comps",
165-
Help: "total number of level 0 compactions performed",
148+
Name: "level_0_comps",
149+
Help: "total number of level 0 compactions performed",
166150
}),
167151
nonLevel0Compactions: prometheus.NewCounter(prometheus.CounterOpts{
168-
Namespace: namespace,
169-
Name: "non_level_0_comps",
170-
Help: "total number of non-level 0 compactions performed",
152+
Name: "non_level_0_comps",
153+
Help: "total number of non-level 0 compactions performed",
171154
}),
172155
seekCompactions: prometheus.NewCounter(prometheus.CounterOpts{
173-
Namespace: namespace,
174-
Name: "seek_comps",
175-
Help: "total number of seek compactions performed",
156+
Name: "seek_comps",
157+
Help: "total number of seek compactions performed",
176158
}),
177159

178160
priorStats: &leveldb.DBStats{},

‎database/pebbledb/batch_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func TestBatch(t *testing.T) {
1717
require := require.New(t)
1818
dirName := t.TempDir()
1919

20-
db, err := New(dirName, nil, logging.NoLog{}, "", prometheus.NewRegistry())
20+
db, err := New(dirName, nil, logging.NoLog{}, prometheus.NewRegistry())
2121
require.NoError(err)
2222

2323
batchIntf := db.NewBatch()

‎database/pebbledb/db.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ type Config struct {
6464
}
6565

6666
// TODO: Add metrics
67-
func New(file string, configBytes []byte, log logging.Logger, _ string, _ prometheus.Registerer) (database.Database, error) {
67+
func New(file string, configBytes []byte, log logging.Logger, _ prometheus.Registerer) (database.Database, error) {
6868
cfg := DefaultConfig
6969
if len(configBytes) > 0 {
7070
if err := json.Unmarshal(configBytes, &cfg); err != nil {

‎database/pebbledb/db_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
func newDB(t testing.TB) *Database {
1818
folder := t.TempDir()
19-
db, err := New(folder, nil, logging.NoLog{}, "pebble", prometheus.NewRegistry())
19+
db, err := New(folder, nil, logging.NoLog{}, prometheus.NewRegistry())
2020
require.NoError(t, err)
2121
return db.(*Database)
2222
}

‎node/node.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ const (
9292
ipResolutionTimeout = 30 * time.Second
9393

9494
apiNamespace = constants.PlatformName + metric.NamespaceSeparator + "api"
95+
dbNamespace = constants.PlatformName + metric.NamespaceSeparator + "db_internal"
9596
networkNamespace = constants.PlatformName + metric.NamespaceSeparator + "network"
9697
)
9798

@@ -729,23 +730,29 @@ func (n *Node) Dispatch() error {
729730
*/
730731

731732
func (n *Node) initDatabase() error {
733+
dbRegisterer, err := metrics.MakeAndRegister(
734+
n.MetricsGatherer,
735+
dbNamespace,
736+
)
737+
if err != nil {
738+
return err
739+
}
740+
732741
// start the db
733742
switch n.Config.DatabaseConfig.Name {
734743
case leveldb.Name:
735744
// Prior to v1.10.15, the only on-disk database was leveldb, and its
736745
// files went to [dbPath]/[networkID]/v1.4.5.
737746
dbPath := filepath.Join(n.Config.DatabaseConfig.Path, version.CurrentDatabase.String())
738-
var err error
739-
n.DB, err = leveldb.New(dbPath, n.Config.DatabaseConfig.Config, n.Log, "db_internal", n.MetricsRegisterer)
747+
n.DB, err = leveldb.New(dbPath, n.Config.DatabaseConfig.Config, n.Log, dbRegisterer)
740748
if err != nil {
741749
return fmt.Errorf("couldn't create %s at %s: %w", leveldb.Name, dbPath, err)
742750
}
743751
case memdb.Name:
744752
n.DB = memdb.New()
745753
case pebbledb.Name:
746754
dbPath := filepath.Join(n.Config.DatabaseConfig.Path, "pebble")
747-
var err error
748-
n.DB, err = pebbledb.New(dbPath, n.Config.DatabaseConfig.Config, n.Log, "db_internal", n.MetricsRegisterer)
755+
n.DB, err = pebbledb.New(dbPath, n.Config.DatabaseConfig.Config, n.Log, dbRegisterer)
749756
if err != nil {
750757
return fmt.Errorf("couldn't create %s at %s: %w", pebbledb.Name, dbPath, err)
751758
}
@@ -763,7 +770,6 @@ func (n *Node) initDatabase() error {
763770
n.DB = versiondb.New(n.DB)
764771
}
765772

766-
var err error
767773
n.DB, err = meterdb.New("db", n.MetricsRegisterer, n.DB)
768774
if err != nil {
769775
return err

‎vms/platformvm/validators/manager_benchmark_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ func BenchmarkGetValidatorSet(b *testing.B) {
4949
b.TempDir(),
5050
nil,
5151
logging.NoLog{},
52-
"",
5352
prometheus.NewRegistry(),
5453
)
5554
require.NoError(err)

0 commit comments

Comments
 (0)