go-gost/core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add new metrics for chain node

Browse Source
This commit is contained in:
ginuerzh
2022-04-04 21:00:02 +08:00
parent 3cfb5fe2ca
commit d6e6efb093
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
chain/route.go
View File

@ -100,6 +100,8 @@ func (r *Route) connect(ctx context.Context) (conn net.Conn, err error) {
node.Marker.Mark() node.Marker.Mark()
return return
} }
start := time.Now()
cc, err := node.Transport.Dial(ctx, addr) cc, err := node.Transport.Dial(ctx, addr)
if err != nil { if err != nil {
node.Marker.Mark() node.Marker.Mark()
@ -114,6 +116,9 @@ func (r *Route) connect(ctx context.Context) (conn net.Conn, err error) {
} }
node.Marker.Reset() node.Marker.Reset()
metrics.ChainNodeConnectSeconds(r.chain.name, node.Name).
Observe(time.Since(start).Seconds())
preNode := node preNode := node
for _, node := range r.nodes[1:] { for _, node := range r.nodes[1:] {
addr, err = resolve(ctx, network, node.Addr, node.Resolver, node.Hosts, r.logger) addr, err = resolve(ctx, network, node.Addr, node.Resolver, node.Hosts, r.logger)

41
metrics/metrics.go
View File

@ -31,15 +31,16 @@ type Observer interface {
} }
type Metrics struct { type Metrics struct {
host string host string
services *prometheus.GaugeVec services *prometheus.GaugeVec
requests *prometheus.CounterVec requests *prometheus.CounterVec
requestsInFlight *prometheus.GaugeVec requestsInFlight *prometheus.GaugeVec
requestSeconds *prometheus.HistogramVec requestSeconds *prometheus.HistogramVec
inputBytes *prometheus.CounterVec chainNodeConnectSecconds *prometheus.HistogramVec
outputBytes *prometheus.CounterVec inputBytes *prometheus.CounterVec
handlerErrors *prometheus.CounterVec outputBytes *prometheus.CounterVec
chainErrors *prometheus.CounterVec handlerErrors *prometheus.CounterVec
chainErrors *prometheus.CounterVec
} }
func NewMetrics() *Metrics { func NewMetrics() *Metrics {
@ -76,6 +77,15 @@ func NewMetrics() *Metrics {
}, },
}, },
[]string{"host", "service"}), []string{"host", "service"}),
chainNodeConnectSecconds: prometheus.NewHistogramVec(
prometheus.HistogramOpts{
Name: "gost_chain_node_connect_duration_seconds",
Help: "Distribution of chain node connect latencies",
Buckets: []float64{
.01, .05, .1, .25, .5, 1, 1.5, 2, 5, 10, 15, 30, 60,
},
},
[]string{"host", "chain", "node"}),
inputBytes: prometheus.NewCounterVec( inputBytes: prometheus.NewCounterVec(
prometheus.CounterOpts{ prometheus.CounterOpts{
Name: "gost_service_transfer_input_bytes_total", Name: "gost_service_transfer_input_bytes_total",
@ -105,6 +115,7 @@ func NewMetrics() *Metrics {
prometheus.MustRegister(m.requests) prometheus.MustRegister(m.requests)
prometheus.MustRegister(m.requestsInFlight) prometheus.MustRegister(m.requestsInFlight)
prometheus.MustRegister(m.requestSeconds) prometheus.MustRegister(m.requestSeconds)
prometheus.MustRegister(m.chainNodeConnectSecconds)
prometheus.MustRegister(m.inputBytes) prometheus.MustRegister(m.inputBytes)
prometheus.MustRegister(m.outputBytes) prometheus.MustRegister(m.outputBytes)
prometheus.MustRegister(m.handlerErrors) prometheus.MustRegister(m.handlerErrors)
@ -156,6 +167,18 @@ func RequestSeconds(service string) Observer {
}) })
} }
func ChainNodeConnectSeconds(chain, node string) Observer {
if metrics == nil || metrics.chainNodeConnectSecconds == nil {
return nilObserver
}
return metrics.chainNodeConnectSecconds.
With(prometheus.Labels{
"host": metrics.host,
"chain": chain,
"node": node,
})
}
func InputBytes(service string) Counter { func InputBytes(service string) Counter {
if metrics == nil || metrics.inputBytes == nil { if metrics == nil || metrics.inputBytes == nil {
return nilCounter return nilCounter