Merge pull request #68 from tendermint/ugrade-tm-monitor-and-tm-bench

Ugrade tm monitor and tm bench
2026-05-31 11:26:20 +00:00 · 2017-12-07 14:59:01 -06:00
parent 5efc536ba3 8879640901
commit 1644773e69
13 changed files with 91 additions and 78 deletions
--- a/tm-bench/LICENSE
+++ b/tm-bench/LICENSE
@@ -1,3 +1,4 @@
+Tendermint Bench
 Copyright 2017 Tendermint

                                 Apache License
--- a/tm-bench/Makefile
+++ b/tm-bench/Makefile
@@ -1,31 +1,31 @@
 DIST_DIRS := find * -type d -exec
 VERSION := $(shell perl -ne '/^var version.*"([^"]+)".*$$/ && print "v$$1\n"' main.go)
 GOTOOLS = \
-					github.com/Masterminds/glide \
 					github.com/mitchellh/gox

 tools:
-	go get -v $(GOTOOLS)
+	go get $(GOTOOLS)

-get_vendor_deps: tools
+get_vendor_deps:
+	@hash glide 2>/dev/null || go get github.com/Masterminds/glide
 	glide install

 build:
-	go build -ldflags "-X main.version=${VERSION}"
+	go build

 install:
-	go install -ldflags "-X main.version=${VERSION}"
+	go install

 test:
-	go test
+	go test -race

 build-all: tools
 	rm -rf ./dist
 	gox -verbose \
-		-ldflags "-X main.version=${VERSION}" \
-		-os="linux darwin windows" \
-		-arch="amd64 386 armv6 arm64" \
-		-osarch="!darwin/arm64" \
+		-ldflags "-s -w" \
+		-arch="amd64 386 arm arm64" \
+		-os="linux darwin windows freebsd" \
+		-osarch="!darwin/arm !darwin/arm64" \
 		-output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .

 dist: build-all
@@ -38,7 +38,7 @@ dist: build-all

 build-docker:
 	rm -f ./tm-bench
-	docker run -it --rm -v "$(PWD):/go/src/app" -w "/go/src/app" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-X main.version=${VERSION}" -o tm-bench
+	docker run -it --rm -v "$(PWD):/go/src/app" -w "/go/src/app" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-s -w" -o tm-bench
 	docker build -t "tendermint/bench" .

 clean:
--- a/tm-bench/README.rst
+++ b/tm-bench/README.rst
@@ -29,8 +29,8 @@ Docker

 ::

-    docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint init
-    docker run -it --rm -v "/tmp:/tendermint" -p "46657:46657" --name=tm tendermint/tendermint
+    docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint:0.12.1 init
+    docker run -it --rm -v "/tmp:/tendermint" -p "46657:46657" --name=tm tendermint/tendermint:0.12.1

    docker run -it --rm --link=tm tendermint/bench tm:46657

@@ -41,13 +41,13 @@ If **Linux**, start with:

 ::

-    curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.10.4/tendermint_linux_amd64.zip && sudo unzip -d /usr/local/bin tendermint_linux_amd64.zip && sudo chmod +x tendermint
+    curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.12.1/tendermint_linux_amd64.zip && sudo unzip -d /usr/local/bin tendermint_linux_amd64.zip && sudo chmod +x tendermint

 if  **Mac OS**, start with:

 ::

-    curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.10.4/tendermint_darwin_amd64.zip && sudo unzip -d /usr/local/bin tendermint_darwin_amd64.zip && sudo chmod +x tendermint
+    curl -L https://s3-us-west-2.amazonaws.com/tendermint/0.12.1/tendermint_darwin_amd64.zip && sudo unzip -d /usr/local/bin tendermint_darwin_amd64.zip && sudo chmod +x tendermint

 then run:

--- a/tm-bench/glide.lock
+++ b/tm-bench/glide.lock
@@ -1,12 +1,12 @@
-hash: 765fd22d79f7d7123197548b3228ebf56f72be9541b64b04cde875f2d09214f8
-updated: 2017-10-06T07:40:33.279710782Z
+hash: 46f5e4380fdca1f3c0211f1f54f2c0dcd2213aabbb96cdaaaa201a55156bfb97
+updated: 2017-12-07T17:26:11.121786018Z
 imports:
 - name: github.com/btcsuite/btcd
