From fb2c38f783292552e37e1d70012cb1467b832d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=B1=E5=B2=9A?=
 <36239017+YuJuncen@users.noreply.github.com>
Date: Mon, 25 Jul 2022 13:39:10 +0800
Subject: [PATCH] log-backup: adapt the new metrics (#36479)

ref pingcap/tidb#36092
---
 br/pkg/stream/stream_status.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/br/pkg/stream/stream_status.go b/br/pkg/stream/stream_status.go
index 7d05a26c5a029..23ef2d2bdc6f7 100644
--- a/br/pkg/stream/stream_status.go
+++ b/br/pkg/stream/stream_status.go
@@ -247,7 +247,7 @@ func (p *printByJSON) PrintTasks() {
 	p.console.Println(mustMarshal(tasks))
 }
 
-var logCountSumRe = regexp.MustCompile(`tikv_stream_handle_kv_batch_sum ([0-9]+)`)
+var logCountSumRe = regexp.MustCompile(`tikv_(?:stream|log_backup)_handle_kv_batch_sum ([0-9]+)`)
 
 type PDInfoProvider interface {
 	GetPDClient() pd.Client
@@ -279,10 +279,10 @@ func MaybeQPS(ctx context.Context, mgr PDInfoProvider) (float64, error) {
 			return 0, err
 		}
 		matches := logCountSumRe.FindSubmatch(data)
+		log.Info("get qps", zap.ByteStrings("matches", matches), logutil.Redact(zap.String("addr", statusAddr)))
 		if len(matches) < 2 {
 			return 42, nil
 		}
-		log.Info("get qps", zap.ByteStrings("matches", matches), logutil.Redact(zap.String("addr", statusAddr)))
 		return strconv.ParseUint(string(matches[1]), 10, 64)
 	}
 	qpsMap := new(sync.Map)
@@ -303,7 +303,7 @@ func MaybeQPS(ctx context.Context, mgr PDInfoProvider) (float64, error) {
 			return errors.Annotatef(err, "failed to get count from %s", statusAddr)
 		}
 		elapsed := float64(time.Since(start)) / float64(time.Second)
-		log.Info("calc qps", zap.Uint64("diff", c1-c0), zap.Float64("elapsed", elapsed))
+		log.Info("calc qps", zap.Uint64("diff", c1-c0), zap.Float64("elapsed", elapsed), zap.Uint64("c0", c0), zap.Uint64("c1", c1))
 
 		qpsMap.Store(s.GetId(), float64(c1-c0)/elapsed)
 		return nil