Merge pull request #94 from Jiawei0227/leakmemory

Fix leak memory and upgrade csi-lib-util dependency

cmd/livenessprobe/livenessprobe_test.go

@@ -27,6 +27,7 @@ import (
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/mock/gomock"
+	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/kubernetes-csi/csi-test/v4/driver"
 )
 
@@ -83,7 +84,11 @@ func TestProbe(t *testing.T) {
 	outProbe := &csi.ProbeResponse{}
 	idServer.EXPECT().Probe(gomock.Any(), inProbe).Return(outProbe, injectedErr).Times(1)
 
-	hp := &healthProbe{driverName: driverName}
+	metricsManager := metrics.NewCSIMetricsManager("" /* driverName */)
+	hp := &healthProbe{
+		driverName:     driverName,
+		metricsManager: metricsManager,
+	}
 
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		if req.URL.String() == "/healthz" {
@@ -121,7 +126,11 @@ func TestProbe_issue68(t *testing.T) {
 	outProbe := &csi.ProbeResponse{}
 	idServer.EXPECT().Probe(gomock.Any(), inProbe).Return(outProbe, injectedErr).Times(1)
 
-	hp := &healthProbe{driverName: driverName}
+	metricsManager := metrics.NewCSIMetricsManager("" /* driverName */)
+	hp := &healthProbe{
+		driverName:     driverName,
+		metricsManager: metricsManager,
+	}
 
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 		if req.URL.String() == "/healthz" {

cmd/livenessprobe/main.go

@@ -42,14 +42,15 @@ var (
 )
 
 type healthProbe struct {
-	driverName string
+	driverName     string
+	metricsManager metrics.CSIMetricsManager
 }
 
 func (h *healthProbe) checkProbe(w http.ResponseWriter, req *http.Request) {
 	ctx, cancel := context.WithTimeout(req.Context(), *probeTimeout)
 	defer cancel()
 
-	conn, err := acquireConnection(ctx, metrics.NewCSIMetricsManager(""))
+	conn, err := acquireConnection(ctx, h.metricsManager)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))
@@ -114,7 +115,7 @@ func main() {
 	klog.InitFlags(nil)
 	flag.Set("logtostderr", "true")
 	flag.Parse()
-	metricsManager := metrics.NewCSIMetricsManager("")
+	metricsManager := metrics.NewCSIMetricsManager("" /* driverName */)
 	csiConn, err := acquireConnection(context.Background(), metricsManager)
 	if err != nil {
 		// connlib should retry forever so a returned error should mean
@@ -131,16 +132,18 @@ func main() {
 	klog.Infof("CSI driver name: %q", csiDriverName)
 
 	hp := &healthProbe{
-		driverName: csiDriverName,
+		driverName:     csiDriverName,
+		metricsManager: metricsManager,
 	}
 
+	mux := http.NewServeMux()
+	addr := net.JoinHostPort("0.0.0.0", *healthzPort)
+	metricsManager.RegisterToServer(mux, *metricsPath)
 	metricsManager.SetDriverName(csiDriverName)
-	metricsManager.StartMetricsEndpoint(*metricsAddress, *metricsPath)
 
-	addr := net.JoinHostPort("0.0.0.0", *healthzPort)
-	http.HandleFunc("/healthz", hp.checkProbe)
+	mux.HandleFunc("/healthz", hp.checkProbe)
 	klog.Infof("Serving requests to /healthz on: %s", addr)
-	err = http.ListenAndServe(addr, nil)
+	err = http.ListenAndServe(addr, mux)
 	if err != nil {
 		klog.Fatalf("failed to start http server with error: %v", err)
 	}

go.mod

@@ -5,11 +5,8 @@ go 1.15
 require (
 	github.com/container-storage-interface/spec v1.3.0
 	github.com/golang/mock v1.4.3
-	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.7.0
+	github.com/kubernetes-csi/csi-lib-utils v0.9.0
 	github.com/kubernetes-csi/csi-test/v4 v4.0.0-20200806214950-555d70a11a8b
-	github.com/stretchr/testify v1.5.1 // indirect
-	golang.org/x/text v0.3.3 // indirect
 	google.golang.org/grpc v1.29.0
 	k8s.io/klog/v2 v2.3.0
 )