-  version: 4803a8291c92a1d2d41041b942a9a9e37deab065
+  version: 2e60448ffcc6bf78332d1fe590260095f554dd78
  subpackages:
  - btcec
 - name: github.com/go-kit/kit
-  version: 4dc7be5d2d12881735283bcab7352178e190fc71
+  version: ebf82f4a7270657af57182f212579e5ec8c9fac8
  subpackages:
  - log
  - log/level
@@ -14,15 +14,15 @@ imports:
 - name: github.com/go-logfmt/logfmt
  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 - name: github.com/go-playground/locales
-  version: 1e5f1161c6416a5ff48840eb8724a394e48cc534
+  version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6
  subpackages:
  - currency
 - name: github.com/go-playground/universal-translator
  version: 71201497bace774495daed26a3874fd339e0b538
 - name: github.com/go-stack/stack
-  version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf
+  version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc
 - name: github.com/golang/protobuf
-  version: 130e6b02ab059e7b717a096f397c5b60111cae74
+  version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
  subpackages:
  - proto
  - ptypes
@@ -30,34 +30,35 @@ imports:
  - ptypes/duration
  - ptypes/timestamp
 - name: github.com/gorilla/websocket
-  version: 4201258b820c74ac8e6922fc9e6b52f71fe46f8d
+  version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b
 - name: github.com/kr/logfmt
  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
 - name: github.com/pkg/errors
-  version: 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb
+  version: 645ef00459ed84a119197bfb8d8205042c6df63d
 - name: github.com/rcrowley/go-metrics
-  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
+  version: e181e095bae94582363434144c61a9653aff6e50
 - name: github.com/tendermint/abci
-  version: 191c4b6d176169ffc7f9972d490fa362a3b7d940
+  version: 76ef8a0697c6179220a74c479b36c27a5b53008a
  subpackages:
  - client
  - example/dummy
  - types
 - name: github.com/tendermint/ed25519
-  version: 1f52c6f8b8a5c7908aff4497c186af344b428925
+  version: d8387025d2b9d158cf4efb07e7ebf814bcce2057
  subpackages:
  - edwards25519
  - extra25519
 - name: github.com/tendermint/go-crypto
-  version: 311e8c1bf00fa5868daad4f8ea56dcad539182c0
+  version: dd20358a264c772b4a83e477b0cfce4c88a7001d
 - name: github.com/tendermint/go-wire
-  version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
+  version: b6fc872b42d41158a60307db4da051dd6f179415
  subpackages:
  - data
 - name: github.com/tendermint/tendermint
-  version: 7682ad9a60162dd17fd6f61aeed7049a8635ac78
+  version: c7f923c5b0d0f0f26566281aa251259d1bef3a6c
  subpackages:
  - config
+  - consensus/types
  - p2p
  - p2p/upnp
  - rpc/core/types
@@ -65,7 +66,7 @@ imports:
  - rpc/lib/types
  - types
 - name: github.com/tendermint/tmlibs
-  version: 096dcb90e60aa00b748b3fe49a4b95e48ebf1e13
+  version: b854baa1fce7101c90b1d301b3359bb412f981c0
  subpackages:
  - common
  - events
@@ -73,12 +74,12 @@ imports:
  - log
  - merkle
 - name: github.com/tendermint/tools
-  version: 9708c66576d3e7d4fd0a5cdec7d951f1ef002efc
+  version: c36867e971f4d717e7ceb2c3d451a64e9a101b99
  subpackages:
  - tm-monitor/eventmeter
  - tm-monitor/monitor
 - name: golang.org/x/crypto
-  version: 9419663f5a44be8b34ca85f08abc5fe1be11f8a3
+  version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122
  subpackages:
  - curve25519
  - nacl/box
