Merge #147640

147640: *: move rpc `connection_class` to `rpcbase` package r=cthumuluru-crdb a=cthumuluru-crdb

Moving `connection_class` to the `rpcbase` package prevents cyclic dependencies with the `DRPC` integration.

Epic: [CRDB-48923](https://cockroachlabs.atlassian.net/browse/CRDB-48923)
Informs: #147757
Release note: none

Co-authored-by: Chandra Thumuluru <[email protected]>

Author: craig[bot]

pkg/BUILD.bazel

@@ -1700,6 +1700,8 @@ GO_TARGETS = [
     "//pkg/roachprod:roachprod_test",
     "//pkg/rpc/nodedialer:nodedialer",
     "//pkg/rpc/nodedialer:nodedialer_test",
+    "//pkg/rpc/rpcbase:base",
+    "//pkg/rpc/rpcbase:rpcbase",
     "//pkg/rpc/rpcpb:rpcpb",
     "//pkg/rpc:rpc",
     "//pkg/rpc:rpc_test",

pkg/blobs/BUILD.bazel

@@ -15,8 +15,8 @@ go_library(
         "//pkg/base",
         "//pkg/blobs/blobspb",
         "//pkg/roachpb",
-        "//pkg/rpc",
         "//pkg/rpc/nodedialer",
+        "//pkg/rpc/rpcbase",
         "//pkg/util/fileutil",
         "//pkg/util/grpcutil",
         "//pkg/util/ioctx",

pkg/blobs/client.go

@@ -12,8 +12,8 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/blobs/blobspb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/rpc"
 	"github.com/cockroachdb/cockroach/pkg/rpc/nodedialer"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/util/ioctx"
 	"github.com/cockroachdb/errors"
 	"google.golang.org/grpc/metadata"
@@ -200,7 +200,7 @@ func NewBlobClientFactory(
 		if localNodeID == dialTarget && allowLocalFastpath {
 			return NewLocalClient(externalIODir)
 		}
-		conn, err := dialer.Dial(ctx, dialTarget, rpc.DefaultClass)
+		conn, err := dialer.Dial(ctx, dialTarget, rpcbase.DefaultClass)
 		if err != nil {
 			return nil, errors.Wrapf(err, "connecting to node %d", dialTarget)
 		}

pkg/ccl/changefeedccl/kvfeed/BUILD.bazel

@@ -22,7 +22,7 @@ go_library(
         "//pkg/kv/kvclient/kvcoord",
         "//pkg/kv/kvpb",
         "//pkg/roachpb",
-        "//pkg/rpc",
+        "//pkg/rpc/rpcbase",
         "//pkg/settings",
         "//pkg/settings/cluster",
         "//pkg/sql/covering",

pkg/ccl/changefeedccl/kvfeed/scanner.go

@@ -18,7 +18,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/settings"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/covering"
@@ -196,7 +196,7 @@ func (p *scanRequestScanner) exportSpan(
 		r := kvpb.NewScan(remaining.Key, remaining.EndKey).(*kvpb.ScanRequest)
 		r.ScanFormat = kvpb.BATCH_RESPONSE
 		b.Header.TargetBytes = targetBytesPerScan
-		b.Header.ConnectionClass = rpc.RangefeedClass
+		b.Header.ConnectionClass = rpcbase.RangefeedClass
 		b.AdmissionHeader = kvpb.AdmissionHeader{
 			// TODO(irfansharif): Make this configurable if we want system table
 			// scanners or support "high priority" changefeeds to run at higher

pkg/ccl/multiregionccl/BUILD.bazel

@@ -65,6 +65,7 @@ go_test(
         "//pkg/kv/kvserver/closedts/ctpb",
         "//pkg/roachpb",
         "//pkg/rpc",
+        "//pkg/rpc/rpcbase",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
         "//pkg/server",

pkg/ccl/multiregionccl/cold_start_latency_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/keys"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/spanconfig"
@@ -86,7 +87,7 @@ func TestColdStartLatency(t *testing.T) {
 				InjectedLatencyOracle:  regionlatency.MakeAddrMap(),
 				InjectedLatencyEnabled: latencyEnabled.Load,
 				UnaryClientInterceptor: func(
-					target string, class rpc.ConnectionClass,
+					target string, class rpcbase.ConnectionClass,
 				) grpc.UnaryClientInterceptor {
 					return func(
 						ctx context.Context, method string, req, reply interface{},
@@ -200,7 +201,7 @@ COMMIT;`}
 					InjectedLatencyOracle,
 				InjectedLatencyEnabled: latencyEnabled.Load,
 				StreamClientInterceptor: func(
-					target string, class rpc.ConnectionClass,
+					target string, class rpcbase.ConnectionClass,
 				) grpc.StreamClientInterceptor {
 					return func(
 						ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn,
@@ -231,7 +232,7 @@ COMMIT;`}
 						}, nil
 					}
 				},
-				UnaryClientInterceptor: func(target string, class rpc.ConnectionClass) grpc.UnaryClientInterceptor {
+				UnaryClientInterceptor: func(target string, class rpcbase.ConnectionClass) grpc.UnaryClientInterceptor {
 					var nodeID int
 					if nodeIDPtr, ok := addrsToNodeIDs.Load(target); ok {
 						nodeID = *nodeIDPtr

pkg/ccl/serverccl/statusccl/BUILD.bazel

@@ -19,7 +19,7 @@ go_test(
         "//pkg/keys",
         "//pkg/kv/kvserver",
         "//pkg/roachpb",
-        "//pkg/rpc",
+        "//pkg/rpc/rpcbase",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
         "//pkg/server",

pkg/ccl/serverccl/statusccl/tenant_grpc_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/rpc"
+	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlstats"
 	"github.com/cockroachdb/cockroach/pkg/sql/sqlstats/persistedsqlstats/sqlstatstestutil"
@@ -132,7 +132,7 @@ func TestTenantGRPCServices(t *testing.T) {
 		rpcCtx := tenant2.RPCContext()
 
 		nodeID := roachpb.NodeID(tenant.SQLInstanceID())
-		conn, err := rpcCtx.GRPCDialNode(grpcAddr, nodeID, roachpb.Locality{}, rpc.DefaultClass).Connect(ctx)
+		conn, err := rpcCtx.GRPCDialNode(grpcAddr, nodeID, roachpb.Locality{}, rpcbase.DefaultClass).Connect(ctx)
 		require.NoError(t, err)
 
 		client := serverpb.NewStatusClient(conn)
@@ -146,7 +146,7 @@ func TestTenantGRPCServices(t *testing.T) {
 		grpcAddr := server.RPCAddr()
 		rpcCtx := tenant.RPCContext()
 
-		conn, err := rpcCtx.GRPCDialNode(grpcAddr, server.NodeID(), roachpb.Locality{}, rpc.DefaultClass).Connect(ctx)
+		conn, err := rpcCtx.GRPCDialNode(grpcAddr, server.NodeID(), roachpb.Locality{}, rpcbase.DefaultClass).Connect(ctx)
 		require.NoError(t, err)
 
 		client := serverpb.NewStatusClient(conn)

pkg/gossip/BUILD.bazel

@@ -26,6 +26,7 @@ go_library(
         "//pkg/roachpb",
         "//pkg/rpc",
         "//pkg/rpc/nodedialer",
+        "//pkg/rpc/rpcbase",
         "//pkg/util",
         "//pkg/util/errorutil",
         "//pkg/util/grpcutil",