Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump prometheus/client_golang and dependencies v1.3.0 #3959

Merged
merged 8 commits into from Jan 13, 2020

Conversation

thaJeztah
Copy link
Member

Updates prometheus to v1.3.0; given that this dependency wasn't updated for a while, doing so in some steps;

vendor: bump beorn7/perks v1.0.1

full diff: beorn7/perks@4c0e845...v1.0.1

vendor: bump prometheus/client_model v0.1.0

full diff: prometheus/client_model@99fa1f4...v0.1.0

vendor: bump prometheus/common v0.7.0

full diff: prometheus/common@89604d1...v0.7.0

vendor: bump prometheus/procfs v0.0.8

full diff: prometheus/procfs@cb41470...v0.0.8

vendor: bump docker/go-metrics v0.0.1:

full diff: docker/go-metrics@4ea375f...v0.0.1

vendor: bump prometheus/client_golang v0.9.4

full diff: prometheus/client_golang@f4fb1b7...v0.9.4

version v0.9.0 is the minimum tagged version to work with go-metrics v0.0.1,
as it depends on prometheus.Observer:

vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

vendor: bump prometheus/client_golang v1.1.0

full diff: prometheus/client_golang@v0.9.4...v1.1.0

Using v1.1.0, because version v1.2.0 and up use versioned import paths for the
github.com/cespare/xxhash/v2 dependency (prometheus/client_golang#657), which
causes vendoring with vndr to break due to the v2 in the import-path.

vendor: bump prometheus/client_golang v1.3.0

full diff: prometheus/client_golang@v1.1.0...v1.3.0

This requires LK4D/vndr v0.1.0 or newer for vendoring; also adds a new
dependency: github.com/cespare/xxhash

full diff: beorn7/perks@4c0e845...v1.0.1

- beorn7/perks#3 Avoid iterating on maps
    - Speed up InsertTargeted* functions by at least 2x by avoiding iterating on maps.
- beorn7/perks#4 Fixed format error
- Use 1000000 instead of 1e6 for int constant
- Add go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/client_model@99fa1f4...v0.1.0

- prometheus/client_model#22 add `go_package`, regenerate Go binding file
- prometheus/client_model#31 Support Go Modules
- prometheus/client_model#38 Remove all languages but Go and add a deprecation note

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/common@89604d1...v0.7.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/procfs@cb41470...v0.0.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: docker/go-metrics@4ea375f...v0.0.1

- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/client_golang@f4fb1b7...v0.9.4

version v0.9.0 is the minimum tagged version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/client_golang@v0.9.4...v1.1.0

Using v1.1.0, because version v1.2.0 and up use versioned import paths for the
github.com/cespare/xxhash/v2 dependency (prometheus/client_golang#657), which
causes vendoring with vndr to break due to the v2 in the import-path.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: prometheus/client_golang@v1.1.0...v1.3.0

This requires LK4D/vndr v0.1.0 or newer for vendoring; also adds a new
dependency: github.com/cespare/xxhash

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-io
Copy link

Codecov Report

Merging #3959 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3959   +/-   ##
=======================================
  Coverage   42.63%   42.63%           
=======================================
  Files         130      130           
  Lines       14759    14759           
=======================================
  Hits         6292     6292           
  Misses       7548     7548           
  Partials      919      919
Flag Coverage Δ
#linux 46% <ø> (ø) ⬆️
#windows 38.22% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a767b62...2f0db8e. Read the comment docs.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jan 13, 2020

Build succeeded.

Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dmcgowan dmcgowan merged commit bb9d4e8 into containerd:master Jan 13, 2020
@thaJeztah thaJeztah deleted the bump_prometheus branch January 14, 2020 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants