Merge pull request #913 from nats-io/release_0_16_0

Prepare for release v0.16.0

.goreleaser.yml

@@ -0,0 +1,58 @@
+project_name: nats-streaming-server
+
+release:
+  github:
+    owner: nats-io
+    name: nats-streaming-server
+  name_template: 'Release {{.Tag}}'
+  draft: true
+
+changelog:
+  skip: true
+
+builds:
+- main: ./nats-streaming-server.go
+  binary: nats-streaming-server
+  ldflags:
+    - -s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit={{.ShortCommit}} -X github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=c8ca58e
+  env:
+    - GO111MODULE=off
+    - CGO_ENABLED=0
+  goos:
+  - darwin
+  - linux
+  - windows
+  goarch:
+  - amd64
+  - arm
+  - arm64
+  - 386
+  goarm:
+  - 6
+  - 7
+  ignore:
+    - goos: darwin
+      goarch: 386
+
+nfpms:
+  - name_template: '{{.ProjectName}}-{{.Tag}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
+    homepage:  https://nats.io
+    description: High-Performance Streaming server for NATS, the cloud native messaging system.
+    maintainer: Ivan Kozlovic <ivan@synadia.com>
+    license: Apache 2.0
+    vendor: Synadia Inc.
+    formats:
+    - deb
+    - rpm
+
+archives:
+  - name_template: '{{.ProjectName}}-{{.Tag}}-{{.Os}}-{{.Arch}}{{if .Arm}}{{.Arm}}{{end}}'
+    wrap_in_directory: true
+    format: zip
+    files:
+      - README.md
+      - LICENSE
+
+checksum:
+  name_template: 'SHA256SUMS'
+  algorithm: sha256

.travis.yml

@@ -3,18 +3,19 @@ sudo: false
 go:
 - 1.11.x
 - 1.12.x
+addons:
+  apt:
+    packages:
+    - rpm
 env:
 - GO111MODULE=off
 go_import_path: github.com/nats-io/nats-streaming-server
 install:
 - go get -t ./...
 - go get github.com/nats-io/nats-server
-- go get github.com/mattn/goveralls
-- go get github.com/wadey/gocovmerge
 - go get -u honnef.co/go/tools/cmd/staticcheck
 - go get -u github.com/client9/misspell/cmd/misspell
 - go get -u github.com/go-sql-driver/mysql
-- go get github.com/tcnksm/ghr
 services:
 - mysql
 before_script:
@@ -23,11 +24,19 @@ before_script:
 - go install
 - $(exit $(go fmt $EXCLUDE_VENDOR | wc -l))
 - go vet $EXCLUDE_VENDOR
-- $(exit $(misspell -locale US . | grep -v "vendor/" | wc -l))
+- $(exit $(misspell -locale US $EXCLUDE_VENDOR_AND_PROTO_DIR | wc -l))
+- $(exit $(misspell -locale US README.md | wc -l))
 - staticcheck $EXCLUDE_VENDOR_AND_PROTO_DIR
 script:
 - mysql -u root -e "CREATE USER 'nss'@'localhost' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON *.* TO 'nss'@'localhost'; CREATE DATABASE test_nats_streaming;"
 - go test -i $EXCLUDE_VENDOR
 - if [[ "$TRAVIS_GO_VERSION" =~ 1.12 ]]; then ./scripts/cov.sh TRAVIS; else go test -failfast $EXCLUDE_VENDOR; fi
