Skip to content
This repository was archived by the owner on May 27, 2026. It is now read-only.

metrics: address compile error correctly#18

Merged
crosbymichael merged 1 commit into
docker:masterfrom
stevvooe:fix-compilation-error
Jan 31, 2018
Merged

metrics: address compile error correctly#18
crosbymichael merged 1 commit into
docker:masterfrom
stevvooe:fix-compilation-error

Conversation

@stevvooe

Copy link
Copy Markdown
Contributor

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 [email protected]

Closes #12

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 <[email protected]>
@crosbymichael

Copy link
Copy Markdown
Contributor

LGTM

@crosbymichael
crosbymichael merged commit 4ea375f into docker:master Jan 31, 2018
@stevvooe
stevvooe deleted the fix-compilation-error branch January 31, 2018 19:35
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 <[email protected]>
docker-jenkins pushed a commit to docker-archive/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 <[email protected]>
Upstream-commit: b2db7c8bc967b52609877f5d856c338ea51e4c46
Component: engine
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants