Skip to content

Commit

Permalink
Bump github.com/prometheus/client_golang to v1.11.1
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
denyeart authored and manish-sethi committed Feb 16, 2023
1 parent 5d9f8ec commit 9642bbe
Show file tree
Hide file tree
Showing 112 changed files with 11,647 additions and 2,391 deletions.
2 changes: 1 addition & 1 deletion core/operations/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func (s *System) startMetricsTickers() error {
go goCollector.CollectAndPublish(s.collectorTicker.C)

s.sendTicker = time.NewTicker(writeInterval)
go s.statsd.SendLoop(s.sendTicker.C, network, address)
go s.statsd.SendLoop(context.TODO(), s.sendTicker.C, network, address)
}

return nil
Expand Down
25 changes: 13 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/VictoriaMetrics/fastcache v1.5.7
github.com/davecgh/go-spew v1.1.1
github.com/fsouza/go-dockerclient v1.7.0
github.com/go-kit/kit v0.8.0
github.com/golang/protobuf v1.3.3
github.com/go-kit/kit v0.9.0
github.com/golang/protobuf v1.4.3
github.com/gorilla/handlers v1.4.0
github.com/gorilla/mux v1.8.0
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
Expand All @@ -26,7 +26,7 @@ require (
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.1.0
github.com/prometheus/client_golang v1.11.1
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.5
Expand All @@ -43,7 +43,7 @@ require (
google.golang.org/grpc v1.29.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/cheggaaa/pb.v1 v1.0.28
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.3.0
)

require (
Expand All @@ -54,8 +54,8 @@ require (
github.com/Microsoft/hcsshim v0.8.10 // indirect
github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
github.com/VividCortex/gohistogram v1.0.0 // indirect
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
Expand All @@ -72,13 +72,12 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/frankban/quicktest v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/snappy v0.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
github.com/kr/text v0.1.0 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mattn/go-runewidth v0.0.4 // indirect
Expand All @@ -93,9 +92,9 @@ require (
github.com/opencontainers/runc v1.0.0-rc8 // indirect
github.com/pierrec/lz4 v2.5.0+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
github.com/prometheus/common v0.6.0 // indirect
github.com/prometheus/procfs v0.0.3 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/sirupsen/logrus v1.6.0 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -116,4 +115,6 @@ require (

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

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
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

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.
66 changes: 46 additions & 20 deletions go.sum

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion vendor/github.com/alecthomas/units/bytes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 27 additions & 3 deletions vendor/github.com/alecthomas/units/si.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/go-kit/kit/log/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/go-kit/kit/metrics/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/go-kit/kit/metrics/internal/lv/space.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions vendor/github.com/go-kit/kit/metrics/statsd/statsd.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions vendor/github.com/go-logfmt/logfmt/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/go-logfmt/logfmt/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/go-logfmt/logfmt/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/go-logfmt/logfmt/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9642bbe

Please sign in to comment.