metrics: provide an empty server when enablemetrics is false

Signed-off-by: zhaocongqi <[email protected]>
kubeovn · Dec 30, 2024 · 1c2877e · 1c2877e
1 parent 56b29be
commit 1c2877e
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 17 deletions.
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
@@ -87,12 +87,33 @@ func CmdMain() {
 		if config.EnableMetrics {
 			metrics.InitKlogMetrics()
 			metrics.InitClientGoMetrics()
+			addr := util.JoinHostPort(metricsAddr, config.PprofPort)
+			if err := metrics.Run(ctx, config.KubeRestConfig, addr, config.SecureServing, servePprofInMetricsServer); err != nil {
+				util.LogFatalAndExit(err, "failed to run metrics server")
+			}
+		} else {
+			klog.Info("metrics server is disabled")
+			listerner, err := net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP(metricsAddr), Port: int(config.PprofPort)})
+			if err != nil {
+				util.LogFatalAndExit(err, "failed to listen on %s", util.JoinHostPort(metricsAddr, config.PprofPort))
+			}
+			svr := manager.Server{
+				Name: "metrics",
+				Server: &http.Server{
+					Handler:           http.NewServeMux(),
+					MaxHeaderBytes:    1 << 20,
+					IdleTimeout:       90 * time.Second,
+					ReadHeaderTimeout: 32 * time.Second,
+				},
+				Listener: listerner,
+			}
+			go func() {
+				if err = svr.Start(ctx); err != nil {
+					util.LogFatalAndExit(err, "failed to run metrics server")
+				}
+			}()
 		}
 
-		addr := util.JoinHostPort(metricsAddr, config.PprofPort)
-		if err := metrics.Run(ctx, config.KubeRestConfig, addr, config.SecureServing, servePprofInMetricsServer); err != nil {
-			util.LogFatalAndExit(err, "failed to run metrics server")
-		}
 		<-ctx.Done()
 	}()
 

diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go
@@ -149,12 +149,33 @@ func main() {
 	if config.EnableMetrics {
 		daemon.InitMetrics()
 		metrics.InitKlogMetrics()
+		listenAddr := util.JoinHostPort(addr, config.PprofPort)
+		if err = metrics.Run(ctx, nil, listenAddr, config.SecureServing, servePprofInMetricsServer); err != nil {
+			util.LogFatalAndExit(err, "failed to run metrics server")
+		}
+	} else {
+		klog.Info("metrics server is disabled")
+		listerner, err := net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP(addr), Port: int(config.PprofPort)})
+		if err != nil {
+			util.LogFatalAndExit(err, "failed to listen on %s", util.JoinHostPort(addr, config.PprofPort))
+		}
+		svr := manager.Server{
+			Name: "metrics",
+			Server: &http.Server{
+				Handler:           http.NewServeMux(),
+				MaxHeaderBytes:    1 << 20,
+				IdleTimeout:       90 * time.Second,
+				ReadHeaderTimeout: 32 * time.Second,
+			},
+			Listener: listerner,
+		}
+		go func() {
+			if err = svr.Start(ctx); err != nil {
+				util.LogFatalAndExit(err, "failed to run metrics server")
+			}
+		}()
 	}
 
-	listenAddr := util.JoinHostPort(addr, config.PprofPort)
-	if err = metrics.Run(ctx, nil, listenAddr, config.SecureServing, servePprofInMetricsServer); err != nil {
-		util.LogFatalAndExit(err, "failed to run metrics server")
-	}
 	<-stopCh
 }
 

diff --git a/cmd/ovn_monitor/ovn_monitor.go b/cmd/ovn_monitor/ovn_monitor.go
@@ -1,12 +1,16 @@
 package ovn_monitor
 
 import (
+	"net"
+	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	"k8s.io/klog/v2"
 	"kernel.org/pub/linux/libs/security/libcap/cap"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
 	"github.com/kubeovn/kube-ovn/pkg/metrics"
@@ -47,9 +51,31 @@ func CmdMain() {
 			go exporter.TryClientConnection()
 		}
 		exporter.StartOvnMetrics()
+		if err = metrics.Run(ctx, nil, addr, config.SecureServing, false); err != nil {
+			util.LogFatalAndExit(err, "failed to run metrics server")
+		}
+	} else {
+		klog.Info("metrics server is disabled")
+		listerner, err := net.ListenTCP("tcp", &net.TCPAddr{IP: net.ParseIP(addr), Port: int(port)})
+		if err != nil {
+			util.LogFatalAndExit(err, "failed to listen on %s", util.JoinHostPort(addr, port))
+		}
+		svr := manager.Server{
+			Name: "metrics",
+			Server: &http.Server{
+				Handler:           http.NewServeMux(),
+				MaxHeaderBytes:    1 << 20,
+				IdleTimeout:       90 * time.Second,
+				ReadHeaderTimeout: 32 * time.Second,
+			},
+			Listener: listerner,
+		}
+		go func() {
+			if err = svr.Start(ctx); err != nil {
+				util.LogFatalAndExit(err, "failed to run metrics server")
+			}
+		}()
 	}
-	if err = metrics.Run(ctx, nil, addr, config.SecureServing, false); err != nil {
-		util.LogFatalAndExit(err, "failed to run metrics server")
-	}
+
 	<-ctx.Done()
 }
diff --git a/cmd/pinger/pinger.go b/cmd/pinger/pinger.go
@@ -34,9 +34,9 @@ func CmdMain() {
 			if config.EnableMetrics {
 				pinger.InitPingerMetrics()
 				metrics.InitKlogMetrics()
-			}
-			if err := metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.Port), false, false); err != nil {
-				util.LogFatalAndExit(err, "failed to run metrics server")
+				if err := metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.Port), false, false); err != nil {
+					util.LogFatalAndExit(err, "failed to run metrics server")
+				}
 			}
 			<-ctx.Done()
 		}()

diff --git a/cmd/speaker/speaker.go b/cmd/speaker/speaker.go
@@ -30,9 +30,9 @@ func CmdMain() {
 	go func() {
 		if config.EnableMetrics {
 			metrics.InitKlogMetrics()
-		}
-		if err = metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.PprofPort), false, false); err != nil {
-			util.LogFatalAndExit(err, "failed to run metrics server")
+			if err = metrics.Run(ctx, nil, util.JoinHostPort("0.0.0.0", config.PprofPort), false, false); err != nil {
+				util.LogFatalAndExit(err, "failed to run metrics server")
+			}
 		}
 		<-ctx.Done()
 	}()