Skip to content

Commit

Permalink
embed: enable debug endpoint if Debug is set and add net.trace events
Browse files Browse the repository at this point in the history
/debug/ was only being enabled for Pprof.
  • Loading branch information
Anthony Romano committed Feb 27, 2017
1 parent 298d588 commit c4f1e64
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 18 deletions.
5 changes: 4 additions & 1 deletion embed/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,12 @@ func startClientListeners(cfg *Config) (sctxs map[string]*serveCtx, err error) {
sctx.userHandlers[k] = cfg.UserHandlers[k]
}
sctx.serviceRegister = cfg.ServiceRegister
if cfg.EnablePprof {
if cfg.EnablePprof || cfg.Debug {
sctx.registerPprof()
}
if cfg.Debug {
sctx.registerTrace()
}
sctxs[u.Host] = sctx
}
return sctxs, nil
Expand Down
43 changes: 26 additions & 17 deletions embed/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/cockroachdb/cmux"
gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
"golang.org/x/net/context"
"golang.org/x/net/trace"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
Expand Down Expand Up @@ -199,22 +200,30 @@ func (sctx *serveCtx) createMux(gwmux *gw.ServeMux, handler http.Handler) *http.
return httpmux
}

func (sctx *serveCtx) registerPprof() {
f := func(s string, h http.Handler) {
if sctx.userHandlers[s] != nil {
plog.Warningf("path %s already registered by user handler", s)
return
}
sctx.userHandlers[s] = h
func (sctx *serveCtx) registerUserHandler(s string, h http.Handler) {
if sctx.userHandlers[s] != nil {
plog.Warningf("path %s already registered by user handler", s)
return
}
f(pprofPrefix+"/", http.HandlerFunc(pprof.Index))
f(pprofPrefix+"/profile", http.HandlerFunc(pprof.Profile))
f(pprofPrefix+"/symbol", http.HandlerFunc(pprof.Symbol))
f(pprofPrefix+"/cmdline", http.HandlerFunc(pprof.Cmdline))
f(pprofPrefix+"/trace", http.HandlerFunc(pprof.Trace))

f(pprofPrefix+"/heap", pprof.Handler("heap"))
f(pprofPrefix+"/goroutine", pprof.Handler("goroutine"))
f(pprofPrefix+"/threadcreate", pprof.Handler("threadcreate"))
f(pprofPrefix+"/block", pprof.Handler("block"))
sctx.userHandlers[s] = h
}

func (sctx *serveCtx) registerPprof() {
sctx.registerUserHandler(pprofPrefix+"/", http.HandlerFunc(pprof.Index))
sctx.registerUserHandler(pprofPrefix+"/profile", http.HandlerFunc(pprof.Profile))
sctx.registerUserHandler(pprofPrefix+"/symbol", http.HandlerFunc(pprof.Symbol))
sctx.registerUserHandler(pprofPrefix+"/cmdline", http.HandlerFunc(pprof.Cmdline))
sctx.registerUserHandler(pprofPrefix+"/trace", http.HandlerFunc(pprof.Trace))

sctx.registerUserHandler(pprofPrefix+"/heap", pprof.Handler("heap"))
sctx.registerUserHandler(pprofPrefix+"/goroutine", pprof.Handler("goroutine"))
sctx.registerUserHandler(pprofPrefix+"/threadcreate", pprof.Handler("threadcreate"))
sctx.registerUserHandler(pprofPrefix+"/block", pprof.Handler("block"))
}

func (sctx *serveCtx) registerTrace() {
reqf := func(w http.ResponseWriter, r *http.Request) { trace.Render(w, r, true) }
sctx.registerUserHandler("/debug/requests", http.HandlerFunc(reqf))
evf := func(w http.ResponseWriter, r *http.Request) { trace.RenderEvents(w, r, true) }
sctx.registerUserHandler("/debug/events", http.HandlerFunc(evf))
}

0 comments on commit c4f1e64

Please sign in to comment.