@@ -89,7 +90,7 @@ imports:
  - ripemd160
  - salsa20/salsa
 - name: golang.org/x/net
-  version: a04bdaca5b32abe1c069418fb7088ae607de5bd0
+  version: faacc1b5e36e3ff02cbec9661c69ac63dd5a83ad
  subpackages:
  - context
  - http2
@@ -99,18 +100,18 @@ imports:
  - lex/httplex
  - trace
 - name: golang.org/x/text
-  version: d82c1812e304abfeeabd31e995a115a2855bf642
+  version: be25de41fadfae372d6470bda81ca6beb55ef551
  subpackages:
  - secure/bidirule
  - transform
  - unicode/bidi
  - unicode/norm
 - name: google.golang.org/genproto
-  version: f676e0f3ac6395ff1a529ae59a6670878a8371a6
+  version: 7f0da29060c682909f650ad8ed4e515bd74fa12a
  subpackages:
  - googleapis/rpc/status
 - name: google.golang.org/grpc
-  version: 5279edf262dc22329b1e53281ce9d55c0a998216
+  version: f7bf885db0b7479a537ec317c6e48ce53145f3db
  subpackages:
  - balancer
  - codes
@@ -129,5 +130,5 @@ imports:
  - tap
  - transport
 - name: gopkg.in/go-playground/validator.v9
-  version: a021b2ec9a8a8bb970f3f15bc42617cb520e8a64
+  version: 61caf9d3038e1af346dbf5c2e16f6678e1548364
 testImports: []
--- a/tm-bench/glide.yaml
+++ b/tm-bench/glide.yaml
@@ -7,7 +7,7 @@ import:
 - package: github.com/pkg/errors
 - package: github.com/rcrowley/go-metrics
 - package: github.com/tendermint/tendermint
-  version: v0.11.0
+  version: v0.12.1
  subpackages:
  - rpc/lib/types
  - types
@@ -15,6 +15,6 @@ import:
  subpackages:
  - log
 - package: github.com/tendermint/tools
-  version: 9708c66576d3e7d4fd0a5cdec7d951f1ef002efc
+  version: c36867e971f4d717e7ceb2c3d451a64e9a101b99
  subpackages:
  - tm-monitor/monitor
--- a/tm-bench/main.go
+++ b/tm-bench/main.go
@@ -16,7 +16,7 @@ import (
 	"github.com/tendermint/tools/tm-monitor/monitor"
 )

-var version = "0.2.0"
+var version = "0.2.1"

 var logger = log.NewNopLogger()

