From 05e855ab50c68a3c375122f7e664de21b82c6ea3 Mon Sep 17 00:00:00 2001 From: Cabinfever_B Date: Tue, 17 Oct 2023 14:19:50 +0800 Subject: [PATCH] merge upstream Signed-off-by: Cabinfever_B --- pkg/metrics/metrics.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 432caaea4d3f5..656ff110b5943 100644 --- 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()