From d703c70ef1e4de2a792fd786420eee6582626c5e Mon Sep 17 00:00:00 2001 From: beorn7 Date: Sat, 12 Nov 2016 16:36:39 +0100 Subject: [PATCH] Adjust examples to modern usage - Use seconds instead of microseconds. - Use promhttp.Handler instead of prometheus.Handler --- examples/random/main.go | 15 ++++++++------- examples/simple/main.go | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/random/main.go b/examples/random/main.go index 955b21b..3edc9a0 100644 --- a/examples/random/main.go +++ b/examples/random/main.go @@ -25,13 +25,14 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" ) var ( addr = flag.String("listen-address", ":8080", "The address to listen on for HTTP requests.") - uniformDomain = flag.Float64("uniform.domain", 200, "The domain for the uniform distribution.") - normDomain = flag.Float64("normal.domain", 200, "The domain for the normal distribution.") - normMean = flag.Float64("normal.mean", 10, "The mean for the normal distribution.") + uniformDomain = flag.Float64("uniform.domain", 0.0002, "The domain for the uniform distribution.") + normDomain = flag.Float64("normal.domain", 0.0002, "The domain for the normal distribution.") + normMean = flag.Float64("normal.mean", 0.00001, "The mean for the normal distribution.") oscillationPeriod = flag.Duration("oscillation-period", 10*time.Minute, "The duration of the rate oscillation period.") ) @@ -41,7 +42,7 @@ var ( // differentiated via a "service" label. rpcDurations = prometheus.NewSummaryVec( prometheus.SummaryOpts{ - Name: "rpc_durations_microseconds", + Name: "rpc_durations_seconds", Help: "RPC latency distributions.", }, []string{"service"}, @@ -51,7 +52,7 @@ var ( // normal distribution, with 20 buckets centered on the mean, each // half-sigma wide. rpcDurationsHistogram = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "rpc_durations_histogram_microseconds", + Name: "rpc_durations_histogram_seconds", Help: "RPC latency distributions.", Buckets: prometheus.LinearBuckets(*normMean-5**normDomain, .5**normDomain, 20), }) @@ -92,13 +93,13 @@ func main() { go func() { for { - v := rand.ExpFloat64() + v := rand.ExpFloat64() / 1e6 rpcDurations.WithLabelValues("exponential").Observe(v) time.Sleep(time.Duration(50*oscillationFactor()) * time.Millisecond) } }() // Expose the registered metrics via HTTP. - http.Handle("/metrics", prometheus.Handler()) + http.Handle("/metrics", promhttp.Handler()) log.Fatal(http.ListenAndServe(*addr, nil)) } diff --git a/examples/simple/main.go b/examples/simple/main.go index 47f57ca..1fc2324 100644 --- a/examples/simple/main.go +++ b/examples/simple/main.go @@ -19,13 +19,13 @@ import ( "log" "net/http" - "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" ) var addr = flag.String("listen-address", ":8080", "The address to listen on for HTTP requests.") func main() { flag.Parse() - http.Handle("/metrics", prometheus.Handler()) + http.Handle("/metrics", promhttp.Handler()) log.Fatal(http.ListenAndServe(*addr, nil)) }