blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-30 14:27:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/count' into allmerge

Browse Source 
# Conflicts:
#	go.mod
#	go.sum
This commit is contained in:
withchao 2024-07-10 15:40:02 +08:00
commit 98b3846d38
9 changed files with 581 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.sum
View File

@ -262,8 +262,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y= github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI= github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
github.com/openimsdk/protocol v0.0.69-alpha.27 h1:0Ctpu9VBXVCkKno6vVNBgUTyo9W9bG7SZuAhQr/4H8Y= github.com/openimsdk/protocol v0.0.69-alpha.24 h1:TYcNJeWOTuE40UQ54eNPdDdy0KTOh9rAOgax8lCyhDc=
github.com/openimsdk/protocol v0.0.69-alpha.27/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8= github.com/openimsdk/protocol v0.0.69-alpha.24/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
github.com/openimsdk/tools v0.0.49-alpha.45 h1:XIzCoef4myybOiIlGuRY9FTtGBisZFC4Uy4PhG0ZWQ0= github.com/openimsdk/tools v0.0.49-alpha.45 h1:XIzCoef4myybOiIlGuRY9FTtGBisZFC4Uy4PhG0ZWQ0=
github.com/openimsdk/tools v0.0.49-alpha.45/go.mod h1:HtSRjPTL8PsuZ+PhR5noqzrYBF0sdwW3/O/sWVucWg8= github.com/openimsdk/tools v0.0.49-alpha.45/go.mod h1:HtSRjPTL8PsuZ+PhR5noqzrYBF0sdwW3/O/sWVucWg8=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=

9
internal/api/init.go
View File

@ -29,7 +29,6 @@ import (
"time" "time"
kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
ginprom "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/discovery"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
@ -72,10 +71,10 @@ func Start(ctx context.Context, index int, config *Config) error {
netDone <- struct{}{} netDone <- struct{}{}
return return
} }
p := ginprom.NewPrometheus("app", prommetrics.GetGinCusMetrics("Api")) srv := http.NewServeMux()
p.SetListenAddress(fmt.Sprintf(":%d", prometheusPort)) srv.Handle(prommetrics.ApiPath, prommetrics.ApiHandler())
if err = p.Use(router); err != nil && err != http.ErrServerClosed { if err := http.ListenAndServe(fmt.Sprintf(":%d", prometheusPort), srv); err != nil && err != http.ErrServerClosed {
netErr = errs.WrapMsg(err, fmt.Sprintf("prometheus start err: %d", prometheusPort)) netErr = errs.WrapMsg(err, fmt.Sprintf("api prometheus start err: %d", prometheusPort))
netDone <- struct{}{} netDone <- struct{}{}
} }
}() }()

23
internal/api/router.go
View File

