util: remove deprecated grpc metrics

This commit removes the deprecated
grpc related code from cephcsi.

fixes: #4122

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>

internal/cephfs/driver.go

@@ -167,15 +167,10 @@ func (fs *Driver) Run(conf *util.Config) {
 		// passing nil for replication server as cephFS does not support mirroring.
 		RS: nil,
 	}
-	server.Start(conf.Endpoint, conf.HistogramOption, srv, conf.EnableGRPCMetrics)
-	if conf.EnableGRPCMetrics {
-		log.WarningLogMsg("EnableGRPCMetrics is deprecated")
-		go util.StartMetricsServer(conf)
-	}
+	server.Start(conf.Endpoint, srv)
+
 	if conf.EnableProfiling {
-		if !conf.EnableGRPCMetrics {
-			go util.StartMetricsServer(conf)
-		}
+		go util.StartMetricsServer(conf)
 		log.DebugLogMsg("Registering profiling handler")
 		go util.EnableProfiling()
 	}

internal/csi-common/server.go

@@ -19,16 +19,12 @@ package csicommon
 import (
 	"net"
 	"os"
-	"strconv"
-	"strings"
 	"sync"
 
 	"github.com/ceph/ceph-csi/internal/util/log"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/csi-addons/spec/lib/go/replication"
-	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"
 )
