From 4607251d231a449944977265f479e308f08b3504 Mon Sep 17 00:00:00 2001
From: ciscoxll <xiaoliangliang@pingcap.com>
Date: Mon, 28 May 2018 10:33:00 +0800
Subject: [PATCH] metrics:fix add index duration bucket dosen't work (#6478)

* fix add index duration bucket dosen't work
---
 ddl/index.go   | 3 ++-
 metrics/ddl.go | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ddl/index.go b/ddl/index.go
index 1766d94f2885b..75c750ad9d30d 100644
--- a/ddl/index.go
+++ b/ddl/index.go
@@ -746,6 +746,7 @@ func (d *ddl) backfillBatchTasks(startTime time.Time, startHandle int64, reorgIn
 		err1 := kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
 			return errors.Trace(reorgInfo.UpdateHandle(txn, nextHandle))
 		})
+		metrics.BatchAddIdxHistogram.WithLabelValues(metrics.LblError).Observe(elapsedTime)
 		log.Warnf("[ddl-reorg] total added index for %d rows, this task [%d,%d) add index for %d failed %v, take time %v, update handle err %v",
 			*totalAddedCount, startHandle, nextHandle, taskAddedCount, err, elapsedTime, err1)
 		return errors.Trace(err)
@@ -753,7 +754,7 @@ func (d *ddl) backfillBatchTasks(startTime time.Time, startHandle int64, reorgIn
 
 	// nextHandle will be updated periodically in runReorgJob, so no need to update it here.
 	d.reorgCtx.setNextHandle(nextHandle)
-	metrics.BatchAddIdxHistogram.Observe(elapsedTime)
+	metrics.BatchAddIdxHistogram.WithLabelValues(metrics.LblOK).Observe(elapsedTime)
 	log.Infof("[ddl-reorg] total added index for %d rows, this task [%d,%d) added index for %d rows, take time %v",
 		*totalAddedCount, startHandle, nextHandle, taskAddedCount, elapsedTime)
 	return nil
diff --git a/metrics/ddl.go b/metrics/ddl.go
index 80e14b9e0c935..4f8f97e388e66 100644
--- a/metrics/ddl.go
+++ b/metrics/ddl.go
@@ -34,14 +34,14 @@ var (
 			Buckets:   prometheus.ExponentialBuckets(0.01, 2, 20),
 		}, []string{LblType, LblResult})
 
-	BatchAddIdxHistogram = prometheus.NewHistogram(
+	BatchAddIdxHistogram = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
 			Namespace: "tidb",
 			Subsystem: "ddl",
 			Name:      "batch_add_idx_duration_seconds",
 			Help:      "Bucketed histogram of processing time (s) of batch handle data",
 			Buckets:   prometheus.ExponentialBuckets(0.001, 2, 20),
-		})
+		}, []string{LblType})
 
 	SyncerInit    = "init"
 	SyncerRestart = "restart"