@ -2,12 +2,10 @@ package api
import ( import (
"fmt" "fmt"
"net/http"
"strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs" "github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
"github.com/openimsdk/protocol/constant" "github.com/openimsdk/protocol/constant"
@ -17,8 +15,25 @@ import (
"github.com/openimsdk/tools/mw" "github.com/openimsdk/tools/mw"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"net/http"
"strings"
) )
func prommetricsGin() gin.HandlerFunc {
return func(c *gin.Context) {
c.Next()
path := c.FullPath()
if c.Writer.Status() == http.StatusNotFound {
prommetrics.HttpCall("<404>", c.Request.Method, c.Writer.Status())
} else {
prommetrics.HttpCall(path, c.Request.Method, c.Writer.Status())
}
if resp := apiresp.GetGinApiResponse(c); resp != nil {
prommetrics.APICall(path, c.Request.Method, resp.ErrCode)
}
}
}
func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.Engine { func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.Engine {
disCov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), disCov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin"))) grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
@ -37,7 +52,7 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
authRpc := rpcclient.NewAuth(disCov, config.Share.RpcRegisterName.Auth) authRpc := rpcclient.NewAuth(disCov, config.Share.RpcRegisterName.Auth)
thirdRpc := rpcclient.NewThird(disCov, config.Share.RpcRegisterName.Third, config.API.Prometheus.GrafanaURL) thirdRpc := rpcclient.NewThird(disCov, config.Share.RpcRegisterName.Third, config.API.Prometheus.GrafanaURL)
r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(authRpc)) r.Use(prommetricsGin(), gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(authRpc))
u := NewUserApi(*userRpc) u := NewUserApi(*userRpc)
m := NewMessageApi(messageRpc, userRpc, config.Share.IMAdminUserID) m := NewMessageApi(messageRpc, userRpc, config.Share.IMAdminUserID)
userRouterGroup := r.Group("/user") userRouterGroup := r.Group("/user")

855
pkg/common/ginprometheus/ginprometheus.go
View File

@ -14,430 +14,431 @@
package ginprometheus package ginprometheus
import ( //
"bytes" //import (
"fmt" // "bytes"
"io" // "fmt"
"net/http" // "io"
"os" // "net/http"
"strconv" // "os"
"time" // "strconv"
// "time"
"github.com/gin-gonic/gin" //
"github.com/prometheus/client_golang/prometheus" // "github.com/gin-gonic/gin"
"github.com/prometheus/client_golang/prometheus/promhttp" // "github.com/prometheus/client_golang/prometheus"
) // "github.com/prometheus/client_golang/prometheus/promhttp"
//)
var defaultMetricPath = "/metrics" //
//var defaultMetricPath = "/metrics"
// counter, counter_vec, gauge, gauge_vec, //
// histogram, histogram_vec, summary, summary_vec. //// counter, counter_vec, gauge, gauge_vec,
var ( //// histogram, histogram_vec, summary, summary_vec.
reqCounter = &Metric{ //var (
ID: "reqCnt", // reqCounter = &Metric{
Name: "requests_total", // ID: "reqCnt",
Description: "How many HTTP requests processed, partitioned by status code and HTTP method.", // Name: "requests_total",
Type: "counter_vec", // Description: "How many HTTP requests processed, partitioned by status code and HTTP method.",
Args: []string{"code", "method", "handler", "host", "url"}} // Type: "counter_vec",
// Args: []string{"code", "method", "handler", "host", "url"}}
reqDuration = &Metric{ //
ID: "reqDur", // reqDuration = &Metric{
Name: "request_duration_seconds", // ID: "reqDur",
Description: "The HTTP request latencies in seconds.", // Name: "request_duration_seconds",
Type: "histogram_vec", // Description: "The HTTP request latencies in seconds.",
Args: []string{"code", "method", "url"}, // Type: "histogram_vec",
} // Args: []string{"code", "method", "url"},
// }
resSize = &Metric{ //
ID: "resSz", // resSize = &Metric{
Name: "response_size_bytes", // ID: "resSz",
Description: "The HTTP response sizes in bytes.", // Name: "response_size_bytes",
Type: "summary"} // Description: "The HTTP response sizes in bytes.",
// Type: "summary"}
reqSize = &Metric{ //
ID: "reqSz", // reqSize = &Metric{
Name: "request_size_bytes", // ID: "reqSz",
Description: "The HTTP request sizes in bytes.", // Name: "request_size_bytes",
Type: "summary"} // Description: "The HTTP request sizes in bytes.",
// Type: "summary"}
standardMetrics = []*Metric{ //
reqCounter, // standardMetrics = []*Metric{
reqDuration, // reqCounter,
resSize, // reqDuration,
reqSize, // resSize,
} // reqSize,
) // }
//)
/* //
RequestCounterURLLabelMappingFn is a function which can be supplied to the middleware to control ///*
the cardinality of the request counter's "url" label, which might be required in some contexts. //RequestCounterURLLabelMappingFn is a function which can be supplied to the middleware to control
For instance, if for a "/customer/:name" route you don't want to generate a time series for every //the cardinality of the request counter's "url" label, which might be required in some contexts.
possible customer name, you could use this function: //For instance, if for a "/customer/:name" route you don't want to generate a time series for every
//possible customer name, you could use this function:
func(c *gin.Context) string { //
url := c.Request.URL.Path // func(c *gin.Context) string {
for _, p := range c.Params { // url := c.Request.URL.Path
if p.Key == "name" { // for _, p := range c.Params {
url = strings.Replace(url, p.Value, ":name", 1) // if p.Key == "name" {
break // url = strings.Replace(url, p.Value, ":name", 1)
} // break
} // }
return url // }
} // return url
// }
which would map "/customer/alice" and "/customer/bob" to their template "/customer/:name". //
*/ //which would map "/customer/alice" and "/customer/bob" to their template "/customer/:name".
type RequestCounterURLLabelMappingFn func(c *gin.Context) string //*/
//type RequestCounterURLLabelMappingFn func(c *gin.Context) string
// Metric is a definition for the name, description, type, ID, and //
// prometheus.Collector type (i.e. CounterVec, Summary, etc) of each metric. //// Metric is a definition for the name, description, type, ID, and
type Metric struct { //// prometheus.Collector type (i.e. CounterVec, Summary, etc) of each metric.
MetricCollector prometheus.Collector //type Metric struct {
ID string // MetricCollector prometheus.Collector
Name string // ID string
Description string // Name string
Type string // Description string
Args []string // Type string
} // Args []string
//}
// Prometheus contains the metrics gathered by the instance and its path. //
type Prometheus struct { //// Prometheus contains the metrics gathered by the instance and its path.
reqCnt *prometheus.CounterVec //type Prometheus struct {
reqDur *prometheus.HistogramVec // reqCnt *prometheus.CounterVec
reqSz, resSz prometheus.Summary // reqDur *prometheus.HistogramVec
router *gin.Engine // reqSz, resSz prometheus.Summary
listenAddress string // router *gin.Engine
Ppg PrometheusPushGateway // listenAddress string
// Ppg PrometheusPushGateway
MetricsList []*Metric //
MetricsPath string // MetricsList []*Metric
// MetricsPath string
ReqCntURLLabelMappingFn RequestCounterURLLabelMappingFn //
// ReqCntURLLabelMappingFn RequestCounterURLLabelMappingFn
// gin.Context string to use as a prometheus URL label //
URLLabelFromContext string // // gin.Context string to use as a prometheus URL label
} // URLLabelFromContext string
//}
// PrometheusPushGateway contains the configuration for pushing to a Prometheus pushgateway (optional). //
type PrometheusPushGateway struct { //// PrometheusPushGateway contains the configuration for pushing to a Prometheus pushgateway (optional).
//type PrometheusPushGateway struct {
// Push interval in seconds //
PushIntervalSeconds time.Duration // // Push interval in seconds
// PushIntervalSeconds time.Duration
// Push Gateway URL in format http://domain:port //
// where JOBNAME can be any string of your choice // // Push Gateway URL in format http://domain:port
PushGatewayURL string // // where JOBNAME can be any string of your choice
// PushGatewayURL string
// Local metrics URL where metrics are fetched from, this could be omitted in the future //
// if implemented using prometheus common/expfmt instead // // Local metrics URL where metrics are fetched from, this could be omitted in the future
MetricsURL string // // if implemented using prometheus common/expfmt instead
// MetricsURL string
// pushgateway job name, defaults to "gin" //
Job string // // pushgateway job name, defaults to "gin"
} // Job string
//}
// NewPrometheus generates a new set of metrics with a certain subsystem name. //
func NewPrometheus(subsystem string, customMetricsList ...[]*Metric) *Prometheus { //// NewPrometheus generates a new set of metrics with a certain subsystem name.
if subsystem == "" { //func NewPrometheus(subsystem string, customMetricsList ...[]*Metric) *Prometheus {
subsystem = "app" // if subsystem == "" {
} // subsystem = "app"
// }
var metricsList []*Metric //
// var metricsList []*Metric
if len(customMetricsList) > 1 { //
panic("Too many args. NewPrometheus( string, <optional []*Metric> ).") // if len(customMetricsList) > 1 {
} else if len(customMetricsList) == 1 { // panic("Too many args. NewPrometheus( string, <optional []*Metric> ).")
metricsList = customMetricsList[0] // } else if len(customMetricsList) == 1 {
} // metricsList = customMetricsList[0]
metricsList = append(metricsList, standardMetrics...) // }
// metricsList = append(metricsList, standardMetrics...)
p := &Prometheus{ //
MetricsList: metricsList, // p := &Prometheus{
MetricsPath: defaultMetricPath, // MetricsList: metricsList,
ReqCntURLLabelMappingFn: func(c *gin.Context) string { // MetricsPath: defaultMetricPath,
return c.FullPath() // e.g. /user/:id , /user/:id/info // ReqCntURLLabelMappingFn: func(c *gin.Context) string {
}, // return c.FullPath() // e.g. /user/:id , /user/:id/info
} // },
// }
p.registerMetrics(subsystem) //
// p.registerMetrics(subsystem)
return p //
} // return p
//}
// SetPushGateway sends metrics to a remote pushgateway exposed on pushGatewayURL //
// every pushIntervalSeconds. Metrics are fetched from metricsURL. //// SetPushGateway sends metrics to a remote pushgateway exposed on pushGatewayURL
func (p *Prometheus) SetPushGateway(pushGatewayURL, metricsURL string, pushIntervalSeconds time.Duration) { //// every pushIntervalSeconds. Metrics are fetched from metricsURL.
p.Ppg.PushGatewayURL = pushGatewayURL //func (p *Prometheus) SetPushGateway(pushGatewayURL, metricsURL string, pushIntervalSeconds time.Duration) {
p.Ppg.MetricsURL = metricsURL // p.Ppg.PushGatewayURL = pushGatewayURL
p.Ppg.PushIntervalSeconds = pushIntervalSeconds // p.Ppg.MetricsURL = metricsURL
p.startPushTicker() // p.Ppg.PushIntervalSeconds = pushIntervalSeconds
} // p.startPushTicker()
//}
// SetPushGatewayJob job name, defaults to "gin". //
func (p *Prometheus) SetPushGatewayJob(j string) { //// SetPushGatewayJob job name, defaults to "gin".
p.Ppg.Job = j //func (p *Prometheus) SetPushGatewayJob(j string) {
} // p.Ppg.Job = j
//}
// SetListenAddress for exposing metrics on address. If not set, it will be exposed at the //
// same address of the gin engine that is being used. //// SetListenAddress for exposing metrics on address. If not set, it will be exposed at the
func (p *Prometheus) SetListenAddress(address string) { //// same address of the gin engine that is being used.
p.listenAddress = address //func (p *Prometheus) SetListenAddress(address string) {
if p.listenAddress != "" { // p.listenAddress = address
p.router = gin.Default() // if p.listenAddress != "" {
} // p.router = gin.Default()
} // }
//}
// SetListenAddressWithRouter for using a separate router to expose metrics. (this keeps things like GET /metrics out of //
// your content's access log). //// SetListenAddressWithRouter for using a separate router to expose metrics. (this keeps things like GET /metrics out of
func (p *Prometheus) SetListenAddressWithRouter(listenAddress string, r *gin.Engine) { //// your content's access log).
p.listenAddress = listenAddress //func (p *Prometheus) SetListenAddressWithRouter(listenAddress string, r *gin.Engine) {
if len(p.listenAddress) > 0 { // p.listenAddress = listenAddress
p.router = r // if len(p.listenAddress) > 0 {
} // p.router = r
} // }
//}
// SetMetricsPath set metrics paths. //
func (p *Prometheus) SetMetricsPath(e *gin.Engine) error { //// SetMetricsPath set metrics paths.
//func (p *Prometheus) SetMetricsPath(e *gin.Engine) error {
if p.listenAddress != "" { //
p.router.GET(p.MetricsPath, prometheusHandler()) // if p.listenAddress != "" {
return p.runServer() // p.router.GET(p.MetricsPath, prometheusHandler())
} else { // return p.runServer()
e.GET(p.MetricsPath, prometheusHandler()) // } else {
return nil // e.GET(p.MetricsPath, prometheusHandler())
} // return nil
} // }
//}
// SetMetricsPathWithAuth set metrics paths with authentication. //
func (p *Prometheus) SetMetricsPathWithAuth(e *gin.Engine, accounts gin.Accounts) error { //// SetMetricsPathWithAuth set metrics paths with authentication.
//func (p *Prometheus) SetMetricsPathWithAuth(e *gin.Engine, accounts gin.Accounts) error {
if p.listenAddress != "" { //
p.router.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler()) // if p.listenAddress != "" {
return p.runServer() // p.router.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler())
} else { // return p.runServer()
e.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler()) // } else {
return nil // e.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler())
} // return nil
// }
} //
//}
func (p *Prometheus) runServer() error { //
return p.router.Run(p.listenAddress) //func (p *Prometheus) runServer() error {
} // return p.router.Run(p.listenAddress)
//}
func (p *Prometheus) getMetrics() []byte { //
response, err := http.Get(p.Ppg.MetricsURL) //func (p *Prometheus) getMetrics() []byte {
if err != nil { // response, err := http.Get(p.Ppg.MetricsURL)
return nil // if err != nil {
} // return nil
// }
defer response.Body.Close() //
// defer response.Body.Close()
body, _ := io.ReadAll(response.Body) //
return body // body, _ := io.ReadAll(response.Body)
} // return body
//}
var hostname, _ = os.Hostname() //
//var hostname, _ = os.Hostname()
func (p *Prometheus) getPushGatewayURL() string { //
if p.Ppg.Job == "" { //func (p *Prometheus) getPushGatewayURL() string {
p.Ppg.Job = "gin" // if p.Ppg.Job == "" {
} // p.Ppg.Job = "gin"
return p.Ppg.PushGatewayURL + "/metrics/job/" + p.Ppg.Job + "/instance/" + hostname // }
} // return p.Ppg.PushGatewayURL + "/metrics/job/" + p.Ppg.Job + "/instance/" + hostname
//}
func (p *Prometheus) sendMetricsToPushGateway(metrics []byte) { //
req, err := http.NewRequest("POST", p.getPushGatewayURL(), bytes.NewBuffer(metrics)) //func (p *Prometheus) sendMetricsToPushGateway(metrics []byte) {
if err != nil { // req, err := http.NewRequest("POST", p.getPushGatewayURL(), bytes.NewBuffer(metrics))
return // if err != nil {
} // return
// }
client := &http.Client{} //
resp, err := client.Do(req) // client := &http.Client{}
if err != nil { // resp, err := client.Do(req)
fmt.Println("Error sending to push gateway error:", err.Error()) // if err != nil {
} // fmt.Println("Error sending to push gateway error:", err.Error())
// }
resp.Body.Close() //
} // resp.Body.Close()
//}
func (p *Prometheus) startPushTicker() { //
ticker := time.NewTicker(time.Second * p.Ppg.PushIntervalSeconds) //func (p *Prometheus) startPushTicker() {
go func() { // ticker := time.NewTicker(time.Second * p.Ppg.PushIntervalSeconds)
for range ticker.C { // go func() {
p.sendMetricsToPushGateway(p.getMetrics()) // for range ticker.C {
} // p.sendMetricsToPushGateway(p.getMetrics())
}() // }
} // }()
//}
// NewMetric associates prometheus.Collector based on Metric.Type. //
func NewMetric(m *Metric, subsystem string) prometheus.Collector { //// NewMetric associates prometheus.Collector based on Metric.Type.
var metric prometheus.Collector //func NewMetric(m *Metric, subsystem string) prometheus.Collector {
switch m.Type { // var metric prometheus.Collector
case "counter_vec": // switch m.Type {
metric = prometheus.NewCounterVec( // case "counter_vec":
prometheus.CounterOpts{ // metric = prometheus.NewCounterVec(
Subsystem: subsystem, // prometheus.CounterOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
m.Args, // },
) // m.Args,
case "counter": // )
metric = prometheus.NewCounter( // case "counter":
prometheus.CounterOpts{ // metric = prometheus.NewCounter(
Subsystem: subsystem, // prometheus.CounterOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
) // },
case "gauge_vec": // )
metric = prometheus.NewGaugeVec( // case "gauge_vec":
prometheus.GaugeOpts{ // metric = prometheus.NewGaugeVec(
Subsystem: subsystem, // prometheus.GaugeOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
m.Args, // },
) // m.Args,
case "gauge": // )
metric = prometheus.NewGauge( // case "gauge":
prometheus.GaugeOpts{ // metric = prometheus.NewGauge(
Subsystem: subsystem, // prometheus.GaugeOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
) // },
case "histogram_vec": // )
metric = prometheus.NewHistogramVec( // case "histogram_vec":
prometheus.HistogramOpts{ // metric = prometheus.NewHistogramVec(
Subsystem: subsystem, // prometheus.HistogramOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
m.Args, // },
) // m.Args,
case "histogram": // )
metric = prometheus.NewHistogram( // case "histogram":
prometheus.HistogramOpts{ // metric = prometheus.NewHistogram(
Subsystem: subsystem, // prometheus.HistogramOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
) // },
case "summary_vec": // )
metric = prometheus.NewSummaryVec( // case "summary_vec":
prometheus.SummaryOpts{ // metric = prometheus.NewSummaryVec(
Subsystem: subsystem, // prometheus.SummaryOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
m.Args, // },
) // m.Args,
case "summary": // )
metric = prometheus.NewSummary( // case "summary":
prometheus.SummaryOpts{ // metric = prometheus.NewSummary(
Subsystem: subsystem, // prometheus.SummaryOpts{
Name: m.Name, // Subsystem: subsystem,
Help: m.Description, // Name: m.Name,
}, // Help: m.Description,
) // },
} // )
return metric // }
} // return metric
//}
func (p *Prometheus) registerMetrics(subsystem string) { //
for _, metricDef := range p.MetricsList { //func (p *Prometheus) registerMetrics(subsystem string) {
metric := NewMetric(metricDef, subsystem) // for _, metricDef := range p.MetricsList {
if err := prometheus.Register(metric); err != nil { // metric := NewMetric(metricDef, subsystem)
fmt.Println("could not be registered in Prometheus,metricDef.Name:", metricDef.Name, " error:", err.Error()) // if err := prometheus.Register(metric); err != nil {
} // fmt.Println("could not be registered in Prometheus,metricDef.Name:", metricDef.Name, " error:", err.Error())
// }
switch metricDef { //
case reqCounter: // switch metricDef {
p.reqCnt = metric.(*prometheus.CounterVec) // case reqCounter:
case reqDuration: // p.reqCnt = metric.(*prometheus.CounterVec)
p.reqDur = metric.(*prometheus.HistogramVec) // case reqDuration:
case resSize: // p.reqDur = metric.(*prometheus.HistogramVec)
p.resSz = metric.(prometheus.Summary) // case resSize:
case reqSize: // p.resSz = metric.(prometheus.Summary)
p.reqSz = metric.(prometheus.Summary) // case reqSize:
} // p.reqSz = metric.(prometheus.Summary)
metricDef.MetricCollector = metric // }
} // metricDef.MetricCollector = metric
} // }
//}
// Use adds the middleware to a gin engine. //
func (p *Prometheus) Use(e *gin.Engine) error { //// Use adds the middleware to a gin engine.
e.Use(p.HandlerFunc()) //func (p *Prometheus) Use(e *gin.Engine) error {
return p.SetMetricsPath(e) // e.Use(p.HandlerFunc())
} // return p.SetMetricsPath(e)
//}
// UseWithAuth adds the middleware to a gin engine with BasicAuth. //
func (p *Prometheus) UseWithAuth(e *gin.Engine, accounts gin.Accounts) error { //// UseWithAuth adds the middleware to a gin engine with BasicAuth.
e.Use(p.HandlerFunc()) //func (p *Prometheus) UseWithAuth(e *gin.Engine, accounts gin.Accounts) error {
return p.SetMetricsPathWithAuth(e, accounts) // e.Use(p.HandlerFunc())
} // return p.SetMetricsPathWithAuth(e, accounts)
//}
// HandlerFunc defines handler function for middleware. //
func (p *Prometheus) HandlerFunc() gin.HandlerFunc { //// HandlerFunc defines handler function for middleware.
return func(c *gin.Context) { //func (p *Prometheus) HandlerFunc() gin.HandlerFunc {
if c.Request.URL.Path == p.MetricsPath { // return func(c *gin.Context) {
c.Next() // if c.Request.URL.Path == p.MetricsPath {
return // c.Next()
} // return
// }
start := time.Now() //
reqSz := computeApproximateRequestSize(c.Request) // start := time.Now()
// reqSz := computeApproximateRequestSize(c.Request)
c.Next() //
// c.Next()
status := strconv.Itoa(c.Writer.Status()) //
elapsed := float64(time.Since(start)) / float64(time.Second) // status := strconv.Itoa(c.Writer.Status())
resSz := float64(c.Writer.Size()) // elapsed := float64(time.Since(start)) / float64(time.Second)
// resSz := float64(c.Writer.Size())
url := p.ReqCntURLLabelMappingFn(c) //
if len(p.URLLabelFromContext) > 0 { // url := p.ReqCntURLLabelMappingFn(c)
u, found := c.Get(p.URLLabelFromContext) // if len(p.URLLabelFromContext) > 0 {
if !found { // u, found := c.Get(p.URLLabelFromContext)
u = "unknown" // if !found {
} // u = "unknown"
url = u.(string) // }
} // url = u.(string)
p.reqDur.WithLabelValues(status, c.Request.Method, url).Observe(elapsed) // }
p.reqCnt.WithLabelValues(status, c.Request.Method, c.HandlerName(), c.Request.Host, url).Inc() // p.reqDur.WithLabelValues(status, c.Request.Method, url).Observe(elapsed)
p.reqSz.Observe(float64(reqSz)) // p.reqCnt.WithLabelValues(status, c.Request.Method, c.HandlerName(), c.Request.Host, url).Inc()
p.resSz.Observe(resSz) // p.reqSz.Observe(float64(reqSz))
} // p.resSz.Observe(resSz)
} // }
//}
func prometheusHandler() gin.HandlerFunc { //
h := promhttp.Handler() //func prometheusHandler() gin.HandlerFunc {
return func(c *gin.Context) { // h := promhttp.Handler()
h.ServeHTTP(c.Writer, c.Request) // return func(c *gin.Context) {
} // h.ServeHTTP(c.Writer, c.Request)
} // }
//}
func computeApproximateRequestSize(r *http.Request) int { //
var s int //func computeApproximateRequestSize(r *http.Request) int {
if r.URL != nil { // var s int
s = len(r.URL.Path) // if r.URL != nil {
} // s = len(r.URL.Path)
// }
s += len(r.Method) //
s += len(r.Proto) // s += len(r.Method)
for name, values := range r.Header { // s += len(r.Proto)
s += len(name) // for name, values := range r.Header {
for _, value := range values { // s += len(name)
s += len(value) // for _, value := range values {
} // s += len(value)
} // }
s += len(r.Host) // }
// s += len(r.Host)
// r.FormData and r.MultipartForm are assumed to be included in r.URL. //
// // r.FormData and r.MultipartForm are assumed to be included in r.URL.
if r.ContentLength != -1 { //
s += int(r.ContentLength) // if r.ContentLength != -1 {
} // s += int(r.ContentLength)
return s // }
} // return s
//}

50
pkg/common/prommetrics/api.go Normal file
View File

@ -0,0 +1,50 @@
package prommetrics
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"net/http"
"strconv"
)
const ApiPath = "/metrics"
var (
apiRegistry = prometheus.NewRegistry()
apiCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "api_count",
Help: "Total number of API calls",
},
[]string{"path", "method", "code"},
)
httpCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "http_count",
Help: "Total number of HTTP calls",
},
[]string{"path", "method", "status"},
)
)
func init() {
apiRegistry.MustRegister(apiCounter, httpCounter)
}
func APICall(path string, method string, apiCode int) {
apiCounter.With(prometheus.Labels{"path": path, "method": method, "code": strconv.Itoa(apiCode)}).Inc()
}
func HttpCall(path string, method string, status int) {
httpCounter.With(prometheus.Labels{"path": path, "method": method, "status": strconv.Itoa(status)}).Inc()
}
//func ApiHandler() http.Handler {
// return promhttp.InstrumentMetricHandler(
// apiRegistry, promhttp.HandlerFor(apiRegistry, promhttp.HandlerOpts{}),
// )
//}
func ApiHandler() http.Handler {
return promhttp.HandlerFor(apiRegistry, promhttp.HandlerOpts{})
}

30
pkg/common/prommetrics/gin_api.go
View File

@ -1,30 +0,0 @@
// Copyright © 2023 OpenIM. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package prommetrics
import ginprom "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus"
/*
labels := prometheus.Labels{"label_one": "any", "label_two": "value"}
ApiCustomCnt.MetricCollector.(*prometheus.CounterVec).With(labels).Inc().
*/
var (
ApiCustomCnt = &ginprom.Metric{
Name: "custom_total",
Description: "Custom counter events.",
Type: "counter_vec",
Args: []string{"label_one", "label_two"},
}
)

17
pkg/common/prommetrics/prommetrics.go
View File

@ -17,7 +17,6 @@ package prommetrics
import ( import (
gp "github.com/grpc-ecosystem/go-grpc-prometheus" gp "github.com/grpc-ecosystem/go-grpc-prometheus"
config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/collectors"
) )
@ -48,11 +47,11 @@ func GetGrpcCusMetrics(registerName string, share *config2.Share) []prometheus.C
} }
} }
func GetGinCusMetrics(name string) []*ginprometheus.Metric { //func GetGinCusMetrics(name string) []*ginprometheus.Metric {
switch name { // switch name {
case "Api": // case "Api":
return []*ginprometheus.Metric{ApiCustomCnt} // return []*ginprometheus.Metric{ApiCustomCnt}
default: // default:
return []*ginprometheus.Metric{ApiCustomCnt} // return []*ginprometheus.Metric{ApiCustomCnt}
} // }
} //}

