From dde3c5fc403ea316ef559e881b6e5493ea6d3ed2 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <leegyuho@amazon.com>
Date: Thu, 1 Aug 2019 14:03:32 -0700
Subject: [PATCH] mvcc: clean up metrics names, add missing register calls

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
---
 mvcc/kvstore.go     |  6 +++---
 mvcc/metrics.go     | 18 +++++++++---------
 mvcc/metrics_txn.go | 14 ++++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go
index bc6b895ed..bc9d3007e 100644
--- a/mvcc/kvstore.go
+++ b/mvcc/kvstore.go
@@ -348,9 +348,9 @@ func (s *store) restore() error {
 	reportDbTotalSizeInBytesMu.Lock()
 	reportDbTotalSizeInBytes = func() float64 { return float64(b.Size()) }
 	reportDbTotalSizeInBytesMu.Unlock()
-	reportDbTotalSizeInBytesDebuggingMu.Lock()
-	reportDbTotalSizeInBytesDebugging = func() float64 { return float64(b.Size()) }
-	reportDbTotalSizeInBytesDebuggingMu.Unlock()
+	reportDbTotalSizeInBytesDebugMu.Lock()
+	reportDbTotalSizeInBytesDebug = func() float64 { return float64(b.Size()) }
+	reportDbTotalSizeInBytesDebugMu.Unlock()
 	reportDbTotalSizeInUseInBytesMu.Lock()
 	reportDbTotalSizeInUseInBytes = func() float64 { return float64(b.SizeInUse()) }
 	reportDbTotalSizeInUseInBytesMu.Unlock()
diff --git a/mvcc/metrics.go b/mvcc/metrics.go
index d62866897..82e9e3dee 100644
--- a/mvcc/metrics.go
+++ b/mvcc/metrics.go
@@ -36,7 +36,6 @@ var (
 			Name:      "put_total",
 			Help:      "Total number of puts seen by this member.",
 		})
-
 	// TODO: remove in 3.5 release
 	putCounterDebug = prometheus.NewCounter(
 		prometheus.CounterOpts{
@@ -53,7 +52,6 @@ var (
 			Name:      "delete_total",
 			Help:      "Total number of deletes seen by this member.",
 		})
-
 	// TODO: remove in 3.5 release
 	deleteCounterDebug = prometheus.NewCounter(
 		prometheus.CounterOpts{
@@ -180,21 +178,21 @@ var (
 	reportDbTotalSizeInBytes   = func() float64 { return 0 }
 
 	// TODO: remove this in v3.5
-	dbTotalSizeDebugging = prometheus.NewGaugeFunc(prometheus.GaugeOpts{
+	dbTotalSizeDebug = prometheus.NewGaugeFunc(prometheus.GaugeOpts{
 		Namespace: "etcd_debugging",
 		Subsystem: "mvcc",
 		Name:      "db_total_size_in_bytes",
 		Help:      "Total size of the underlying database physically allocated in bytes.",
 	},
 		func() float64 {
-			reportDbTotalSizeInBytesDebuggingMu.RLock()
-			defer reportDbTotalSizeInBytesDebuggingMu.RUnlock()
-			return reportDbTotalSizeInBytesDebugging()
+			reportDbTotalSizeInBytesDebugMu.RLock()
+			defer reportDbTotalSizeInBytesDebugMu.RUnlock()
+			return reportDbTotalSizeInBytesDebug()
 		},
 	)
 	// overridden by mvcc initialization
-	reportDbTotalSizeInBytesDebuggingMu sync.RWMutex
-	reportDbTotalSizeInBytesDebugging   = func() float64 { return 0 }
+	reportDbTotalSizeInBytesDebugMu sync.RWMutex
+	reportDbTotalSizeInBytesDebug   = func() float64 { return 0 }
 
 	dbTotalSizeInUse = prometheus.NewGaugeFunc(prometheus.GaugeOpts{
 		Namespace: "etcd",
@@ -257,7 +255,9 @@ var (
 func init() {
 	prometheus.MustRegister(rangeCounter)
 	prometheus.MustRegister(putCounter)
+	prometheus.MustRegister(putCounterDebug)
 	prometheus.MustRegister(deleteCounter)
+	prometheus.MustRegister(deleteCounterDebug)
 	prometheus.MustRegister(txnCounter)
 	prometheus.MustRegister(keysGauge)
 	prometheus.MustRegister(watchStreamGauge)
@@ -270,7 +270,7 @@ func init() {
 	prometheus.MustRegister(dbCompactionTotalMs)
 	prometheus.MustRegister(dbCompactionKeysCounter)
 	prometheus.MustRegister(dbTotalSize)
-	prometheus.MustRegister(dbTotalSizeDebugging)
+	prometheus.MustRegister(dbTotalSizeDebug)
 	prometheus.MustRegister(dbTotalSizeInUse)
 	prometheus.MustRegister(dbOpenReadTxN)
 	prometheus.MustRegister(hashSec)
diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go
index e882f2b36..a8f06ca5e 100644
--- a/mvcc/metrics_txn.go
+++ b/mvcc/metrics_txn.go
@@ -52,10 +52,12 @@ func (tw *metricsTxnWrite) End() {
 		txnCounter.Inc()
 	}
 	rangeCounter.Add(float64(tw.ranges))
-	putCounter.Add(float64(tw.puts))
-	// TODO: remove in 3.5 release
-	putCounterDebug.Add(float64(tw.puts))
-	deleteCounter.Add(float64(tw.deletes))
-	// TODO: remove in 3.5 release
-	deleteCounterDebug.Add(float64(tw.deletes))
+
+	puts := float64(tw.puts)
+	putCounter.Add(puts)
+	putCounterDebug.Add(puts)
+
+	deletes := float64(tw.deletes)
+	deleteCounter.Add(deletes)
+	deleteCounterDebug.Add(deletes)
 }