This is an automated cherry-pick of pingcap#58739

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Jan 7, 2025 · 5ccb568 · 5ccb568
1 parent 896c0c1
commit 5ccb568
Show file tree

Hide file tree

Showing 4 changed files with 881 additions and 0 deletions.
diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -46,6 +46,7 @@ var (
 
 // metrics labels.
 const (
+<<<<<<< HEAD:metrics/metrics.go
 	LabelSession   = "session"
 	LabelDomain    = "domain"
 	LabelDDLOwner  = "ddl-owner"
@@ -54,6 +55,19 @@ const (
 	LabelDDLSyncer = "ddl-syncer"
 	LabelGCWorker  = "gcworker"
 	LabelAnalyze   = "analyze"
+=======
+	LabelSession    = "session"
+	LabelDomain     = "domain"
+	LabelDDLOwner   = "ddl-owner"
+	LabelDDL        = "ddl"
+	LabelDDLWorker  = "ddl-worker"
+	LabelDistReorg  = "dist-reorg"
+	LabelDDLSyncer  = "ddl-syncer"
+	LabelGCWorker   = "gcworker"
+	LabelAnalyze    = "analyze"
+	LabelWorkerPool = "worker-pool"
+	LabelStats      = "stats"
+>>>>>>> 23ed0dfd6ed (statistics: add recover to protect background task (#58739)):pkg/metrics/metrics.go
 
 	LabelBatchRecvLoop = "batch-recv-loop"
 	LabelBatchSendLoop = "batch-send-loop"