@@ -36,7 +32,7 @@ import (
 // NonBlockingGRPCServer defines Non blocking GRPC server interfaces.
 type NonBlockingGRPCServer interface {
 	// Start services at the endpoint
-	Start(endpoint, hstOptions string, srv Servers, metrics bool)
+	Start(endpoint string, srv Servers)
 	// Waits for the service to stop
 	Wait()
 	// Stops the service gracefully
@@ -65,9 +61,9 @@ type nonBlockingGRPCServer struct {
 }
 
 // Start start service on endpoint.
-func (s *nonBlockingGRPCServer) Start(endpoint, hstOptions string, srv Servers, metrics bool) {
+func (s *nonBlockingGRPCServer) Start(endpoint string, srv Servers) {
 	s.wg.Add(1)
-	go s.serve(endpoint, hstOptions, srv, metrics)
+	go s.serve(endpoint, srv)
 }
 
 // Wait blocks until the WaitGroup counter.
@@ -85,7 +81,7 @@ func (s *nonBlockingGRPCServer) ForceStop() {
 	s.server.Stop()
 }
 
-func (s *nonBlockingGRPCServer) serve(endpoint, hstOptions string, srv Servers, metrics bool) {
+func (s *nonBlockingGRPCServer) serve(endpoint string, srv Servers) {
 	proto, addr, err := parseEndpoint(endpoint)
 	if err != nil {
 		klog.Fatal(err.Error())
@@ -103,11 +99,7 @@ func (s *nonBlockingGRPCServer) serve(endpoint, hstOptions string, srv Servers,
 		klog.Fatalf("Failed to listen: %v", err)
 	}
 
-	opts := []grpc.ServerOption{
-		NewMiddlewareServerOption(metrics),
-	}
-
-	server := grpc.NewServer(opts...)
+	server := grpc.NewServer()
 	s.server = server
 
 	if srv.IS != nil {
@@ -124,29 +116,6 @@ func (s *nonBlockingGRPCServer) serve(endpoint, hstOptions string, srv Servers,
 	}
 
 	log.DefaultLog("Listening for connections on address: %#v", listener.Addr())
-	if metrics {
-		ho := strings.Split(hstOptions, ",")
-		const expectedHo = 3
-		if len(ho) != expectedHo {
-			klog.Fatalf("invalid histogram options provided: %v", hstOptions)
-		}
-		start, e := strconv.ParseFloat(ho[0], 32)
-		if e != nil {
-			klog.Fatalf("failed to parse histogram start value: %v", e)
-		}
-		factor, e := strconv.ParseFloat(ho[1], 32)
-		if err != nil {
-			klog.Fatalf("failed to parse histogram factor value: %v", e)
-		}
-		count, e := strconv.Atoi(ho[2])
-		if err != nil {
-			klog.Fatalf("failed to parse histogram count value: %v", e)
-		}
-		buckets := prometheus.ExponentialBuckets(start, factor, count)
-		bktOptions := grpc_prometheus.WithHistogramBuckets(buckets)
-		grpc_prometheus.EnableHandlingTimeHistogram(bktOptions)
-		grpc_prometheus.Register(server)
-	}
 	err = server.Serve(listener)
 	if err != nil {
 		klog.Fatalf("Failed to server: %v", err)

internal/nfs/driver/driver.go

@@ -77,15 +77,9 @@ func (fs *Driver) Run(conf *util.Config) {
 		srv.CS = controller.NewControllerServer(cd)
 	}
 
-	server.Start(conf.Endpoint, conf.HistogramOption, srv, conf.EnableGRPCMetrics)
-	if conf.EnableGRPCMetrics {
-		log.WarningLogMsg("EnableGRPCMetrics is deprecated")
-		go util.StartMetricsServer(conf)
-	}
+	server.Start(conf.Endpoint, srv)
 	if conf.EnableProfiling {
-		if !conf.EnableGRPCMetrics {
-			go util.StartMetricsServer(conf)
-		}
+		go util.StartMetricsServer(conf)
 		log.DebugLogMsg("Registering profiling handler")
 		go util.EnableProfiling()
 	}

internal/rbd/driver/driver.go

@@ -177,11 +177,7 @@ func (r *Driver) Run(conf *util.Config) {
 		CS: r.cs,
 		NS: r.ns,
 	}
-	s.Start(conf.Endpoint, conf.HistogramOption, srv, conf.EnableGRPCMetrics)
-	if conf.EnableGRPCMetrics {
-		log.WarningLogMsg("EnableGRPCMetrics is deprecated")
-		go util.StartMetricsServer(conf)
-	}
+	s.Start(conf.Endpoint, srv)
 
 	r.startProfiling(conf)
 
@@ -241,9 +237,7 @@ func (r *Driver) setupCSIAddonsServer(conf *util.Config) error {
 // starts the required profiling services.
 func (r *Driver) startProfiling(conf *util.Config) {
 	if conf.EnableProfiling {
-		if !conf.EnableGRPCMetrics {
-			go util.StartMetricsServer(conf)
-		}
+		go util.StartMetricsServer(conf)
 		log.DebugLogMsg("Registering profiling handler")
 		go util.EnableProfiling()
 	}

internal/util/util.go

@@ -95,20 +95,17 @@ type Config struct {
 	DomainLabels    string // list of domain labels to read from the node
 
 	// metrics related flags
-	MetricsPath     string // path of prometheus endpoint where metrics will be available
-	HistogramOption string // Histogram option for grpc metrics, should be comma separated value,
-	// ex:= "0.5,2,6" where start=0.5 factor=2, count=6
-	MetricsIP string // TCP port for liveness/ metrics requests
+	MetricsPath string // path of prometheus endpoint where metrics will be available
+	MetricsIP   string // TCP port for liveness/ metrics requests
 
 	// mount option related flags
 	KernelMountOptions string // Comma separated string of mount options accepted by cephfs kernel mounter
 	FuseMountOptions   string // Comma separated string of mount options accepted by ceph-fuse mounter
 
-	PidLimit          int           // PID limit to configure through cgroups")
-	MetricsPort       int           // TCP port for liveness/grpc metrics requests
-	PollTime          time.Duration // time interval in seconds between each poll
-	PoolTimeout       time.Duration // probe timeout in seconds
-	EnableGRPCMetrics bool          // option to enable grpc metrics
+	PidLimit    int           // PID limit to configure through cgroups")
+	MetricsPort int           // TCP port for liveness/grpc metrics requests
+	PollTime    time.Duration // time interval in seconds between each poll
+	PoolTimeout time.Duration // probe timeout in seconds
 
 	EnableProfiling    bool // flag to enable profiling
 	IsControllerServer bool // if set to true start provisioner server