fix: address comments

Author: sambuc

cmd/csi-rclone-plugin/main.go

@@ -102,7 +102,7 @@ func handleNode() {
 	if err != nil {
 		panic(err)
 	}
-	ns.AppendMetrics(&meters)
+	meters = append(meters, ns.Metrics()...)
 	d.WithNodeServer(ns)
 	err = d.Run()
 	if err != nil {
@@ -113,7 +113,7 @@ func handleNode() {
 func handleController() {
 	d := rclone.NewDriver(nodeID, endpoint)
 	cs := rclone.NewControllerServer(d.CSIDriver)
-	cs.AppendMetrics(&meters)
+	meters = append(meters, cs.Metrics()...)
 	d.WithControllerServer(cs)
 	err := d.Run()
 	if err != nil {

pkg/rclone/driver.go

@@ -96,20 +96,27 @@ func NewControllerServer(csiDriver *csicommon.CSIDriver) *controllerServer {
 	}
 }
 
-func (ns *nodeServer) AppendMetrics(meters *[]metrics.Observable) {
+func (ns *nodeServer) Metrics() []metrics.Observable {
+	var meters []metrics.Observable
+
 	// What should we meter?
-	return
+
+	return meters
 }
 
-func (cs *controllerServer) AppendMetrics(meters *[]metrics.Observable) {
+func (cs *controllerServer) Metrics() []metrics.Observable {
+	var meters []metrics.Observable
+
 	meter := prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "rclone_active_volume_count",
+		Name: "csi_rclone_active_volume_count",
 		Help: "Number of active (Mounted) volumes.",
 	})
-	*meters = append(*meters,
+	meters = append(meters,
 		func() { meter.Set(float64(len(cs.active_volumes))) },
 	)
 	prometheus.MustRegister(meter)
+
+	return meters
 }
 
 func (d *Driver) WithNodeServer(ns *nodeServer) *Driver {