add scrape, process, Go, restclient metrics

Author: huww98

pkg/metric/metric.go

@@ -6,10 +6,13 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/go-logr/logr"
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
 	"github.com/prometheus/client_golang/prometheus"
 	versioncollector "github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"k8s.io/component-base/metrics/legacyregistry"
+	_ "k8s.io/component-base/metrics/prometheus/restclient"
 	"k8s.io/klog/v2"
 )
 
@@ -49,18 +52,35 @@ func NewMetricHandler(driverNames []string, serviceType utils.ServiceType) *Hand
 	return newHandler()
 }
 
+type logger struct {
+	logr.Logger
+}
+
+func (l logger) Println(v ...interface{}) {
+	if len(v) == 2 {
+		msg, ok1 := v[0].(string)
+		err, ok2 := v[1].(error)
+		if ok1 && ok2 {
+			l.Logger.Error(err, msg)
+			return
+		}
+	}
+	l.Logger.Error(nil, "failed to gather metrics", "error", v)
+}
+
 func (h *Handler) innerHandler() (http.Handler, error) {
 	r := prometheus.NewRegistry()
-	r.MustRegister(versioncollector.NewCollector("alibaba_cloud_csi_driver"))
-	if err := r.Register(csiCollectorInstance); err != nil {
-		return nil, fmt.Errorf("Couldn't register node collector: %s", err)
-	}
-	handler := promhttp.HandlerFor(
-		r,
+	r.MustRegister(
+		versioncollector.NewCollector("alibaba_cloud_csi_driver"),
+		csiCollectorInstance)
+	handler := promhttp.InstrumentMetricHandler(r, promhttp.HandlerFor(
+		prometheus.Gatherers{r, legacyregistry.DefaultGatherer},
 		promhttp.HandlerOpts{
 			ErrorHandling: promhttp.ContinueOnError,
+			ErrorLog:      logger{klog.Background()},
+			Registry:      r,
 		},
-	)
+	))
 	return handler, nil
 }
 

vendor/k8s.io/component-base/metrics/prometheus/restclient/metrics.go

@@ -738,6 +738,7 @@ k8s.io/component-base/logs/klogflags
 k8s.io/component-base/metrics
 k8s.io/component-base/metrics/legacyregistry
 k8s.io/component-base/metrics/prometheus/feature
+k8s.io/component-base/metrics/prometheus/restclient
 k8s.io/component-base/metrics/prometheusextension
 k8s.io/component-base/version
 # k8s.io/klog/v2 v2.120.1