From 948e32ae159242ddb235ea9035e5b91950891644 Mon Sep 17 00:00:00 2001
From: Piotr Tabor <ptab@google.com>
Date: Fri, 12 Mar 2021 16:30:47 +0100
Subject: [PATCH] Delete etcd_debug metrics scheduled for deletion in 3.5.

---
 server/mvcc/metrics.go     | 40 --------------------------------------
 server/mvcc/metrics_txn.go |  3 ---
 2 files changed, 43 deletions(-)

diff --git a/server/mvcc/metrics.go b/server/mvcc/metrics.go
index 580e66fd8..f28d114e2 100644
--- a/server/mvcc/metrics.go
+++ b/server/mvcc/metrics.go
@@ -43,14 +43,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{
-			Namespace: "etcd_debugging",
-			Subsystem: "mvcc",
-			Name:      "put_total",
-			Help:      "Total number of puts seen by this member.",
-		})
 
 	deleteCounter = prometheus.NewCounter(
 		prometheus.CounterOpts{
@@ -59,14 +51,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{
-			Namespace: "etcd_debugging",
-			Subsystem: "mvcc",
-			Name:      "delete_total",
-			Help:      "Total number of deletes seen by this member.",
-		})
 
 	txnCounter = prometheus.NewCounter(
 		prometheus.CounterOpts{
@@ -75,13 +59,6 @@ var (
 			Name:      "txn_total",
 			Help:      "Total number of txns seen by this member.",
 		})
-	txnCounterDebug = prometheus.NewCounter(
-		prometheus.CounterOpts{
-			Namespace: "etcd_debugging",
-			Subsystem: "mvcc",
-			Name:      "txn_total",
-			Help:      "Total number of txns seen by this member.",
-		})
 
 	keysGauge = prometheus.NewGauge(
 		prometheus.GaugeOpts{
@@ -199,19 +176,6 @@ var (
 	reportDbTotalSizeInBytesMu sync.RWMutex
 	reportDbTotalSizeInBytes   = func() float64 { return 0 }
 
-	// TODO: remove this in v3.5
-	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 {
-			reportDbTotalSizeInBytesDebugMu.RLock()
-			defer reportDbTotalSizeInBytesDebugMu.RUnlock()
-			return reportDbTotalSizeInBytesDebug()
-		},
-	)
 	// overridden by mvcc initialization
 	reportDbTotalSizeInBytesDebugMu sync.RWMutex
 	reportDbTotalSizeInBytesDebug   = func() float64 { return 0 }
@@ -318,11 +282,8 @@ func init() {
 	prometheus.MustRegister(rangeCounter)
 	prometheus.MustRegister(rangeCounterDebug)
 	prometheus.MustRegister(putCounter)
-	prometheus.MustRegister(putCounterDebug)
 	prometheus.MustRegister(deleteCounter)
-	prometheus.MustRegister(deleteCounterDebug)
 	prometheus.MustRegister(txnCounter)
-	prometheus.MustRegister(txnCounterDebug)
 	prometheus.MustRegister(keysGauge)
 	prometheus.MustRegister(watchStreamGauge)
 	prometheus.MustRegister(watcherGauge)
@@ -335,7 +296,6 @@ func init() {
 	prometheus.MustRegister(dbCompactionLast)
 	prometheus.MustRegister(dbCompactionKeysCounter)
 	prometheus.MustRegister(dbTotalSize)
-	prometheus.MustRegister(dbTotalSizeDebug)
 	prometheus.MustRegister(dbTotalSizeInUse)
 	prometheus.MustRegister(dbOpenReadTxN)
 	prometheus.MustRegister(hashSec)
diff --git a/server/mvcc/metrics_txn.go b/server/mvcc/metrics_txn.go
index d4a90eed5..af844f846 100644
--- a/server/mvcc/metrics_txn.go
+++ b/server/mvcc/metrics_txn.go
@@ -57,7 +57,6 @@ func (tw *metricsTxnWrite) End() {
 	defer tw.TxnWrite.End()
 	if sum := tw.ranges + tw.puts + tw.deletes; sum > 1 {
 		txnCounter.Inc()
-		txnCounterDebug.Inc() // TODO: remove in 3.5 release
 	}
 
 	ranges := float64(tw.ranges)
@@ -66,10 +65,8 @@ func (tw *metricsTxnWrite) End() {
 
 	puts := float64(tw.puts)
 	putCounter.Add(puts)
-	putCounterDebug.Add(puts) // TODO: remove in 3.5 release
 	totalPutSizeGauge.Add(float64(tw.putSize))
 
 	deletes := float64(tw.deletes)
 	deleteCounter.Add(deletes)
-	deleteCounterDebug.Add(deletes) // TODO: remove in 3.5 release
 }