Server metrics on the main http server instance

api/routes.go

@@ -4,8 +4,9 @@ import (
 	"github.com/lbryio/lbrytv/app/player"
 	"github.com/lbryio/lbrytv/app/proxy"
 	"github.com/lbryio/lbrytv/app/publish"
-	"github.com/lbryio/lbrytv/app/users"
 	"github.com/lbryio/lbrytv/app/status"
+	"github.com/lbryio/lbrytv/app/users"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"github.com/gorilla/mux"
 )
@@ -20,6 +21,7 @@ func InstallRoutes(proxyService *proxy.ProxyService, r *mux.Router) {
 	}
 
 	r.HandleFunc("/", Index)
+	r.Handle("/internal/metrics", promhttp.Handler())
 
 	v1Router := r.PathPrefix("/api/v1").Subrouter()
 	v1Router.HandleFunc("/proxy", proxyHandler.HandleOptions).Methods("OPTIONS")

cmd/serve.go

@@ -8,7 +8,6 @@ import (
 	"github.com/lbryio/lbrytv/app/proxy"
 	"github.com/lbryio/lbrytv/app/router"
 	"github.com/lbryio/lbrytv/config"
-	"github.com/lbryio/lbrytv/internal/metrics"
 	"github.com/lbryio/lbrytv/server"
 
 	"github.com/spf13/cobra"
@@ -27,9 +26,6 @@ var rootCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		ms := metrics.NewServer(config.MetricsAddress(), config.MetricsPath())
-		ms.Serve()
-
 		// ServeUntilShutdown is blocking, should be last
 		s.ServeUntilShutdown()
 	},

internal/metrics/metrics.go

@@ -1,37 +1,10 @@
 package metrics
 
 import (
-	"net/http"
-	"sync"
-
-	"github.com/lbryio/lbrytv/internal/monitor"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
-var once sync.Once
-
-type Server struct {
-	monitor.ModuleLogger
-
-	Address string
-	Path    string
-}
-
-func NewServer(address string, path string) *Server {
-	return &Server{monitor.NewModuleLogger("metrics"), address, path}
-}
-
-func (s *Server) Serve() {
-	go func() {
-		http.Handle(s.Path, promhttp.Handler())
-		http.ListenAndServe(s.Address, nil)
-	}()
-	s.Log().Infof("metrics server listening on %v%v", s.Address, s.Path)
-}
-
 const (
 	nsPlayer = "player"
 	nsIAPI   = "iapi"

lbrytv.yml

@@ -12,9 +12,6 @@ Database:
   DBName: lbrytv
   Options: sslmode=disable
 
-MetricsAddress: :2112
-MetricsPath: /metrics
-
 PublishSourceDir: /storage/published
 BlobFilesDir: /storage/lbrynet/blobfiles