33
pkg/common/prommetrics/rpc.go Normal file
View File

@ -0,0 +1,33 @@
package prommetrics
import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"net/http"
"strconv"
)
const RpcPath = "/metrics"
var (
rpcRegistry = prometheus.NewRegistry()
rpcCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "rpc_count",
Help: "Total number of RPC calls",
},
[]string{"name", "path", "code"},
)
)
func init() {
rpcRegistry.MustRegister(rpcCounter)
}
func RPCCall(name string, path string, code int) {
rpcCounter.With(prometheus.Labels{"name": name, "path": path, "code": strconv.Itoa(code)}).Inc()
}
func RPCHandler() http.Handler {
return promhttp.HandlerFor(rpcRegistry, promhttp.HandlerOpts{})
}

51
pkg/common/startrpc/start.go
View File

@ -19,7 +19,7 @@ import (
"fmt" "fmt"
config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/tools/utils/datautil" "github.com/openimsdk/tools/utils/datautil"
"github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/status"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -29,7 +29,6 @@ import (
"syscall" "syscall"
"time" "time"
grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/tools/discovery" "github.com/openimsdk/tools/discovery"
@ -38,7 +37,6 @@ import (
"github.com/openimsdk/tools/mw" "github.com/openimsdk/tools/mw"
"github.com/openimsdk/tools/system/program" "github.com/openimsdk/tools/system/program"
"github.com/openimsdk/tools/utils/network" "github.com/openimsdk/tools/utils/network"
"github.com/prometheus/client_golang/prometheus/promhttp"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
) )
@ -77,13 +75,14 @@ func Start[T any](ctx context.Context, discovery *config2.Discovery, prometheusC
return err return err
} }
var reg *prometheus.Registry //var reg *prometheus.Registry
var metric *grpcprometheus.ServerMetrics //var metric *grpcprometheus.ServerMetrics
if prometheusConfig.Enable { if prometheusConfig.Enable {
cusMetrics := prommetrics.GetGrpcCusMetrics(rpcRegisterName, share) //cusMetrics := prommetrics.GetGrpcCusMetrics(rpcRegisterName, share)
reg, metric, _ = prommetrics.NewGrpcPromObj(cusMetrics) //reg, metric, _ = prommetrics.NewGrpcPromObj(cusMetrics)
options = append(options, mw.GrpcServer(), grpc.StreamInterceptor(metric.StreamServerInterceptor()), //options = append(options, mw.GrpcServer(), grpc.StreamInterceptor(metric.StreamServerInterceptor()),
grpc.UnaryInterceptor(metric.UnaryServerInterceptor())) // grpc.UnaryInterceptor(metric.UnaryServerInterceptor()))
options = append(options, mw.GrpcServer(), prommetricsInterceptor(rpcRegisterName))
} else { } else {
options = append(options, mw.GrpcServer()) options = append(options, mw.GrpcServer())
} }
@ -122,13 +121,19 @@ func Start[T any](ctx context.Context, discovery *config2.Discovery, prometheusC
netDone <- struct{}{} netDone <- struct{}{}
return return
} }
metric.InitializeMetrics(srv) srv := http.NewServeMux()
// Create a HTTP server for prometheus. srv.Handle(prommetrics.RpcPath, prommetrics.RPCHandler())
httpServer = &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)} if err := http.ListenAndServe(fmt.Sprintf(":%d", prometheusPort), srv); err != nil && err != http.ErrServerClosed {
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed { netErr = errs.WrapMsg(err, fmt.Sprintf("rpc %s prometheus start err: %d", rpcRegisterName, prometheusPort))
netErr = errs.WrapMsg(err, "prometheus start err", httpServer.Addr)
netDone <- struct{}{} netDone <- struct{}{}
} }
//metric.InitializeMetrics(srv)
// Create a HTTP server for prometheus.
//httpServer = &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)}
//if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
// netErr = errs.WrapMsg(err, "prometheus start err", httpServer.Addr)
// netDone <- struct{}{}
//}
}() }()
} }
@ -175,3 +180,21 @@ func gracefulStopWithCtx(ctx context.Context, f func()) error {
return nil return nil
} }
} }
func prommetricsInterceptor(rpcRegisterName string) grpc.ServerOption {
getCode := func(err error) int {
if err == nil {
return 0
}
rpcErr, ok := err.(interface{ GRPCStatus() *status.Status })
if !ok {
return -1
}
return int(rpcErr.GRPCStatus().Code())
}
return grpc.ChainUnaryInterceptor(func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
resp, err := handler(ctx, req)
prommetrics.RPCCall(rpcRegisterName, info.FullMethod, getCode(err))
return resp, err
})
}