kvserver: add some logscopes

pkg/kv/kvserver/client_merge_test.go

@@ -4049,6 +4049,7 @@ func sendWithTxn(
 // time, but don't contain the subsumption time in their uncertainty interval.
 func TestHistoricalReadsAfterSubsume(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 	ctx := context.Background()
 
 	maxOffset := 100 * time.Millisecond
@@ -4136,6 +4137,7 @@ func TestHistoricalReadsAfterSubsume(t *testing.T) {
 // Regression test for #52517.
 func TestStoreBlockTransferLeaseRequestAfterSubsumption(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()
 	numNodes := 2

pkg/kv/kvserver/client_replica_test.go

@@ -1710,6 +1710,7 @@ func TestErrorHandlingForNonKVCommand(t *testing.T) {
 // figuring out what info to return to the client.
 func TestRangeInfoAfterSplit(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 	ctx := context.Background()
 	s, _, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(ctx)
@@ -3354,6 +3355,7 @@ func TestProposalOverhead(t *testing.T) {
 //   concurrency/testdata/concurrency_manager/discover_lock_after_lease_race
 func TestDiscoverIntentAcrossLeaseTransferAwayAndBack(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 	ctx := context.Background()
 
 	// Use a manual clock so we can efficiently force leases to expire.

pkg/kv/kvserver/client_tenant_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
+	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/metric"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/uuid"
@@ -50,6 +51,7 @@ import (
 // TODO(ajwerner): add a test for 2).
 func TestTenantsStorageMetricsOnSplit(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	s, _, db := serverutils.StartServer(t, base.TestServerArgs{})
 
@@ -140,6 +142,7 @@ func TestTenantsStorageMetricsOnSplit(t *testing.T) {
 // and report the correct metrics.
 func TestTenantRateLimiter(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	// This test utilizes manual time to make the rate-limiting calculations more
 	// obvious. This timesource is not used inside the actual database.

pkg/kv/kvserver/metrics_test.go

@@ -20,13 +20,15 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
+	"github.com/cockroachdb/cockroach/pkg/util/log"
 )
 
 // TestTenantsStorageMetricsConcurrency exercises the concurrency logic of the
 // TenantsStorageMetrics and ensures that none of the assertions are hit.
 // The test doesn't meaningfully exercise the logic which is tested elsewhere.
 func TestTenantsStorageMetricsConcurrency(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
 
 	const (
 		tenants  = 3