[ISSUE #127] 合并prometheus类型的监控插件

.gitignore

@@ -6,12 +6,11 @@ backup/
 polaris/log/*
 
 angevil_test/
-test/other/other_test_suit.go
 *.log
 
 /vendor/
 
 .vscode/
 
 style_tool/
-goimports-reviser
+goimports-reviser

api/config.go

@@ -336,7 +336,12 @@ func getSelfIP(cfg config.Configuration) {
 
 	conn, _ := net.Dial("tcp", address[0])
 	if conn != nil {
-		cfg.GetGlobal().GetAPI().SetBindIP(conn.LocalAddr().String())
+		localAddr := conn.LocalAddr().String()
+		colonIdx := strings.LastIndex(localAddr, ":")
+		if colonIdx > 0 {
+			localAddr = localAddr[:colonIdx]
+		}
+		cfg.GetGlobal().GetAPI().SetBindIP(localAddr)
 		_ = conn.Close()
 	}
 }

examples/circuitbreaker/consumer/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/circuitbreaker/provider/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
-        metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s
+        type: pull
+        metricPort: 0

examples/quickstart/consumer/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/quickstart/provider/polaris.yaml

@@ -9,7 +9,6 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s
+

examples/ratelimit/consumer/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/ratelimit/provider/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/route/dynamic/consumer/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/route/dynamic/provider/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/route/nearby/consumer/polaris.yaml

@@ -16,10 +16,8 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s
 consumer:
   serviceRouter:
     # 服务路由链

examples/route/nearby/provider/polaris.yaml

@@ -16,7 +16,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

examples/watchinstance/polaris.yaml

@@ -9,7 +9,5 @@ global:
       # - pushgateway
     plugin:
       prometheus:
+        type: pull
         metricPort: 0
-      # pushgateway:
-      #   address: 127.0.0.1:9091
-      #   pushInterval: 10s

pkg/config/default.go

@@ -242,7 +242,9 @@ const (
 	// DefaultServiceRouteReporter .
 	DefaultServiceRouteReporter string = "serviceRoute"
 	// DefaultStatReportEnabled .
-	DefaultStatReportEnabled bool = false
+	DefaultStatReportEnabled bool = true
+	// DefaultMetricsChain .
+	DefaultMetricsChain string = "prometheus"
 )
 
 const (

pkg/config/statreporter.go

@@ -72,7 +72,7 @@ func (s *StatReporterConfigImpl) SetDefault() {
 		s.Enable = &enable
 	}
 	if len(s.Chain) == 0 {
-		s.Chain = []string{}
+		s.Chain = []string{DefaultMetricsChain}
 	}
 	s.Plugin.SetDefault(common.TypeStatReporter)
 }

pkg/plugin/register/plugins.go

@@ -43,7 +43,6 @@ import (
 	_ "github.com/polarismesh/polaris-go/plugin/location"
 	_ "github.com/polarismesh/polaris-go/plugin/logger/zaplog"
 	_ "github.com/polarismesh/polaris-go/plugin/metrics/prometheus"
-	_ "github.com/polarismesh/polaris-go/plugin/metrics/pushgateway"
 	_ "github.com/polarismesh/polaris-go/plugin/ratelimiter/reject"
 	_ "github.com/polarismesh/polaris-go/plugin/ratelimiter/unirate"
 	_ "github.com/polarismesh/polaris-go/plugin/serverconnector/grpc"

plugin/metrics/prometheus/config.go

@@ -34,9 +34,12 @@ const (
 
 // Config prometheus 的配置
 type Config struct {
-	IP      string `yaml:"metricHost"`
-	PortStr string `yaml:"metricPort"`
-	Port    int    `yaml:"-"`
+	Type     string        `yaml:"type"`
+	IP       string        `yaml:"metricHost"`
+	PortStr  string        `yaml:"metricPort"`
+	port     int           `yaml:"-"`
+	Interval time.Duration `yaml:"interval"`
+	Address  string        `yaml:"address"`
 }
 
 // Verify verify config
@@ -46,11 +49,16 @@ func (c *Config) Verify() error {
 
 // SetDefault Setting defaults
 func (c *Config) SetDefault() {
+	if c.Type == "" {
+		c.Type = "pull"
+	}
 	if c.PortStr == "" {
-		c.Port = defaultMetricPort
+		c.port = defaultMetricPort
 		return
 	}
-
+	if c.Interval == 0 {
+		c.Interval = 15 * time.Second
+	}
 	port, _ := strconv.ParseInt(c.PortStr, 10, 64)
-	c.Port = int(port)
+	c.port = int(port)
 }

plugin/metrics/prometheus/model.go

@@ -18,9 +18,14 @@ package prometheus
 
 import (
 	"fmt"
+	"net/http"
 	"strings"
+	"sync"
+
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/polarismesh/polaris-go/pkg/model"
+	"github.com/polarismesh/polaris-go/plugin/metrics/prometheus/addons"
 )
 
 // MetricsType 指标类型，对应 Prometheus 提供的 Collector 类型.
@@ -231,6 +236,9 @@ var (
 		// 主调方相关信息
 		CallerLabels: func(args interface{}) string {
 			val := args.(*model.ServiceCallResult)
+			if val.SourceService == nil || len(val.SourceService.Metadata) == 0 {
+				return ""
+			}
 			labels := val.SourceService.Metadata
 			var ret []string
 			for k, v := range labels {
@@ -323,3 +331,76 @@ func formatLabelsToStr(arguments []model.Argument) string {
 
 	return strings.Join(s, "|")
 }
+
+func buildMetrics() ([]prometheus.Collector, map[string]prometheus.Collector) {
+	var (
+		metricVecCaches = map[string]prometheus.Collector{}
+		collectors      = make([]prometheus.Collector, 0, len(metrcisDesces))
+	)
+
+	for _, desc := range metrcisDesces {
+		var collector prometheus.Collector
+		switch desc.MetricType {
+		case TypeForGaugeVec:
+			collector = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+				Name: desc.Name,
+				Help: desc.Help,
+			}, desc.LabelNames)
+		case TypeForCounterVec:
+			collector = prometheus.NewCounterVec(prometheus.CounterOpts{
+				Name: desc.Name,
+				Help: desc.Help,
+			}, desc.LabelNames)
+		case TypeForMaxGaugeVec:
+			collector = addons.NewMaxGaugeVec(prometheus.GaugeOpts{
+				Name: desc.Name,
+				Help: desc.Help,
+			}, desc.LabelNames)
+		case TypeForHistogramVec:
+			collector = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+				Name: desc.Name,
+				Help: desc.Help,
+			}, desc.LabelNames)
+		}
+		collectors = append(collectors, collector)
+		metricVecCaches[desc.Name] = collector
+	}
+	return collectors, metricVecCaches
+}
+
+type metricsHttpHandler struct {
+	promeHttpHandler http.Handler
+	lock             *sync.RWMutex
+}
+
+// ServeHTTP 提供 prometheus http 服务.
+func (p *metricsHttpHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+	p.promeHttpHandler.ServeHTTP(writer, request)
+}
+
+func convertInsGaugeToLabels(val *model.ServiceCallResult, bindIP string) map[string]string {
+	labels := make(map[string]string)
+	for label, supplier := range InstanceGaugeLabelOrder {
+		labels[label] = supplier(val)
+	}
+	labels[CallerIP] = bindIP
+	return labels
+}
+
+func convertRateLimitGaugeToLabels(val *model.RateLimitGauge) map[string]string {
+	labels := make(map[string]string)
+	for label, supplier := range RateLimitGaugeLabelOrder {
+		labels[label] = supplier(val)
+	}
+	return labels
+}
+
+func convertCircuitBreakGaugeToLabels(val *model.CircuitBreakGauge) map[string]string {
+	labels := make(map[string]string)
+	for label, supplier := range CircuitBreakerGaugeLabelOrder {
+		labels[label] = supplier(val)
+	}
+	return labels
+}