metrics: address compile error correctly #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This addresses a compilation error without breaking the interface. In both cases, the returned metric, of type Observer, is always a Collector and a Metric, preserving the original behavior of the package. Signed-off-by: Stephen J Day <stephen.day@docker.com>
|
LGTM |
1 task
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Jan 16, 2020
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>
docker-jenkins
pushed a commit
to docker/docker-ce
that referenced
this pull request
Jan 17, 2020
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> Upstream-commit: b2db7c8bc967b52609877f5d856c338ea51e4c46 Component: engine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This addresses a compilation error without breaking the interface. In
both cases, the returned metric, of type Observer, is always a Collector
and a Metric, preserving the original behavior of the package.
Signed-off-by: Stephen J Day stephen.day@docker.com
Closes #12