--- a/tm-bench/transacter.go
+++ b/tm-bench/transacter.go
@@ -163,7 +163,7 @@ func (t *transacter) sendLoop(connIndex int) {
 					JSONRPC: "2.0",
 					ID:      "tm-bench",
 					Method:  "broadcast_tx_async",
-					Params:  &rawParamsJson,
+					Params:  rawParamsJson,
 				})
 				if err != nil {
 					fmt.Printf("%v. Try reducing the connections count and increasing the rate.\n", errors.Wrap(err, "txs send failed"))
--- a/tm-monitor/LICENSE
+++ b/tm-monitor/LICENSE
@@ -1,3 +1,4 @@
+Tendermint Monitor
 Copyright 2017 Tendermint

                                 Apache License
--- a/tm-monitor/Makefile
+++ b/tm-monitor/Makefile
@@ -1,45 +1,44 @@
 DIST_DIRS := find * -type d -exec
 VERSION := $(shell perl -ne '/^var version.*"([^"]+)".*$$/ && print "v$$1\n"' main.go)
 GOTOOLS = \
-					github.com/Masterminds/glide \
 					github.com/mitchellh/gox
-PACKAGES=$(shell go list ./... | grep -v '/vendor/')
+PACKAGES=$(shell go list ./... | grep -v '/vendor')

 tools:
-	go get -v $(GOTOOLS)
+	go get $(GOTOOLS)

-get_vendor_deps: tools
+get_vendor_deps:
+	@hash glide 2>/dev/null || go get github.com/Masterminds/glide
 	glide install

 build:
-	go build -ldflags "-X main.version=${VERSION}"
+	go build

 install:
-	go install -ldflags "-X main.version=${VERSION}"
+	go install

 test:
-	@go test $(PACKAGES)
+	@go test -race $(PACKAGES)

 build-all: tools
 	rm -rf ./dist
 	gox -verbose \
-		-ldflags "-X main.version=${VERSION}" \
-		-os="linux darwin windows" \
-		-arch="amd64 386 armv6 arm64" \
-		-osarch="!darwin/arm64" \
+		-ldflags "-s -w" \
+		-arch="amd64 386 arm arm64" \
+		-os="linux darwin windows freebsd" \
+		-osarch="!darwin/arm !darwin/arm64" \
 		-output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .

 dist: build-all
 	cd dist && \
 		$(DIST_DIRS) cp ../LICENSE {} \; && \
-		$(DIST_DIRS) cp ../README.rst {} \; && \
 		$(DIST_DIRS) tar -zcf tm-monitor-${VERSION}-{}.tar.gz {} \; && \
 		shasum -a256 ./*.tar.gz > "./tm-monitor_${VERSION}_SHA256SUMS" && \
 		cd ..

 build-docker:
 	rm -f ./tm-monitor
-	docker run -it --rm -v "$(PWD):/go/src/github.com/tendermint/tools/tm-monitor" -w "/go/src/github.com/tendermint/tools/tm-monitor" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-X main.version=${VERSION}" -o tm-monitor
+	docker run -it --rm -v "$(PWD):/go/src/github.com/tendermint/tools/tm-monitor" -w "/go/src/github.com/tendermint/tools/tm-monitor" -e "CGO_ENABLED=0" golang:alpine go build -ldflags "-s -w" -o tm-monitor
 	docker build -t "tendermint/monitor" .

 clean:
--- a/tm-monitor/eventmeter/eventmeter.go
+++ b/tm-monitor/eventmeter/eventmeter.go
@@ -214,12 +214,12 @@ func (em *EventMeter) receiveRoutine() {
 	latencyTicker := time.NewTicker(latencyPeriod)
 	for {
 		select {
-		case rawEvent := <-em.wsc.ResultsCh:
-			if rawEvent == nil {
-				em.logger.Error("expected some event, got nil")
+		case resp := <-em.wsc.ResponsesCh:
+			if resp.Error != nil {
+				em.logger.Error("expected some event, got error", "err", resp.Error.Error())
 				continue
 			}
-			eventType, data, err := em.unmarshalEvent(rawEvent)
+			eventType, data, err := em.unmarshalEvent(*resp.Result)
 			if err != nil {
 				em.logger.Error("failed to unmarshal event", "err", err)
 				continue
@@ -227,10 +227,6 @@ func (em *EventMeter) receiveRoutine() {
 			if eventType != "" { // FIXME how can it be an empty string?
 				em.updateMetric(eventType, data)
 			}
-		case err := <-em.wsc.ErrorsCh:
-			if err != nil {
-				em.logger.Error("expected some event, got error", "err", err)
-			}
 		case <-latencyTicker.C:
 			if em.wsc.IsActive() {
 				em.callLatencyCallback(em.wsc.PingPongLatencyTimer.Mean())
--- a/tm-monitor/glide.lock
+++ b/tm-monitor/glide.lock
@@ -1,5 +1,5 @@
-hash: 1a38134bef18f688b42d6d52fcb02682604e8c1c9e308f6e2ce8c4a461c903a9
-updated: 2017-10-06T06:57:56.777237539Z
+hash: 156fcaac82d95af15aa920438cd12ab6ba1ac0ea5dfe8a5ca7eae94eeae625be
+updated: 2017-12-06T18:01:20.739645218Z
 imports:
 - name: github.com/btcsuite/btcd
  version: 583684b21bfbde9b5fc4403916fd7c807feb0289
@@ -14,7 +14,7 @@ imports:
 - name: github.com/go-logfmt/logfmt
  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
 - name: github.com/go-playground/locales
-  version: 1e5f1161c6416a5ff48840eb8724a394e48cc534
+  version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6
  subpackages:
  - currency
 - name: github.com/go-playground/universal-translator
@@ -25,8 +25,12 @@ imports:
  version: 69b215d01a5606c843240eab4937eab3acee6530
  subpackages:
  - proto
+  - ptypes
+  - ptypes/any
+  - ptypes/duration
+  - ptypes/timestamp
 - name: github.com/gorilla/websocket
-  version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13
+  version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b
 - name: github.com/kr/logfmt
  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
 - name: github.com/pkg/errors
@@ -34,7 +38,7 @@ imports:
 - name: github.com/rcrowley/go-metrics
  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 - name: github.com/tendermint/abci
-  version: 191c4b6d176169ffc7f9972d490fa362a3b7d940
+  version: 76ef8a0697c6179220a74c479b36c27a5b53008a
  subpackages:
  - client
  - example/dummy
@@ -45,15 +49,16 @@ imports:
  - edwards25519
  - extra25519
 - name: github.com/tendermint/go-crypto
-  version: 311e8c1bf00fa5868daad4f8ea56dcad539182c0
+  version: dd20358a264c772b4a83e477b0cfce4c88a7001d
 - name: github.com/tendermint/go-wire
-  version: 5f88da3dbc1a72844e6dfaf274ce87f851d488eb
+  version: b6fc872b42d41158a60307db4da051dd6f179415
  subpackages:
  - data
 - name: github.com/tendermint/tendermint
-  version: 7682ad9a60162dd17fd6f61aeed7049a8635ac78
+  version: c7f923c5b0d0f0f26566281aa251259d1bef3a6c
  subpackages:
  - config
+  - consensus/types
  - p2p
  - p2p/upnp
  - rpc/core/types
@@ -62,7 +67,7 @@ imports:
  - rpc/lib/types
  - types
 - name: github.com/tendermint/tmlibs
-  version: 7dd6b3d3f8a7a998a79bdd0d8222252b309570f3
+  version: b854baa1fce7101c90b1d301b3359bb412f981c0
  subpackages:
  - common
  - events
@@ -90,21 +95,31 @@ imports:
  - internal/timeseries
  - lex/httplex
  - trace
- name: google.golang.org/grpc
-  version: 8b2e129857480cb0f07ef7d9d10b8b252c7ac984
+- name: google.golang.org/genproto
+  version: 7f0da29060c682909f650ad8ed4e515bd74fa12a
  subpackages:
+  - googleapis/rpc/status
+- name: google.golang.org/grpc
+  version: f7bf885db0b7479a537ec317c6e48ce53145f3db
+  subpackages:
+  - balancer
  - codes
+  - connectivity
  - credentials
+  - grpclb/grpc_lb_v1/messages
  - grpclog
  - internal
+  - keepalive
  - metadata
  - naming
  - peer
+  - resolver
  - stats
+  - status
  - tap
  - transport
 - name: gopkg.in/go-playground/validator.v9
-  version: a021b2ec9a8a8bb970f3f15bc42617cb520e8a64
+  version: 61caf9d3038e1af346dbf5c2e16f6678e1548364
 testImports:
 - name: github.com/davecgh/go-spew
  version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
--- a/tm-monitor/glide.yaml
+++ b/tm-monitor/glide.yaml
@@ -5,14 +5,14 @@ import:
 - package: github.com/rcrowley/go-metrics
 - package: github.com/tendermint/go-crypto
 - package: github.com/tendermint/tendermint
-  version: v0.11.0
+  version: v0.12.1
  subpackages:
  - rpc/core/types
  - rpc/lib/client
  - rpc/lib/server
  - types
 - package: github.com/tendermint/tmlibs
-  version: develop
+  version: v0.4.1
  subpackages:
  - common
  - events
--- a/tm-monitor/main.go
+++ b/tm-monitor/main.go
@@ -11,7 +11,7 @@ import (
 	monitor "github.com/tendermint/tools/tm-monitor/monitor"
 )

-var version = "0.3.0"
+var version = "0.3.1"

 var logger = log.NewNopLogger()