kv: timeutil.Now -> crtime.NowMono conversions

Epic: none
Release note: None

Author: stevendanna

pkg/kv/kvclient/kvcoord/dist_sender_mux_rangefeed.go

@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
+	"github.com/cockroachdb/crlib/crtime"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/logtags"
 )
@@ -67,9 +68,9 @@ func muxRangeFeed(
 ) (retErr error) {
 	if log.V(1) {
 		log.KvExec.Infof(ctx, "Establishing MuxRangeFeed (%s...; %d spans)", spans[0], len(spans))
-		start := timeutil.Now()
+		start := crtime.NowMono()
 		defer func() {
-			log.KvExec.Infof(ctx, "MuxRangeFeed terminating after %s with err=%v", timeutil.Since(start), retErr)
+			log.KvExec.Infof(ctx, "MuxRangeFeed terminating after %s with err=%v", start.Elapsed(), retErr)
 		}()
 	}
 
@@ -382,10 +383,10 @@ func (m *rangefeedMuxer) startNodeMuxRangeFeed(
 
 	if log.V(1) {
 		log.KvExec.Infof(ctx, "Establishing MuxRangeFeed to node %d", nodeID)
-		start := timeutil.Now()
+		start := crtime.NowMono()
 		defer func() {
 			log.KvExec.Infof(ctx, "MuxRangeFeed to node %d terminating after %s with err=%v",
-				nodeID, timeutil.Since(start), retErr)
+				nodeID, start.Elapsed(), retErr)
 		}()
 	}
 

pkg/kv/kvclient/rangefeed/BUILD.bazel

@@ -29,7 +29,7 @@ go_library(
         "//pkg/util/retry",
         "//pkg/util/span",
         "//pkg/util/stop",
-        "//pkg/util/timeutil",
+        "@com_github_cockroachdb_crlib//crtime",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_logtags//:logtags",
         "@com_github_cockroachdb_redact//:redact",

pkg/kv/kvclient/rangefeed/rangefeed.go

@@ -26,7 +26,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/cockroach/pkg/util/span"
 	"github.com/cockroachdb/cockroach/pkg/util/stop"
-	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
+	"github.com/cockroachdb/crlib/crtime"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/logtags"
 	"github.com/cockroachdb/redact"
@@ -361,7 +361,7 @@ func (f *RangeFeed) run(ctx context.Context, frontier span.Frontier, resumeWithF
 			log.Eventf(ctx, "starting rangefeed from %v on %v", ts, f.spansDebugStr)
 		}
 
-		start := timeutil.Now()
+		start := crtime.NowMono()
 
 		rangeFeedTask := func(ctx context.Context) error {
 			if f.invoker == nil {
@@ -410,7 +410,7 @@ func (f *RangeFeed) run(ctx context.Context, frontier span.Frontier, resumeWithF
 			return
 		}
 
-		ranFor := timeutil.Since(start)
+		ranFor := start.Elapsed()
 		log.VEventf(ctx, 1, "restarting rangefeed for %v after %v",
 			f.spansDebugStr, ranFor)
 		if f.knobs != nil && f.knobs.OnRangefeedRestart != nil {

pkg/kv/kvserver/rangefeed/buffered_registration.go

@@ -16,7 +16,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
-	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
+	"github.com/cockroachdb/crlib/crtime"
 	"github.com/cockroachdb/errors"
 )
 
@@ -304,10 +304,10 @@ func (br *bufferedRegistration) maybeRunCatchUpScan(ctx context.Context) error {
 	if catchUpIter == nil {
 		return nil
 	}
-	start := timeutil.Now()
+	start := crtime.NowMono()
 	defer func() {
 		catchUpIter.Close()
-		br.metrics.RangeFeedCatchUpScanNanos.Inc(timeutil.Since(start).Nanoseconds())
+		br.metrics.RangeFeedCatchUpScanNanos.Inc(start.Elapsed().Nanoseconds())
 	}()
 
 	return catchUpIter.CatchUpScan(ctx, br.stream.SendUnbuffered, br.withDiff, br.withFiltering, br.withOmitRemote, br.bulkDelivery)

pkg/kv/kvserver/rangefeed/unbuffered_registration.go

@@ -14,7 +14,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil"
-	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/crlib/crtime"
 	"github.com/cockroachdb/errors"
 )
@@ -359,10 +358,10 @@ func (ubr *unbufferedRegistration) maybeRunCatchUpScan(ctx context.Context) erro
 	if catchUpIter == nil {
 		return nil
 	}
-	start := timeutil.Now()
+	start := crtime.NowMono()
 	defer func() {
 		catchUpIter.Close()
-		ubr.metrics.RangeFeedCatchUpScanNanos.Inc(timeutil.Since(start).Nanoseconds())
+		ubr.metrics.RangeFeedCatchUpScanNanos.Inc(start.Elapsed().Nanoseconds())
 	}()
 
 	return catchUpIter.CatchUpScan(ctx, ubr.stream.SendUnbuffered, ubr.withDiff, ubr.withFiltering,

pkg/kv/kvserver/replica_rangefeed.go

@@ -33,6 +33,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/syncutil/singleflight"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/uuid"
+	"github.com/cockroachdb/crlib/crtime"
 	"github.com/cockroachdb/errors"
 )
 
@@ -414,9 +415,9 @@ func (r *Replica) updateRangefeedFilterLocked() bool {
 // to believe that is blocks the raftMu in practice.
 func logSlowRangefeedRegistration(ctx context.Context) func() {
 	const slowRaftMuWarnThreshold = 20 * time.Millisecond
-	start := timeutil.Now()
+	start := crtime.NowMono()
 	return func() {
-		elapsed := timeutil.Since(start)
+		elapsed := start.Elapsed()
 		if elapsed >= slowRaftMuWarnThreshold {
 			log.KvDistribution.Warningf(ctx, "rangefeed registration took %s", elapsed)
 		}