tikv
/
client-go
mirror of https://github.com/tikv/client-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

metrics,internal/client: add metrics for batch client stream receiving duration (#279) 

Signed-off-by: tiancaiamao <tiancaiamao@gmail.com>

Co-authored-by: disksing <i@disksing.com>
This commit is contained in:
tiancaiamao 2021-08-23 20:13:37 +08:00 committed by GitHub
parent 0c8381cbc2
commit feeb9d1ed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/client/client_batch.go
View File

@ -425,6 +425,7 @@ type batchCommandsStream struct {
} }
func (s *batchCommandsStream) recv() (resp *tikvpb.BatchCommandsResponse, err error) { func (s *batchCommandsStream) recv() (resp *tikvpb.BatchCommandsResponse, err error) {
now := time.Now()
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc() metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc()
@ -433,6 +434,11 @@ func (s *batchCommandsStream) recv() (resp *tikvpb.BatchCommandsResponse, err er
zap.Stack("stack")) zap.Stack("stack"))
err = errors.SuspendStack(errors.New("batch conn recv paniced")) err = errors.SuspendStack(errors.New("batch conn recv paniced"))
} }
if err == nil {
metrics.BatchRecvHistogramOK.Observe(float64(time.Since(now)))
} else {
metrics.BatchRecvHistogramError.Observe(float64(time.Since(now)))
}
}() }()
if _, err := util.EvalFailpoint("gotErrorInRecvLoop"); err == nil { if _, err := util.EvalFailpoint("gotErrorInRecvLoop"); err == nil {
return nil, errors.New("injected error in batchRecvLoop") return nil, errors.New("injected error in batchRecvLoop")

11
metrics/metrics.go
View File

@ -66,6 +66,7 @@ var (
TiKVBatchClientUnavailable prometheus.Histogram TiKVBatchClientUnavailable prometheus.Histogram
TiKVBatchClientWaitEstablish prometheus.Histogram TiKVBatchClientWaitEstablish prometheus.Histogram
TiKVBatchClientRecycle prometheus.Histogram TiKVBatchClientRecycle prometheus.Histogram
TiKVBatchRecvLatency *prometheus.HistogramVec
TiKVRangeTaskStats *prometheus.GaugeVec TiKVRangeTaskStats *prometheus.GaugeVec
TiKVRangeTaskPushDuration *prometheus.HistogramVec TiKVRangeTaskPushDuration *prometheus.HistogramVec
TiKVTokenWaitDuration prometheus.Histogram TiKVTokenWaitDuration prometheus.Histogram
@ -275,6 +276,15 @@ func initMetrics(namespace, subsystem string) {
Help: "batch send latency", Help: "batch send latency",
}) })
TiKVBatchRecvLatency = prometheus.NewHistogramVec(
prometheus.HistogramOpts{
Namespace: namespace,
Subsystem: subsystem,
Name: "batch_recv_latency",
Buckets: prometheus.ExponentialBuckets(1000, 2, 34), // 1us ~ 8000s
Help: "batch recv latency",
}, []string{LblResult})
TiKVBatchWaitOverLoad = prometheus.NewCounter( TiKVBatchWaitOverLoad = prometheus.NewCounter(
prometheus.CounterOpts{ prometheus.CounterOpts{
Namespace: namespace, Namespace: namespace,
@ -554,6 +564,7 @@ func RegisterMetrics() {
prometheus.MustRegister(TiKVStatusCounter) prometheus.MustRegister(TiKVStatusCounter)
prometheus.MustRegister(TiKVBatchWaitDuration) prometheus.MustRegister(TiKVBatchWaitDuration)
prometheus.MustRegister(TiKVBatchSendLatency) prometheus.MustRegister(TiKVBatchSendLatency)
prometheus.MustRegister(TiKVBatchRecvLatency)
prometheus.MustRegister(TiKVBatchWaitOverLoad) prometheus.MustRegister(TiKVBatchWaitOverLoad)
prometheus.MustRegister(TiKVBatchPendingRequests) prometheus.MustRegister(TiKVBatchPendingRequests)
prometheus.MustRegister(TiKVBatchRequests) prometheus.MustRegister(TiKVBatchRequests)

6
metrics/shortcuts.go
View File

@ -119,6 +119,9 @@ var (
OnePCTxnCounterOk prometheus.Counter OnePCTxnCounterOk prometheus.Counter
OnePCTxnCounterError prometheus.Counter OnePCTxnCounterError prometheus.Counter
OnePCTxnCounterFallback prometheus.Counter OnePCTxnCounterFallback prometheus.Counter
BatchRecvHistogramOK prometheus.Observer
BatchRecvHistogramError prometheus.Observer
) )
func initShortcuts() { func initShortcuts() {
@ -203,4 +206,7 @@ func initShortcuts() {
OnePCTxnCounterOk = TiKVOnePCTxnCounter.WithLabelValues("ok") OnePCTxnCounterOk = TiKVOnePCTxnCounter.WithLabelValues("ok")
OnePCTxnCounterError = TiKVOnePCTxnCounter.WithLabelValues("err") OnePCTxnCounterError = TiKVOnePCTxnCounter.WithLabelValues("err")
OnePCTxnCounterFallback = TiKVOnePCTxnCounter.WithLabelValues("fallback") OnePCTxnCounterFallback = TiKVOnePCTxnCounter.WithLabelValues("fallback")
BatchRecvHistogramOK = TiKVBatchRecvLatency.WithLabelValues("ok")
BatchRecvHistogramError = TiKVBatchRecvLatency.WithLabelValues("err")
} }