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

Merged
merged 6 commits into from Jan 16, 2020

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 13, 2020

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

vendor: bump prometheus/client_model v0.1.0

full diff: prometheus/client_model@6f38060...v0.1.0

vendor: bump prometheus/common v0.7.0

full diff: prometheus/common@7600349...v0.7.0

vendor: bump prometheus/procfs v0.0.8

full diff: prometheus/procfs@7d6f385...v0.0.8

vendor: bump prometheus/client_golang v0.9.4, docker/go-metrics v0.0.1

bump docker/go-metrics v0.0.1:

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

bump prometheus/client_golang v0.9.4:

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

version v0.9.0 is the minimum required 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

@thaJeztah thaJeztah changed the title Bump prometheus and dependencies v1.3.0 Bump prometheus/client_golang and dependencies v1.3.0 Jan 13, 2020
@thaJeztah
Copy link
Member Author

oh, let me rebase this one to get rid of the commits from #40370 (otherwise it's confusing which PR introduced those)

full diff: prometheus/client_model@6f38060...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@7600349...v0.7.0

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

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

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

- docker/go-metrics#16 fix the compilation error against prometheus/client-golang master
- fixes docker/go-metrics#12 No longer builds against Prom master
- docker/go-metrics#18 metrics: address compile error correctly
- fixes docker/go-metrics#12 No longer builds against Prom master
- 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

bump prometheus/client_golang v0.9.4:

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

version v0.9.0 is the minimum required 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>
@thaJeztah
Copy link
Member Author

rebased: moved it to status/4-merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No longer builds against Prom master
3 participants