From 2f7fdb29a6412130f2ad08a7bd71ab7ed58deab9 Mon Sep 17 00:00:00 2001 From: changluyi <47097611+changluyi@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:17:02 +0800 Subject: [PATCH] kube-ovn-monitor and kube-ovn-pinger export pprof path (#3657) like /debug/pprof/... Signed-off-by: changluyi --- cmd/ovn_monitor/ovn_monitor.go | 5 +++-- cmd/pinger/pinger.go | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/ovn_monitor/ovn_monitor.go b/cmd/ovn_monitor/ovn_monitor.go index 26cf8be59a9..86fb5ae8629 100644 --- a/cmd/ovn_monitor/ovn_monitor.go +++ b/cmd/ovn_monitor/ovn_monitor.go @@ -31,9 +31,9 @@ func CmdMain() { go exporter.TryClientConnection() } exporter.StartOvnMetrics() - + mux := http.NewServeMux() if config.EnableMetrics { - http.Handle(config.MetricsPath, promhttp.Handler()) + mux.Handle(config.MetricsPath, promhttp.Handler()) klog.Infoln("Listening on", config.ListenAddress) } @@ -57,6 +57,7 @@ func CmdMain() { server := &http.Server{ Addr: addr, ReadHeaderTimeout: 3 * time.Second, + Handler: mux, } util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and server on %s", config.ListenAddress) } diff --git a/cmd/pinger/pinger.go b/cmd/pinger/pinger.go index d754dfe0357..a9e72c38ab6 100644 --- a/cmd/pinger/pinger.go +++ b/cmd/pinger/pinger.go @@ -25,7 +25,8 @@ func CmdMain() { util.LogFatalAndExit(err, "failed to parse config") } if config.Mode == "server" && config.EnableMetrics { - http.Handle("/metrics", promhttp.Handler()) + mux := http.NewServeMux() + mux.Handle("/metrics", promhttp.Handler()) go func() { // conform to Gosec G114 @@ -33,6 +34,7 @@ func CmdMain() { server := &http.Server{ Addr: fmt.Sprintf("0.0.0.0:%d", config.Port), ReadHeaderTimeout: 3 * time.Second, + Handler: mux, } util.LogFatalAndExit(server.ListenAndServe(), "failed to listen and serve on %s", server.Addr) }()