From 04a8a196ec0ac71886cb1697c259798c45e919a7 Mon Sep 17 00:00:00 2001
From: fagongzi <zhangxu19830126@gmail.com>
Date: Tue, 24 Oct 2023 18:17:54 +0800
Subject: [PATCH] fix some metrics and update code owners (#12299)

---
 CODEOWNERS                                            | 1 +
 pkg/txn/rpc/sender.go                                 | 6 ++----
 pkg/util/metric/v2/dashboard/grafana_dashboard_txn.go | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 4d843635c292..8b2fcc96cbea 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -150,6 +150,7 @@
 /pkg/util/toml @zhangxu19830126
 /pkg/util/trace @xzxiong
 /pkg/util/export @xzxiong
+/pkg/util/metric/v2 @zhangxu19830126
 
 # pkg/vectorize
 /pkg/vectorize @aunjgr
diff --git a/pkg/txn/rpc/sender.go b/pkg/txn/rpc/sender.go
index 8a2723048b09..1179d542eb70 100644
--- a/pkg/txn/rpc/sender.go
+++ b/pkg/txn/rpc/sender.go
@@ -173,10 +173,8 @@ func (s *sender) doSend(ctx context.Context, request txn.TxnRequest) (txn.TxnRes
 	if err != nil {
 		return txn.TxnResponse{}, err
 	}
-	defer func() {
-		v2.TxnCNSendCommitDurationHistogram.Observe(time.Since(start).Seconds())
-		f.Close()
-	}()
+	v2.TxnCNSendCommitDurationHistogram.Observe(time.Since(start).Seconds())
+	defer f.Close()
 
 	v, err := f.Get()
 	if err != nil {
diff --git a/pkg/util/metric/v2/dashboard/grafana_dashboard_txn.go b/pkg/util/metric/v2/dashboard/grafana_dashboard_txn.go
index c1758f824beb..1e83f0f67f2d 100644
--- a/pkg/util/metric/v2/dashboard/grafana_dashboard_txn.go
+++ b/pkg/util/metric/v2/dashboard/grafana_dashboard_txn.go
@@ -76,7 +76,7 @@ func (c *DashboardCreator) initTxnOverviewRow() dashboard.Option {
 		c.withGraph(
 			"Commit requests",
 			3,
-			"sum(mo_txn_commit_total) by (type)",
+			"sum(rate(mo_txn_commit_total[$interval])) by (type)",
 			"{{ type }}"),
 
 		c.withGraph(