merge upstream

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
pingcap · Oct 17, 2023 · 05e855a · 05e855a
1 parent 2e78eb4
commit 05e855a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -271,16 +271,13 @@ func RegisterMetrics() {
 	prometheus.MustRegister(DistTaskSubTaskCntGauge)
 	prometheus.MustRegister(DistTaskSubTaskStartTimeGauge)
 
-<<<<<<< HEAD
 	prometheus.MustRegister(RunawayCheckerCounter)
-=======
 	prometheus.MustRegister(GlobalSortWriteToCloudStorageDuration)
 	prometheus.MustRegister(GlobalSortWriteToCloudStorageRate)
 	prometheus.MustRegister(GlobalSortReadFromCloudStorageDuration)
 	prometheus.MustRegister(GlobalSortReadFromCloudStorageRate)
 	prometheus.MustRegister(GlobalSortIngestWorkerCnt)
 	prometheus.MustRegister(AddIndexScanRate)
->>>>>>> master
 
 	tikvmetrics.InitMetrics(TiDB, TiKVClient)
 	tikvmetrics.RegisterMetrics()