Skip to content

Commit

Permalink
Merge pull request #1799 from ipfs/prometheus-http
Browse files Browse the repository at this point in the history
daemon: instrument the gateway and api HTTP handlers
  • Loading branch information
jbenet committed Oct 5, 2015
2 parents e0f0417 + dd20f48 commit bb8e231
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cmd/ipfs/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ func serveHTTPApi(req cmds.Request) (error, <-chan error) {
},
})
var opts = []corehttp.ServeOption{
corehttp.PrometheusCollectorOption("api"),
corehttp.CommandsOption(*req.InvocContext()),
corehttp.WebUIOption,
apiGw.ServeOption(),
Expand Down Expand Up @@ -416,6 +417,7 @@ func serveHTTPGateway(req cmds.Request) (error, <-chan error) {
}

var opts = []corehttp.ServeOption{
corehttp.PrometheusCollectorOption("gateway"),
corehttp.CommandsROOption(*req.InvocContext()),
corehttp.VersionOption(),
corehttp.IPNSHostnameOption(),
Expand Down
10 changes: 9 additions & 1 deletion core/corehttp/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ import (

func PrometheusOption(path string) ServeOption {
return func(n *core.IpfsNode, _ net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
mux.Handle(path, prom.Handler())
mux.Handle(path, prom.UninstrumentedHandler())
return mux, nil
}
}

func PrometheusCollectorOption(handlerName string) ServeOption {
return func(_ *core.IpfsNode, _ net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
childMux := http.NewServeMux()
mux.HandleFunc("/", prom.InstrumentHandler(handlerName, childMux))
return childMux, nil
}
}

0 comments on commit bb8e231

Please sign in to comment.