store/tikv: remove tidb/metrics from store/tikv/oracles (pingcap#23418)

Yui-Song · Mar 23, 2021 · e6576d4 · e6576d4
1 parent d7883fe
commit e6576d4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 33 deletions.
diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -137,7 +137,6 @@ func RegisterMetrics() {
 	prometheus.MustRegister(GCRegionTooManyLocksCounter)
 	prometheus.MustRegister(GCWorkerCounter)
 	prometheus.MustRegister(GCUnsafeDestroyRangeFailuresCounterVec)
-	prometheus.MustRegister(TSFutureWaitDuration)
 	prometheus.MustRegister(TotalQueryProcHistogram)
 	prometheus.MustRegister(TotalCopProcHistogram)
 	prometheus.MustRegister(TotalCopWaitHistogram)

diff --git a/metrics/oracles.go b/metrics/oracles.go
diff --git a/store/tikv/metrics/metrics.go b/store/tikv/metrics/metrics.go
@@ -54,6 +54,7 @@ var (
 	TiKVGRPCConnTransientFailureCounter    *prometheus.CounterVec
 	TiKVPanicCounter                       *prometheus.CounterVec
 	TiKVForwardRequestCounter              *prometheus.CounterVec
+	TiKVTSFutureWaitDuration               prometheus.Histogram
 )
 
 // Label constants.
@@ -384,6 +385,15 @@ func initMetrics(namespace, subsystem string) {
 			Help:      "Counter of tikv request being forwarded through another node",
 		}, []string{LblFromStore, LblToStore, LblType, LblResult})
 
+	TiKVTSFutureWaitDuration = prometheus.NewHistogram(
+		prometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Name:      "ts_future_wait_seconds",
+			Help:      "Bucketed histogram of seconds cost for waiting timestamp future.",
+			Buckets:   prometheus.ExponentialBuckets(0.000005, 2, 30), // 5us ~ 2560s
+		})
+
 	initShortcuts()
 }
 
@@ -436,4 +446,5 @@ func RegisterMetrics() {
 	prometheus.MustRegister(TiKVGRPCConnTransientFailureCounter)
 	prometheus.MustRegister(TiKVPanicCounter)
 	prometheus.MustRegister(TiKVForwardRequestCounter)
+	prometheus.MustRegister(TiKVTSFutureWaitDuration)
 }
diff --git a/store/tikv/oracle/oracles/pd.go b/store/tikv/oracle/oracles/pd.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
-	"github.com/pingcap/tidb/metrics"
 	"github.com/pingcap/tidb/store/tikv/logutil"
+	"github.com/pingcap/tidb/store/tikv/metrics"
 	"github.com/pingcap/tidb/store/tikv/oracle"
 	pd "github.com/tikv/pd/client"
 	"go.uber.org/zap"
@@ -93,7 +93,7 @@ type tsFuture struct {
 func (f *tsFuture) Wait() (uint64, error) {
 	now := time.Now()
 	physical, logical, err := f.TSFuture.Wait()
-	metrics.TSFutureWaitDuration.Observe(time.Since(now).Seconds())
+	metrics.TiKVTSFutureWaitDuration.Observe(time.Since(now).Seconds())
 	if err != nil {
 		return 0, errors.Trace(err)
 	}