From 2bcd7e596292996b408a0b2f2f780d043141a17a Mon Sep 17 00:00:00 2001 From: ValarDragon Date: Fri, 22 Jun 2018 19:10:58 -0700 Subject: [PATCH] tm-bench: Update dependencies, add total metrics * Update tendermint to develop branch * Update tmlibs to develop branch * Add total field for txs and blocks --- tm-bench/Gopkg.lock | 100 +++++++++++++++++++++++++++++++------------- tm-bench/Gopkg.toml | 4 +- tm-bench/main.go | 29 +++++++++---- 3 files changed, 94 insertions(+), 39 deletions(-) diff --git a/tm-bench/Gopkg.lock b/tm-bench/Gopkg.lock index a013e0a3e..81fab2805 100644 --- a/tm-bench/Gopkg.lock +++ b/tm-bench/Gopkg.lock @@ -1,6 +1,12 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + branch = "master" + name = "github.com/beorn7/perks" + packages = ["quantile"] + revision = "3a771d992973f24aa725d07868b467d1ddfceafb" + [[projects]] branch = "master" name = "github.com/btcsuite/btcd" @@ -24,7 +30,11 @@ packages = [ "log", "log/level", - "log/term" + "log/term", + "metrics", + "metrics/discard", + "metrics/internal/lv", + "metrics/prometheus" ] revision = "4dc7be5d2d12881735283bcab7352178e190fc71" version = "v0.6.0" @@ -90,12 +100,54 @@ packages = ["."] revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" +[[projects]] + name = "github.com/matttproud/golang_protobuf_extensions" + packages = ["pbutil"] + revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" + version = "v1.0.1" + [[projects]] name = "github.com/pkg/errors" packages = ["."] revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" +[[projects]] + name = "github.com/prometheus/client_golang" + packages = [ + "prometheus", + "prometheus/promhttp" + ] + revision = "c5b7fccd204277076155f10851dad72b76a49317" + version = "v0.8.0" + +[[projects]] + branch = "master" + name = "github.com/prometheus/client_model" + packages = ["go"] + revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" + +[[projects]] + branch = "master" + name = "github.com/prometheus/common" + packages = [ + "expfmt", + "internal/bitbucket.org/ww/goautoneg", + "model" + ] + revision = "7600349dcfe1abd18d72d3a1770870d9800a7801" + +[[projects]] + branch = "master" + name = "github.com/prometheus/procfs" + packages = [ + ".", + "internal/util", + "nfs", + "xfs" + ] + revision = "7d6f385de8bea29190f15ba9931442a0eaef9af7" + [[projects]] branch = "master" name = "github.com/rcrowley/go-metrics" @@ -121,17 +173,6 @@ ] revision = "ae970a0732be3a1f5311da86118d37b9f4bd2a5a" -[[projects]] - name = "github.com/tendermint/abci" - packages = [ - "client", - "example/code", - "example/kvstore", - "types" - ] - revision = "78a8905690ef54f9d57e3b2b0ee7ad3a04ef3f1f" - version = "v0.10.3" - [[projects]] branch = "master" name = "github.com/tendermint/ed25519" @@ -145,29 +186,34 @@ [[projects]] name = "github.com/tendermint/go-amino" packages = ["."] - revision = "ed62928576cfcaf887209dc96142cd79cdfff389" - version = "0.9.9" - -[[projects]] - name = "github.com/tendermint/go-crypto" - packages = ["."] - revision = "915416979bf70efa4bcbf1c6cd5d64c5fff9fc19" - version = "v0.6.2" + revision = "2106ca61d91029c931fd54968c2bb02dc96b1412" + version = "0.10.1" [[projects]] + branch = "develop" name = "github.com/tendermint/tendermint" packages = [ + "abci/client", + "abci/example/code", + "abci/example/kvstore", + "abci/types", "blockchain", "config", "consensus", "consensus/types", + "crypto", + "crypto/tmhash", "evidence", + "libs/events", + "libs/pubsub", + "libs/pubsub/query", "mempool", "node", "p2p", "p2p/conn", "p2p/pex", "p2p/upnp", + "privval", "proxy", "rpc/client", "rpc/core", @@ -182,11 +228,9 @@ "state/txindex/kv", "state/txindex/null", "types", - "types/priv_validator", "version" ] - revision = "64408a40419a5fa6f156dd96a2ab2fffa3c8ab96" - version = "v0.19.2" + revision = "f62d6651e3cbd5e8b17622a4bf87289d2fbe7885" [[projects]] name = "github.com/tendermint/tmlibs" @@ -198,11 +242,10 @@ "flowrate", "log", "merkle", - "pubsub", - "pubsub/query" + "merkle/tmhash" ] - revision = "d94e312673e16a11ea55d742cefb3e331228f898" - version = "v0.8.2" + revision = "fb7ec62b2925f48de159aeea73b254ae8c58a738" + version = "v0.9.0-rc1" [[projects]] branch = "master" @@ -230,6 +273,7 @@ "idna", "internal/timeseries", "lex/httplex", + "netutil", "trace" ] revision = "640f4622ab692b87c2f3a94265e6f579fe38263d" @@ -288,6 +332,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "0da857a5c1642e5e47aaa00e5b82b15dcdd1b08e44d0b027676adc085501e6a6" + inputs-digest = "65c380641dcebca21a6343c9ea36bab5cbebff696e27c74d0735077f63272248" solver-name = "gps-cdcl" solver-version = 1 diff --git a/tm-bench/Gopkg.toml b/tm-bench/Gopkg.toml index 556af4c05..4d1d0df77 100644 --- a/tm-bench/Gopkg.toml +++ b/tm-bench/Gopkg.toml @@ -43,11 +43,11 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "~0.19.2" + branch = "develop" [[constraint]] name = "github.com/tendermint/tmlibs" - version = "~0.8.2" + branch = "develop" [prune] go-tests = true diff --git a/tm-bench/main.go b/tm-bench/main.go index f124e9bf5..5870e0b6a 100644 --- a/tm-bench/main.go +++ b/tm-bench/main.go @@ -261,15 +261,26 @@ func printStatistics(stats *statistics, outputFormat string) { fmt.Println(string(result)) } else { w := tabwriter.NewWriter(os.Stdout, 0, 0, 5, ' ', 0) - fmt.Fprintln(w, "Stats\tAvg\tStdDev\tMax\t") - fmt.Fprintln(w, fmt.Sprintf("Txs/sec\t%.0f\t%.0f\t%d\t", - stats.TxsThroughput.Mean(), - stats.TxsThroughput.StdDev(), - stats.TxsThroughput.Max())) - fmt.Fprintln(w, fmt.Sprintf("Blocks/sec\t%.3f\t%.3f\t%d\t", - stats.BlocksThroughput.Mean(), - stats.BlocksThroughput.StdDev(), - stats.BlocksThroughput.Max())) + fmt.Fprintln(w, "Stats\tAvg\tStdDev\tMax\tTotal\t") + fmt.Fprintln( + w, + fmt.Sprintf( + "Txs/sec\t%.0f\t%.0f\t%d\t%d\t", + stats.TxsThroughput.Mean(), + stats.TxsThroughput.StdDev(), + stats.TxsThroughput.Max(), + stats.TxsThroughput.Sum(), + ), + ) + fmt.Fprintln( + w, + fmt.Sprintf("Blocks/sec\t%.3f\t%.3f\t%d\t%d\t", + stats.BlocksThroughput.Mean(), + stats.BlocksThroughput.StdDev(), + stats.BlocksThroughput.Max(), + stats.BlocksThroughput.Sum(), + ), + ) w.Flush() } }