Skip to content

Commit

Permalink
Merge pull request #9 from ledgerwatch/fix_kv_metrics
Browse files Browse the repository at this point in the history 
kv metrics
  • Loading branch information
@AskAlexSharov
AskAlexSharov authored Jul 29, 2021
2 parents f2e8642 + 5f20dea commit 9d8ca55
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 168 deletions.
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/ledgerwatch/erigon-lib
go 1.16

require (
github.com/VictoriaMetrics/metrics v1.17.3 // indirect
github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2
github.com/golang/protobuf v1.5.2
github.com/google/btree v1.0.1
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/VictoriaMetrics/metrics v1.17.3 h1:QPUakR6JRy8BhL2C2kOgYKLuoPDwtJQ+7iKIZSjt1A4=
github.com/VictoriaMetrics/metrics v1.17.3/go.mod h1:Z1tSfPfngDn12bTfZSCqArT3OPY3u88J12hSoOhuiRE=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
Expand Down Expand Up @@ -84,6 +86,10 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/torquem-ch/mdbx-go v0.17.0 h1:X8le6dDqWkkJf/T3H2H+Y/kmsmhBD72ds0fP3vchJgg=
github.com/torquem-ch/mdbx-go v0.17.0/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E=
github.com/valyala/fastrand v1.0.0 h1:LUKT9aKer2dVQNUi3waewTbKV+7H17kvWFNKs2ObdkI=
github.com/valyala/fastrand v1.0.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
github.com/valyala/histogram v1.1.2 h1:vOk5VrGjMBIoPR5k6wA8vBaC8toeJ8XO0yfRjFEc1h8=
github.com/valyala/histogram v1.1.2/go.mod h1:CZAr6gK9dbD7hYx2s8WSPh0p5x5wETjC+2b3PJVtEdg=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
Expand Down
100 changes: 50 additions & 50 deletions kv/kv_interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,62 +19,62 @@ package kv
import (
"context"
"errors"

"github.com/VictoriaMetrics/metrics"
)

const ReadersLimit = 32000 // MDBX_READERS_LIMIT=32767

var (
ErrAttemptToDeleteNonDeprecatedBucket = errors.New("only buckets from dbutils.ChaindataDeprecatedTables can be deleted")
/*
ErrUnknownBucket = errors.New("unknown bucket. add it to dbutils.ChaindataTables")
DbSize = metrics.GetOrRegisterGauge("db/size", metrics.DefaultRegistry) //nolint
TxLimit = metrics.GetOrRegisterGauge("tx/limit", metrics.DefaultRegistry) //nolint
TxSpill = metrics.GetOrRegisterGauge("tx/spill", metrics.DefaultRegistry) //nolint
TxUnspill = metrics.GetOrRegisterGauge("tx/unspill", metrics.DefaultRegistry) //nolint
TxDirty = metrics.GetOrRegisterGauge("tx/dirty", metrics.DefaultRegistry) //nolint
DbCommitPreparation = metrics.GetOrRegisterTimer("db/commit/preparation", metrics.DefaultRegistry) //nolint
DbCommitGc = metrics.GetOrRegisterTimer("db/commit/gc", metrics.DefaultRegistry) //nolint
DbCommitAudit = metrics.GetOrRegisterTimer("db/commit/audit", metrics.DefaultRegistry) //nolint
DbCommitWrite = metrics.GetOrRegisterTimer("db/commit/write", metrics.DefaultRegistry) //nolint
DbCommitSync = metrics.GetOrRegisterTimer("db/commit/sync", metrics.DefaultRegistry) //nolint
DbCommitEnding = metrics.GetOrRegisterTimer("db/commit/ending", metrics.DefaultRegistry) //nolint
DbPgopsNewly = metrics.GetOrRegisterGauge("db/pgops/newly", metrics.DefaultRegistry) //nolint
DbPgopsCow = metrics.GetOrRegisterGauge("db/pgops/cow", metrics.DefaultRegistry) //nolint
DbPgopsClone = metrics.GetOrRegisterGauge("db/pgops/clone", metrics.DefaultRegistry) //nolint
DbPgopsSplit = metrics.GetOrRegisterGauge("db/pgops/split", metrics.DefaultRegistry) //nolint
DbPgopsMerge = metrics.GetOrRegisterGauge("db/pgops/merge", metrics.DefaultRegistry) //nolint
DbPgopsSpill = metrics.GetOrRegisterGauge("db/pgops/spill", metrics.DefaultRegistry) //nolint
DbPgopsUnspill = metrics.GetOrRegisterGauge("db/pgops/unspill", metrics.DefaultRegistry) //nolint
DbPgopsWops = metrics.GetOrRegisterGauge("db/pgops/wops", metrics.DefaultRegistry) //nolint
DbCommitBigBatchTimer = metrics.NewRegisteredTimer("db/commit/big_batch", nil)
GcLeafMetric = metrics.GetOrRegisterGauge("db/gc/leaf", metrics.DefaultRegistry) //nolint
GcOverflowMetric = metrics.GetOrRegisterGauge("db/gc/overflow", metrics.DefaultRegistry) //nolint
GcPagesMetric = metrics.GetOrRegisterGauge("db/gc/pages", metrics.DefaultRegistry) //nolint
TableScsLeaf = metrics.GetOrRegisterGauge("table/scs/leaf", metrics.DefaultRegistry) //nolint
TableScsBranch = metrics.GetOrRegisterGauge("table/scs/branch", metrics.DefaultRegistry) //nolint
TableScsEntries = metrics.GetOrRegisterGauge("table/scs/entries", metrics.DefaultRegistry) //nolint
TableScsSize = metrics.GetOrRegisterGauge("table/scs/size", metrics.DefaultRegistry) //nolint
TableStateLeaf = metrics.GetOrRegisterGauge("table/state/leaf", metrics.DefaultRegistry) //nolint
TableStateBranch = metrics.GetOrRegisterGauge("table/state/branch", metrics.DefaultRegistry) //nolint
TableStateEntries = metrics.GetOrRegisterGauge("table/state/entries", metrics.DefaultRegistry) //nolint
TableStateSize = metrics.GetOrRegisterGauge("table/state/size", metrics.DefaultRegistry) //nolint
TableLogLeaf = metrics.GetOrRegisterGauge("table/log/leaf", metrics.DefaultRegistry) //nolint
TableLogBranch = metrics.GetOrRegisterGauge("table/log/branch", metrics.DefaultRegistry) //nolint
TableLogOverflow = metrics.GetOrRegisterGauge("table/log/overflow", metrics.DefaultRegistry) //nolint
TableLogEntries = metrics.GetOrRegisterGauge("table/log/entries", metrics.DefaultRegistry) //nolint
TableLogSize = metrics.GetOrRegisterGauge("table/log/size", metrics.DefaultRegistry) //nolint
TableTxLeaf = metrics.GetOrRegisterGauge("table/tx/leaf", metrics.DefaultRegistry) //nolint
TableTxBranch = metrics.GetOrRegisterGauge("table/tx/branch", metrics.DefaultRegistry) //nolint
TableTxOverflow = metrics.GetOrRegisterGauge("table/tx/overflow", metrics.DefaultRegistry) //nolint
TableTxEntries = metrics.GetOrRegisterGauge("table/tx/entries", metrics.DefaultRegistry) //nolint
TableTxSize = metrics.GetOrRegisterGauge("table/tx/size", metrics.DefaultRegistry) //nolint
*/
ErrUnknownBucket = errors.New("unknown bucket. add it to dbutils.ChaindataTables")

DbSize = metrics.NewCounter(`db_size`) //nolint
TxLimit = metrics.NewCounter(`tx_limit`) //nolint
TxSpill = metrics.NewCounter(`tx_spill`) //nolint
TxUnspill = metrics.NewCounter(`tx_unspill`) //nolint
TxDirty = metrics.NewCounter(`tx_dirty`) //nolint

DbCommitPreparation = metrics.GetOrCreateSummary(`db_commit_seconds{phase="preparation"}`) //nolint
DbCommitGc = metrics.GetOrCreateSummary(`db_commit_seconds{phase="gc"}`) //nolint
DbCommitAudit = metrics.GetOrCreateSummary(`db_commit_seconds{phase="audit"}`) //nolint
DbCommitWrite = metrics.GetOrCreateSummary(`db_commit_seconds{phase="write"}`) //nolint
DbCommitSync = metrics.GetOrCreateSummary(`db_commit_seconds{phase="sync"}`) //nolint
DbCommitEnding = metrics.GetOrCreateSummary(`db_commit_seconds{phase="ending"}`) //nolint
DbCommitTotal = metrics.GetOrCreateSummary(`db_commit_seconds{phase="total"}`) //nolint

DbPgopsNewly = metrics.NewCounter(`db_pgops_newly`) //nolint
DbPgopsCow = metrics.NewCounter(`db_pgops_cow`) //nolint
DbPgopsClone = metrics.NewCounter(`db_pgops_clone`) //nolint
DbPgopsSplit = metrics.NewCounter(`db_pgops_split`) //nolint
DbPgopsMerge = metrics.NewCounter(`db_pgops_merge`) //nolint
DbPgopsSpill = metrics.NewCounter(`db_pgops_spill`) //nolint
DbPgopsUnspill = metrics.NewCounter(`db_pgops_unspill`) //nolint
DbPgopsWops = metrics.NewCounter(`db_pgops_wops`) //nolint

GcLeafMetric = metrics.NewCounter(`db_gc_leaf`) //nolint
GcOverflowMetric = metrics.NewCounter(`db_gc_overflow`) //nolint
GcPagesMetric = metrics.NewCounter(`db_gc_pages`) //nolint

TableScsLeaf = metrics.NewCounter(`table_scs_leaf`) //nolint
TableScsBranch = metrics.NewCounter(`table_scs_branch`) //nolint
TableScsEntries = metrics.NewCounter(`table_scs_entries`) //nolint
TableScsSize = metrics.NewCounter(`table_scs_size`) //nolint
TableStateLeaf = metrics.NewCounter(`table_state_leaf`) //nolint
TableStateBranch = metrics.NewCounter(`table_state_branch`) //nolint
TableStateEntries = metrics.NewCounter(`table_state_entries`) //nolint
TableStateSize = metrics.NewCounter(`table_state_size`) //nolint
TableLogLeaf = metrics.NewCounter(`table_log_leaf`) //nolint
TableLogBranch = metrics.NewCounter(`table_log_branch`) //nolint
TableLogOverflow = metrics.NewCounter(`table_log_overflow`) //nolint
TableLogEntries = metrics.NewCounter(`table_log_entries`) //nolint
TableLogSize = metrics.NewCounter(`table_log_size`) //nolint
TableTxLeaf = metrics.NewCounter(`table_tx_leaf`) //nolint
TableTxBranch = metrics.NewCounter(`table_tx_branch`) //nolint
TableTxOverflow = metrics.NewCounter(`table_tx_overflow`) //nolint
TableTxEntries = metrics.NewCounter(`table_tx_entries`) //nolint
TableTxSize = metrics.NewCounter(`table_tx_size`) //nolint

)

type DBVerbosityLvl int8
Expand Down
Loading

0 comments on commit 9d8ca55

Please sign in to comment.