From 3f12ffb4905f47b84c25eaa478e2dec36b509254 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <leegyuho@amazon.com>
Date: Thu, 1 Aug 2019 14:09:48 -0700
Subject: [PATCH] mvcc: add "etcd_mvcc_range_total", "etcd_mvcc_txn_total"

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
---
 mvcc/metrics.go     | 16 ++++++++++++++++
 mvcc/metrics_txn.go |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mvcc/metrics.go b/mvcc/metrics.go
index 82e9e3deefe8..9bcbc8fe3cff 100644
--- a/mvcc/metrics.go
+++ b/mvcc/metrics.go
@@ -22,6 +22,13 @@ import (
 
 var (
 	rangeCounter = prometheus.NewCounter(
+		prometheus.CounterOpts{
+			Namespace: "etcd",
+			Subsystem: "mvcc",
+			Name:      "range_total",
+			Help:      "Total number of ranges seen by this member.",
+		})
+	rangeCounterDebug = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: "etcd_debugging",
 			Subsystem: "mvcc",
@@ -62,6 +69,13 @@ var (
 		})
 
 	txnCounter = prometheus.NewCounter(
+		prometheus.CounterOpts{
+			Namespace: "etcd",
+			Subsystem: "mvcc",
+			Name:      "txn_total",
+			Help:      "Total number of txns seen by this member.",
+		})
+	txnCounterDebug = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: "etcd_debugging",
 			Subsystem: "mvcc",
@@ -254,11 +268,13 @@ var (
 
 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)
diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go
index a8f06ca5ecaf..270903c1836d 100644
--- a/mvcc/metrics_txn.go
+++ b/mvcc/metrics_txn.go
@@ -50,8 +50,12 @@ func (tw *metricsTxnWrite) End() {
 	defer tw.TxnWrite.End()
 	if sum := tw.ranges + tw.puts + tw.deletes; sum > 1 {
 		txnCounter.Inc()
+		txnCounterDebug.Inc()
 	}
-	rangeCounter.Add(float64(tw.ranges))
+
+	ranges := float64(tw.ranges)
+	rangeCounter.Add(ranges)
+	rangeCounterDebug.Add(ranges)
 
 	puts := float64(tw.puts)
 	putCounter.Add(puts)