mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-09-19 23:57:30 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove deprecated prometheus.InstrumentHandlerFunc (#831)

Browse source 
Update Prometheus client golang use to use `promhttp.Handler()` instead
of `prometheus.InstrumentHandlerFunc()`.
This commit is contained in:
Ben Kochie 2018-02-19 15:44:59 +01:00 committed by GitHub
parent 7928dc93da
commit d33a447047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -28,9 +28,7 @@ DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))
MACH ?= $(shell uname -m) MACH ?= $(shell uname -m)
DOCKERFILE ?= Dockerfile DOCKERFILE ?= Dockerfile
# TODO: Remove deprecated and problematic InstrumentHandlerFunc usage. STATICCHECK_IGNORE =
STATICCHECK_IGNORE = \
github.com/prometheus/node_exporter/node_exporter.go:SA1019
ifeq ($(GOHOSTARCH),amd64) ifeq ($(GOHOSTARCH),amd64)
# Only supported on amd64 # Only supported on amd64

29
collector/fixtures/e2e-output.txt
View file

@ -54,27 +54,6 @@
# TYPE go_memstats_sys_bytes gauge # TYPE go_memstats_sys_bytes gauge
# HELP go_threads Number of OS threads created. # HELP go_threads Number of OS threads created.
# TYPE go_threads gauge # TYPE go_threads gauge
# HELP http_request_duration_microseconds The HTTP request latencies in microseconds.
# TYPE http_request_duration_microseconds summary
http_request_duration_microseconds{handler="prometheus",quantile="0.5"} NaN
http_request_duration_microseconds{handler="prometheus",quantile="0.9"} NaN
http_request_duration_microseconds{handler="prometheus",quantile="0.99"} NaN
http_request_duration_microseconds_sum{handler="prometheus"} 0
http_request_duration_microseconds_count{handler="prometheus"} 0
# HELP http_request_size_bytes The HTTP request sizes in bytes.
# TYPE http_request_size_bytes summary
http_request_size_bytes{handler="prometheus",quantile="0.5"} NaN
http_request_size_bytes{handler="prometheus",quantile="0.9"} NaN
http_request_size_bytes{handler="prometheus",quantile="0.99"} NaN
http_request_size_bytes_sum{handler="prometheus"} 0
http_request_size_bytes_count{handler="prometheus"} 0
# HELP http_response_size_bytes The HTTP response sizes in bytes.
# TYPE http_response_size_bytes summary
http_response_size_bytes{handler="prometheus",quantile="0.5"} NaN
http_response_size_bytes{handler="prometheus",quantile="0.9"} NaN
http_response_size_bytes{handler="prometheus",quantile="0.99"} NaN
http_response_size_bytes_sum{handler="prometheus"} 0
http_response_size_bytes_count{handler="prometheus"} 0
# HELP node_arp_entries ARP entries by device # HELP node_arp_entries ARP entries by device
# TYPE node_arp_entries gauge # TYPE node_arp_entries gauge
node_arp_entries{device="eth0"} 3 node_arp_entries{device="eth0"} 3
@ -3722,6 +3701,14 @@ node_zfs_zpool_wupdate{zpool="poolz1"} 1.10734831833266e+14
# TYPE process_start_time_seconds gauge # TYPE process_start_time_seconds gauge
# HELP process_virtual_memory_bytes Virtual memory size in bytes. # HELP process_virtual_memory_bytes Virtual memory size in bytes.
# TYPE process_virtual_memory_bytes gauge # TYPE process_virtual_memory_bytes gauge
# HELP promhttp_metric_handler_requests_in_flight Current number of scrapes being served.
# TYPE promhttp_metric_handler_requests_in_flight gauge
promhttp_metric_handler_requests_in_flight 1
# HELP promhttp_metric_handler_requests_total Total number of scrapes by HTTP status code.
# TYPE promhttp_metric_handler_requests_total counter
promhttp_metric_handler_requests_total{code="200"} 0
promhttp_metric_handler_requests_total{code="500"} 0
promhttp_metric_handler_requests_total{code="503"} 0
# HELP testmetric1_1 Metric read from collector/fixtures/textfile/two_metric_files/metrics1.prom # HELP testmetric1_1 Metric read from collector/fixtures/textfile/two_metric_files/metrics1.prom
# TYPE testmetric1_1 untyped # TYPE testmetric1_1 untyped
testmetric1_1{foo="bar"} 10 testmetric1_1{foo="bar"} 10

16
node_exporter.go
View file

@ -56,11 +56,14 @@ func handler(w http.ResponseWriter, r *http.Request) {
registry, registry,
} }
// Delegate http serving to Prometheus client library, which will call collector.Collect. // Delegate http serving to Prometheus client library, which will call collector.Collect.
h := promhttp.HandlerFor(gatherers, h := promhttp.InstrumentMetricHandler(
promhttp.HandlerOpts{ registry,
ErrorLog: log.NewErrorLogger(), promhttp.HandlerFor(gatherers,
ErrorHandling: promhttp.ContinueOnError, promhttp.HandlerOpts{
}) ErrorLog: log.NewErrorLogger(),
ErrorHandling: promhttp.ContinueOnError,
}),
)
h.ServeHTTP(w, r) h.ServeHTTP(w, r)
} }
@ -88,8 +91,7 @@ func main() {
log.Infof(" - %s", n) log.Infof(" - %s", n)
} }
// TODO(ts): Remove deprecated and problematic InstrumentHandlerFunc usage. http.HandleFunc(*metricsPath, handler)
http.HandleFunc(*metricsPath, prometheus.InstrumentHandlerFunc("prometheus", handler))
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
w.Write([]byte(`<html> w.Write([]byte(`<html>
<head><title>Node Exporter</title></head> <head><title>Node Exporter</title></head>