Commit 593cc9a

committed

Request to move from prometheus http (deprecated) to the promhttp

1 parent ab50580 commit 593cc9aCopy full SHA for 593cc9a

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`stdopentracing "github.com/opentracing/opentracing-go"`
`18`	`18`	`zipkin "github.com/openzipkin/zipkin-go-opentracing"`
`19`	`19`	`stdprometheus "github.com/prometheus/client_golang/prometheus"`
	`20`	`+ "github.com/prometheus/client_golang/prometheus/promhttp"`
`20`	`21`	`"google.golang.org/grpc"`
`21`	`22`	`"sourcegraph.com/sourcegraph/appdash"`
`22`	`23`	`appdashot "sourcegraph.com/sourcegraph/appdash/opentracing"`
`@@ -198,7 +199,7 @@ func main() {`
`198`	`199`	`m.Handle("/debug/pprof/profile", http.HandlerFunc(pprof.Profile))`
`199`	`200`	`m.Handle("/debug/pprof/symbol", http.HandlerFunc(pprof.Symbol))`
`200`	`201`	`m.Handle("/debug/pprof/trace", http.HandlerFunc(pprof.Trace))`
`201`		`- m.Handle("/metrics", stdprometheus.Handler())`
	`202`	`+ m.Handle("/metrics", promhttp.Handler())`
`202`	`203`
`203`	`204`	`logger.Log("addr", *debugAddr)`
`204`	`205`	`errc <- http.ListenAndServe(*debugAddr, m)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"time"`
`13`	`13`
`14`	`14`	`stdprometheus "github.com/prometheus/client_golang/prometheus"`
	`15`	`+ "github.com/prometheus/client_golang/prometheus/promhttp"`
`15`	`16`
`16`	`17`	`"github.com/go-kit/kit/log"`
`17`	`18`	`kitprometheus "github.com/go-kit/kit/metrics/prometheus"`
`@@ -142,7 +143,7 @@ func main() {`
`142`	`143`	`mux.Handle("/handling/v1/", handling.MakeHandler(hs, httpLogger))`
`143`	`144`
`144`	`145`	`http.Handle("/", accessControl(mux))`
`145`		`- http.Handle("/metrics", stdprometheus.Handler())`
	`146`	`+ http.Handle("/metrics", promhttp.Handler())`
`146`	`147`
`147`	`148`	`errs := make(chan error, 2)`
`148`	`149`	`go func() {`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`stdprometheus "github.com/prometheus/client_golang/prometheus"`
	`8`	`+ "github.com/prometheus/client_golang/prometheus/promhttp"`
`8`	`9`
`9`	`10`	`"github.com/go-kit/kit/log"`
`10`	`11`	`kitprometheus "github.com/go-kit/kit/metrics/prometheus"`
`@@ -53,7 +54,7 @@ func main() {`
`53`	`54`
`54`	`55`	`http.Handle("/uppercase", uppercaseHandler)`
`55`	`56`	`http.Handle("/count", countHandler)`
`56`		`- http.Handle("/metrics", stdprometheus.Handler())`
	`57`	`+ http.Handle("/metrics", promhttp.Handler())`
`57`	`58`	`logger.Log("msg", "HTTP", "addr", ":8080")`
`58`	`59`	`logger.Log("err", http.ListenAndServe(":8080", nil))`
`59`	`60`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"os"`
`8`	`8`
`9`	`9`	`stdprometheus "github.com/prometheus/client_golang/prometheus"`
	`10`	`+ "github.com/prometheus/client_golang/prometheus/promhttp"`
`10`	`11`
`11`	`12`	`"github.com/go-kit/kit/log"`
`12`	`13`	`kitprometheus "github.com/go-kit/kit/metrics/prometheus"`
`@@ -63,7 +64,7 @@ func main() {`
`63`	`64`
`64`	`65`	`http.Handle("/uppercase", uppercaseHandler)`
`65`	`66`	`http.Handle("/count", countHandler)`
`66`		`- http.Handle("/metrics", stdprometheus.Handler())`
	`67`	`+ http.Handle("/metrics", promhttp.Handler())`
`67`	`68`	`logger.Log("msg", "HTTP", "addr", *listen)`
`68`	`69`	`logger.Log("err", http.ListenAndServe(*listen, nil))`
`69`	`70`	`}`

Comments

(0)