-after_success:
-- if [[ "$TRAVIS_GO_VERSION" =~ 1.11 ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
+
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: curl -sL http://git.io/goreleaser | bash
+  verbose: true
+  on:
+    tags: true
+    condition: $TRAVIS_GO_VERSION =~ 1.11

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11.12
+FROM golang:1.11.13
 
 MAINTAINER Ivan Kozlovic <ivan@synadia.com>
 
@@ -8,7 +8,7 @@ WORKDIR /go/src/github.com/nats-io/nats-streaming-server
 # Set the NATS Server git commit based on the rev that
 # we actually vendor. This can be found in the
 # vendor/manifest file.
-ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/server.gitCommit=6a40503'
+ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/nats-server/v2/server.gitCommit=c8ca58e'
 
 RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-amd64/nats-streaming-server
 RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm6/nats-streaming-server

README.md

@@ -826,13 +826,13 @@ various general statistics.
 ```
 {
   "cluster_id": "test-cluster",
-  "server_id": "NSqMILe1E8aoN8H9N9EMlx",
-  "version": "0.15.1",
-  "go": "go1.11.10",
+  "server_id": "JZnM3Yj3DSXc8a4StffjI0",
+  "version": "0.16.0",
+  "go": "go1.11.13",
   "state": "STANDALONE",
-  "now": "2019-06-05T12:42:03.125071-06:00",
-  "start_time": "2019-06-05T12:41:50.091142-06:00",
-  "uptime": "13s",
+  "now": "2019-08-14T09:23:31.15467-06:00",
+  "start_time": "2019-08-14T09:23:19.94433-06:00",
+  "uptime": "11s",
   "clients": 0,
   "subscriptions": 0,
   "channels": 0,
@@ -846,14 +846,14 @@ Here is an example:
 ```
 {
   "cluster_id": "test-cluster",
-  "server_id": "4e0SiYIpAp2AfvnoVC9Muo",
-  "version": "0.15.1",
-  "go": "go1.11.10",
+  "server_id": "wmlNqEpVE8lBgCYb6j05ri",
+  "version": "0.16.0",
+  "go": "go1.11.13",
   "state": "CLUSTERED",
   "role": "Follower",
-  "now": "2019-06-05T12:43:17.014304-06:00",
-  "start_time": "2019-06-05T12:43:14.710972-06:00",
-  "uptime": "2s",
+  "now": "2019-08-14T09:24:02.780595-06:00",
+  "start_time": "2019-08-14T09:23:59.452994-06:00",
+  "uptime": "3s",
   "clients": 0,
   "subscriptions": 0,
   "channels": 0,
@@ -1175,27 +1175,27 @@ The NATS Streaming Server embeds a NATS Server. Starting the server with no argu
 
 ```
 > ./nats-streaming-server
-[93817] 2019/06/05 12:44:10.895877 [INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.15.1
-[93817] 2019/06/05 12:44:10.895928 [INF] STREAM: ServerID: TXER4DTyF8rzvL8vJdZhfp
-[93817] 2019/06/05 12:44:10.895930 [INF] STREAM: Go version: go1.11.10
-[93817] 2019/06/05 12:44:10.895933 [INF] STREAM: Git commit: [not set]
-[93817] 2019/06/05 12:44:10.896500 [INF] Starting nats-server version 2.0.0
-[93817] 2019/06/05 12:44:10.896508 [INF] Git commit [not set]
-[93817] 2019/06/05 12:44:10.896694 [INF] Listening for client connections on 0.0.0.0:4222
-[93817] 2019/06/05 12:44:10.896698 [INF] Server id is NC2GAQMFV5JQVZUZAHQ3VH3G6ZVHRF3XT7IRWI3KFBRWAL5XVUW6RMJ6
-[93817] 2019/06/05 12:44:10.896701 [INF] Server is ready
-[93817] 2019/06/05 12:44:10.928786 [INF] STREAM: Recovering the state...
-[93817] 2019/06/05 12:44:10.928805 [INF] STREAM: No recovered state
-[93817] 2019/06/05 12:44:11.179257 [INF] STREAM: Message store is MEMORY
-[93817] 2019/06/05 12:44:11.179319 [INF] STREAM: ---------- Store Limits ----------
-[93817] 2019/06/05 12:44:11.179325 [INF] STREAM: Channels:                  100 *
-[93817] 2019/06/05 12:44:11.179329 [INF] STREAM: --------- Channels Limits --------
-[93817] 2019/06/05 12:44:11.179333 [INF] STREAM:   Subscriptions:          1000 *
-[93817] 2019/06/05 12:44:11.179336 [INF] STREAM:   Messages     :       1000000 *
-[93817] 2019/06/05 12:44:11.179340 [INF] STREAM:   Bytes        :     976.56 MB *
-[93817] 2019/06/05 12:44:11.179344 [INF] STREAM:   Age          :     unlimited *
-[93817] 2019/06/05 12:44:11.179347 [INF] STREAM:   Inactivity   :     unlimited *
-[93817] 2019/06/05 12:44:11.179351 [INF] STREAM: ----------------------------------
+[72851] 2019/08/14 09:24:50.717761 [INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.16.0
+[72851] 2019/08/14 09:24:50.717813 [INF] STREAM: ServerID: AKvHMILjPtSohL5ZlmW8dk
+[72851] 2019/08/14 09:24:50.717815 [INF] STREAM: Go version: go1.11.13
+[72851] 2019/08/14 09:24:50.717817 [INF] STREAM: Git commit: [not set]
+[72851] 2019/08/14 09:24:50.718389 [INF] Starting nats-server version 2.0.2
+[72851] 2019/08/14 09:24:50.718395 [INF] Git commit [not set]
+[72851] 2019/08/14 09:24:50.718595 [INF] Listening for client connections on 0.0.0.0:4222
+[72851] 2019/08/14 09:24:50.718600 [INF] Server id is NDRKDJUODU5NBKZUCXDYF4PEZU3KA3KAMTFCFZ4VSUREUWQZAQAEOH36
+[72851] 2019/08/14 09:24:50.718602 [INF] Server is ready
+[72851] 2019/08/14 09:24:50.746557 [INF] STREAM: Recovering the state...
+[72851] 2019/08/14 09:24:50.746567 [INF] STREAM: No recovered state
+[72851] 2019/08/14 09:24:50.998824 [INF] STREAM: Message store is MEMORY
+[72851] 2019/08/14 09:24:50.998869 [INF] STREAM: ---------- Store Limits ----------
+[72851] 2019/08/14 09:24:50.998874 [INF] STREAM: Channels:                  100 *
+[72851] 2019/08/14 09:24:50.998879 [INF] STREAM: --------- Channels Limits --------
+[72851] 2019/08/14 09:24:50.998882 [INF] STREAM:   Subscriptions:          1000 *
+[72851] 2019/08/14 09:24:50.998886 [INF] STREAM:   Messages     :       1000000 *
+[72851] 2019/08/14 09:24:50.998889 [INF] STREAM:   Bytes        :     976.56 MB *
+[72851] 2019/08/14 09:24:50.998893 [INF] STREAM:   Age          :     unlimited *
+[72851] 2019/08/14 09:24:50.998897 [INF] STREAM:   Inactivity   :     unlimited *
+[72851] 2019/08/14 09:24:50.998900 [INF] STREAM: ----------------------------------
 ```
 
 The server will be started and listening for client connections on port 4222 (the default) from all available interfaces. The logs will be displayed to stderr as shown above.
@@ -1776,14 +1776,14 @@ Below is what would be displayed with the above store limits configuration. Noti
 how `foo.bar.>` is indented compared to `foo.>` to show the inheritance.
 
 ```
-[INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.15.1
-[INF] STREAM: ServerID: Y4y597WVLrWTxKykwx1L5g
-[INF] STREAM: Go version: go1.11.10
+[INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.16.0
+[INF] STREAM: ServerID: bFHdJP9hesjHIR0RheCl7W
+[INF] STREAM: Go version: go1.11.13
 [INF] STREAM: Git commit: [not set]
-[INF] Starting nats-server version 2.0.0
+[INF] Starting nats-server version 2.0.2
 [INF] Git commit [not set]
 [INF] Listening for client connections on 0.0.0.0:4222
-[INF] Server id is NATWWNPXILVPC7XI6SILWRP5GYIG2Q7PA5NDEKE5ZOBM5K5R5WMTKYH4
+[INF] Server id is NDMRMUBKS37GDEPOZP4YVMTRLS6ROZS4O2JQVFOGDRJTGIY44OUV7ZSD
 [INF] Server is ready
 [INF] STREAM: Recovering the state...
 [INF] STREAM: No recovered state

go.mod

@@ -5,14 +5,14 @@ require (
 	github.com/gogo/protobuf v1.2.1
 	github.com/hashicorp/go-msgpack v0.5.5
 	github.com/hashicorp/raft v1.1.1
-	github.com/lib/pq v1.1.1
-	github.com/nats-io/nats-server/v2 v2.0.2
+	github.com/lib/pq v1.2.0
+	github.com/nats-io/nats-server/v2 v2.0.4
 	github.com/nats-io/nats.go v1.8.1
 	github.com/nats-io/nuid v1.0.1
-	github.com/nats-io/stan.go v0.4.5
-	github.com/prometheus/procfs v0.0.2
+	github.com/nats-io/stan.go v0.5.0
+	github.com/prometheus/procfs v0.0.3
 	go.etcd.io/bbolt v1.3.3
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
-	golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e
+	golang.org/x/sys v0.0.0-20190726091711-fde4db37ae7a
 	google.golang.org/appengine v1.6.0 // indirect
 )

go.sum

@@ -6,13 +6,15 @@ github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx2
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.9.1 h1:9PZfAcVEvez4yhLH2TBU64/h/z4xlFI80cWXRrxuKuM=
 github.com/hashicorp/go-hclog v0.9.1/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
@@ -21,6 +23,7 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh
 github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
 github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -29,33 +32,36 @@ github.com/hashicorp/raft v1.1.1/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7
 github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
-github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/nats-io/jwt v0.2.8 h1:PXr0mRjPCPX4cXsdfHcsqoplrNXnKOD+g2yHoh9qy1I=
-github.com/nats-io/jwt v0.2.8/go.mod h1:mQxQ0uHQ9FhEVPIcTSKwx2lqZEpXWWcCgA7R6NrWvvY=
-github.com/nats-io/nats-server/v2 v2.0.2 h1:dB1cucvPi3Kgq0H7LbOENHfRf4buy8coAP48CjSvgm8=
-github.com/nats-io/nats-server/v2 v2.0.2/go.mod h1:sk9mvTwGZiqHrkA12dw2r6LKmPYPkw15tB8haEsvxo8=
+github.com/nats-io/jwt v0.2.14 h1:wA50KvFz/JXGXMHRygTWsRGh/ixxgC5E3kHvmtGLNf4=
+github.com/nats-io/jwt v0.2.14/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/nats-server/v2 v2.0.4 h1:XOMeQRbhl1lGNTIctPhih6pTa15NGif54Uas6ZW5q7g=
+github.com/nats-io/nats-server/v2 v2.0.4/go.mod h1:AWdGEVbjKRS9ZIx4DSP5eKW48nfFm7q3uiSkP/1KD7M=
 github.com/nats-io/nats.go v1.8.1 h1:6lF/f1/NN6kzUDBz6pyvQDEXO39jqXcWRLu/tKjtOUQ=
 github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
 github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
 github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/nats-io/stan.go v0.4.5 h1:lPZ9y1jVGiXcTaUc1SnEIWPYfh0avuEiHBePNJYgpPk=
-github.com/nats-io/stan.go v0.4.5/go.mod h1:Ji7mK6gRZJSH1nc3ZJH6vi7zn/QnZhpR9Arm4iuzsUQ=
+github.com/nats-io/stan.go v0.5.0 h1:ZaSPMb6jnDXsSlOACynJrUiB3Evleg3ZyyX+rnf3TlQ=
+github.com/nats-io/stan.go v0.5.0/go.mod h1:dYqB+vMN3C2F9pT1FRQpg9eHbjPj6mP0yYuyBNuXHZE=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
+github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
@@ -68,13 +74,15 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fde4db37ae7a h1:CiRbBigq5/kg+QzRuV9KGkMah4rAveeDldNgmuzbE0M=
+golang.org/x/sys v0.0.0-20190726091711-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=

scripts/cov.sh

@@ -1,6 +1,11 @@
 #!/bin/bash -e
 # Run from directory above via ./scripts/cov.sh
 
+export GO111MODULE="off"
+
+go get github.com/mattn/goveralls
+go get github.com/wadey/gocovmerge
+
 rm -rf ./cov
 mkdir cov
 go test -v -failfast -covermode=atomic -coverprofile=./cov/server.out -coverpkg=./server,./stores,./util ./server