consolidate utility endpoints (#164)

* consolidate utility endpoints

profiling & heartbeat can be served together as utilities

* cleanup

cmd/start/main.go

@@ -108,13 +108,9 @@ func executeStart(cmd *cobra.Command, args []string) error {
 	InitializeTriggers()
 	RunBgWorkers()
 
-	// Start heartbeat endpoint.
-	log.Info("launching heartbeat service...")
-	go frontend.Heartbeat(utils.InstanceConfig.ListenPort)
-
-	// Start profiling endpoint.
-	log.Info("launching profiling service...")
-	go frontend.Profile(utils.InstanceConfig.ListenPort)
+	// Start utility endpoints.
+	log.Info("launching utility service...")
+	go frontend.Utilities(utils.InstanceConfig.ListenPort)
 
 	log.Info("enabling query access...")
 	atomic.StoreUint32(&frontend.Queryable, 1)

frontend/heartbeat.go → frontend/utilities.go

@@ -3,6 +3,7 @@ package frontend
 import (
 	"encoding/json"
 	"net/http"
+	"net/http/pprof"
 	"sync/atomic"
 	"time"
 
@@ -23,12 +24,25 @@ func init() {
 	Queryable = uint32(0)
 }
 
-func Heartbeat(address string) {
-	http.HandleFunc("/heartbeat", handler)
+func Utilities(address string) {
+	// heartbeat
+	http.HandleFunc("/heartbeat", heartbeat)
+
+	// profiling
+	http.HandleFunc("/pprof/", pprof.Index)
+	http.HandleFunc("/pprof/cmdline", pprof.Cmdline)
+	http.HandleFunc("/pprof/profile", pprof.Profile)
+	http.HandleFunc("/pprof/symbol", pprof.Symbol)
+	http.HandleFunc("/pprof/trace", pprof.Trace)
+	http.Handle("/pprof/heap", pprof.Handler("heap"))
+	http.Handle("/pprof/goroutine", pprof.Handler("goroutine"))
+	http.Handle("/pprof/threadcreate", pprof.Handler("threadcreate"))
+	http.Handle("/pprof/block", pprof.Handler("block"))
+
 	http.ListenAndServe(address, nil)
 }
 
-func handler(rw http.ResponseWriter, r *http.Request) {
+func heartbeat(rw http.ResponseWriter, r *http.Request) {
 	uptime := time.Since(utils.InstanceConfig.StartTime).String()
 	queryable := atomic.LoadUint32(&Queryable)
 	if queryable > 0 {

frontend/heartbeat_test.go → frontend/utilities_test.go

@@ -38,7 +38,7 @@ func (s *HeartbeatTestSuite) TestHandler(c *C) {
 		switch key {
 		case "Success":
 			atomic.StoreUint32(&Queryable, uint32(1))
-			handler(val.Recorder, nil)
+			heartbeat(val.Recorder, nil)
 			hm := HeartbeatMessage{}
 			err := json.NewDecoder(val.Recorder.Body).Decode(&hm)
 			if err != nil {
@@ -51,7 +51,7 @@ func (s *HeartbeatTestSuite) TestHandler(c *C) {
 			c.Assert(val.Recorder.Code, Equals, http.StatusOK)
 		case "Failure":
 			atomic.StoreUint32(&Queryable, uint32(0))
-			handler(val.Recorder, nil)
+			heartbeat(val.Recorder, nil)
 			hm := HeartbeatMessage{}
 			err := json.NewDecoder(val.Recorder.Body).Decode(&hm)
 			if err != nil {