Skip to content

Commit 9642bbe

Browse files
denyeartmanish-sethi
authored andcommitted
Bump github.com/prometheus/client_golang to v1.11.1
Note that client_golang v1.11.1 attempts pull in protobuf v1.4.3. However, protobuf v1.4.3 is incompatible with raft in v2.2.x. Therefore, need to add a "replace" in go.mod to keep protobuf at v1.3.3. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
1 parent 5d9f8ec commit 9642bbe

112 files changed

Lines changed: 11647 additions & 2391 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/operations/system.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func (s *System) startMetricsTickers() error {
241241
go goCollector.CollectAndPublish(s.collectorTicker.C)
242242

243243
s.sendTicker = time.NewTicker(writeInterval)
244-
go s.statsd.SendLoop(s.sendTicker.C, network, address)
244+
go s.statsd.SendLoop(context.TODO(), s.sendTicker.C, network, address)
245245
}
246246

247247
return nil

go.mod

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/VictoriaMetrics/fastcache v1.5.7
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/fsouza/go-dockerclient v1.7.0
12-
github.com/go-kit/kit v0.8.0
13-
github.com/golang/protobuf v1.3.3
12+
github.com/go-kit/kit v0.9.0
13+
github.com/golang/protobuf v1.4.3
1414
github.com/gorilla/handlers v1.4.0
1515
github.com/gorilla/mux v1.8.0
1616
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
@@ -26,7 +26,7 @@ require (
2626
github.com/onsi/ginkgo v1.14.0
2727
github.com/onsi/gomega v1.10.1
2828
github.com/pkg/errors v0.9.1
29-
github.com/prometheus/client_golang v1.1.0
29+
github.com/prometheus/client_golang v1.11.1
3030
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
3131
github.com/spf13/cobra v0.0.3
3232
github.com/spf13/pflag v1.0.5
@@ -43,7 +43,7 @@ require (
4343
google.golang.org/grpc v1.29.1
4444
gopkg.in/alecthomas/kingpin.v2 v2.2.6
4545
gopkg.in/cheggaaa/pb.v1 v1.0.28
46-
gopkg.in/yaml.v2 v2.2.8
46+
gopkg.in/yaml.v2 v2.3.0
4747
)
4848

4949
require (
@@ -54,8 +54,8 @@ require (
5454
github.com/Microsoft/hcsshim v0.8.10 // indirect
5555
github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
5656
github.com/VividCortex/gohistogram v1.0.0 // indirect
57-
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
58-
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
57+
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
58+
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
5959
github.com/beorn7/perks v1.0.1 // indirect
6060
github.com/cespare/xxhash/v2 v2.1.1 // indirect
6161
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
@@ -72,13 +72,12 @@ require (
7272
github.com/eapache/queue v1.1.0 // indirect
7373
github.com/frankban/quicktest v1.9.0 // indirect
7474
github.com/fsnotify/fsnotify v1.4.9 // indirect
75-
github.com/go-logfmt/logfmt v0.4.0 // indirect
75+
github.com/go-logfmt/logfmt v0.5.0 // indirect
7676
github.com/gogo/protobuf v1.3.1 // indirect
7777
github.com/golang/snappy v0.0.2 // indirect
7878
github.com/hashicorp/golang-lru v0.5.1 // indirect
7979
github.com/inconshreveable/mousetrap v1.0.0 // indirect
8080
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
81-
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
8281
github.com/kr/text v0.1.0 // indirect
8382
github.com/magiconair/properties v1.8.1 // indirect
8483
github.com/mattn/go-runewidth v0.0.4 // indirect
@@ -93,9 +92,9 @@ require (
9392
github.com/opencontainers/runc v1.0.0-rc8 // indirect
9493
github.com/pierrec/lz4 v2.5.0+incompatible // indirect
9594
github.com/pmezard/go-difflib v1.0.0 // indirect
96-
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
97-
github.com/prometheus/common v0.6.0 // indirect
98-
github.com/prometheus/procfs v0.0.3 // indirect
95+
github.com/prometheus/client_model v0.2.0 // indirect
96+
github.com/prometheus/common v0.26.0 // indirect
97+
github.com/prometheus/procfs v0.6.0 // indirect
9998
github.com/sirupsen/logrus v1.6.0 // indirect
10099
github.com/spf13/cast v1.3.1 // indirect
101100
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -116,4 +115,6 @@ require (
116115

117116
replace github.com/onsi/gomega => github.com/onsi/gomega v1.9.0
118117

119-
replace github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.2 // fix for Go 1.17 in github.com/prometheus/client_golang dependency without updating protobuf
118+
replace github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.2 // fix for Go 1.17 to push github.com/prometheus/client_golang dependency up from v2.1.1 to v2.1.2
119+
120+
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.3 // update github.com/prometheus/client_golang to v1.11.1 while keeping it's protobuf dependency at v1.3.3, since later protobuf versions are incompatible with etcdraft in v2.2.x.

go.sum

Lines changed: 46 additions & 20 deletions
Large diffs are not rendered by default.

vendor/github.com/alecthomas/units/bytes.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/alecthomas/units/si.go

Lines changed: 27 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-kit/kit/log/README.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-kit/kit/metrics/README.md

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-kit/kit/metrics/internal/lv/space.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-kit/kit/metrics/statsd/statsd.go

Lines changed: 15 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logfmt/logfmt/.gitignore

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)