Merge #145113

145113: drpc,bazel: add protoc-gen-go-drpc compiler and integrate with Bazel/Gazelle r=rickystewart,cthumuluru-crdb a=shubhamdhama

This change introduces Bazel build support for generating DRPC Go code from
.proto files using the `protoc-gen-go-drpc` plugin.

We define a new `go_proto_compiler` target for DRPC. A key part of
making this work alongside our existing gogo/gRPC compiler was setting
`suffix = "_drpc.pb.go"`. This explicitly tells the `rules_go` build
system that this plugin generates files with a different pattern than
the default `.pb.go`, which avoids the "conflicting action" errors
Bazel threw when it thought both compilers were trying to create the
same base file.

The new DRPC compiler uses the ``@io_storj_drpc//cmd/protoc-gen-go-drpc``
pre-built binary target  and passes the necessary options
(`paths=source_relative`, `protolib=github.com/gogo/protobuf`) for
compatibility with the existing gogo/protobuf message types. Dependencies
required by the generated DRPC code (``@io_storj_drpc//...`)` are also
included.

To automate integration, the new DRPC compiler is added to the list in the
`# gazelle:go_grpc_compilers` directive in the root `BUILD.bazel`. Gazelle
will now add both the gogo/gRPC compiler and the DRPC compiler to relevant
`go_proto_library` rules across the codebase.

Note: For .proto files without service definitions, this compiler will be
invoked but may produce empty `_drpc.pb.go` files, which is expected.

Fixes: #145177
Fixes: #145178

Release note: none
Epic: CRDB-48934

Co-authored-by: Shubham Dhama <[email protected]>

Author: craig[bot]

BUILD.bazel

@@ -33,7 +33,7 @@ exports_files([
 # gazelle:proto default
 # gazelle:proto_group go_package
 # gazelle:go_proto_compilers //pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_compiler
-# gazelle:go_grpc_compilers //pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler
+# gazelle:go_grpc_compilers //pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler,//pkg/cmd/protoc-gen-go-drpc:protoc-gen-go-drpc_compiler
 
 # Gazelle needs the following resolve hints.
 #

DEPS.bzl

@@ -11529,10 +11529,10 @@ def go_deps():
         name = "io_storj_drpc",
         build_file_proto_mode = "disable_global",
         importpath = "storj.io/drpc",
-        sha256 = "a0ab0c1a3f55576bfb4fa7b03902a7a462e7296c4b1da67e851ff03cda79c3f4",
-        strip_prefix = "github.com/cockroachdb/[email protected]20240709171858-0075ac871661",
+        sha256 = "60246f2907c40615808e4a5af2f6d58a5248802f57a4b7b55dfb03ee5b779b3b",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250507084558-a793c5c40d3d",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20240709171858-0075ac871661.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20250507084558-a793c5c40d3d.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -359,7 +359,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlfmt/com_github_cockroachdb_crlfmt-v0.0.0-20221214225007-b2fc5c302548.zip": "fedc01bdd6d964da0425d5eaac8efadc951e78e13f102292cc0774197f09ab63",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20241205160938-4a90b184f49c.zip": "1afc910b4ff270de79eecb42ab7bd5e6404e6128666c6c55e96db9e27d28e69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.3-0.20250407164829-2945557346d5.zip": "251593cd9c040fe84a99a3919de7ce6f85030d522159a37d625dc2dea7a4d17f",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20240709171858-0075ac871661.zip": "a0ab0c1a3f55576bfb4fa7b03902a7a462e7296c4b1da67e851ff03cda79c3f4",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20250507084558-a793c5c40d3d.zip": "60246f2907c40615808e4a5af2f6d58a5248802f57a4b7b55dfb03ee5b779b3b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.12.0.zip": "f73d8a5f4d8fcbc4ed61db2b47f17e2601d8b32e9a49c0665667489d9d9d6e7c",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241216150617-2358cdb156a1.zip": "bf052c9a7f9e23fb3ec7e9f3b7201cfc264c18ed6da0d662952d276dbc339003",

go.mod

@@ -506,7 +506,7 @@ replace golang.org/x/time => github.com/cockroachdb/x-time v0.3.1-0.202305251236
 
 replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1
 
-replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20240709171858-0075ac871661
+replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20250507084558-a793c5c40d3d
 
 // Note: This forked dependency adds a commit that opens up some
 // private APIs to enable us to make some perf improvements to

go.sum

@@ -581,8 +581,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
 github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5 h1:UycK/E0TkisVrQbSoxvU827FwgBBcZ95nRRmpj/12QI=
 github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5/go.mod h1:jsaKMvD3RBCATk1/jbUZM8C9idWBJME9+VRZ5+Liq1g=
-github.com/cockroachdb/drpc v0.0.0-20240709171858-0075ac871661 h1:XKvrb75NgYqEvaJvsNohIweDeM0y8cmf0pOpLVZGbsM=
-github.com/cockroachdb/drpc v0.0.0-20240709171858-0075ac871661/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
+github.com/cockroachdb/drpc v0.0.0-20250507084558-a793c5c40d3d h1:O43v15qZJIut4hLBaYfuK9gnm9eWpto2Qj/Q6MZeLTY=
+github.com/cockroachdb/drpc v0.0.0-20250507084558-a793c5c40d3d/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
 github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk=
 github.com/cockroachdb/errors v1.12.0 h1:d7oCs6vuIMUQRVbi6jWWWEJZahLCfJpnJSVobd1/sUo=
 github.com/cockroachdb/errors v1.12.0/go.mod h1:SvzfYNNBshAVbZ8wzNc/UPK3w1vf0dKDUP41ucAIf7g=

pkg/blobs/blobspb/BUILD.bazel

@@ -11,7 +11,10 @@ proto_library(
 
 go_proto_library(
     name = "blobspb_go_proto",
-    compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler"],
+    compilers = [
+        "//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+        "//pkg/cmd/protoc-gen-go-drpc:protoc-gen-go-drpc_compiler",
+    ],
     importpath = "github.com/cockroachdb/cockroach/pkg/blobs/blobspb",
     proto = ":blobspb_proto",
     visibility = ["//visibility:public"],

pkg/ccl/sqlproxyccl/tenant/BUILD.bazel

@@ -15,7 +15,10 @@ proto_library(
 
 go_proto_library(
     name = "tenant_go_proto",
-    compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler"],
+    compilers = [
+        "//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+        "//pkg/cmd/protoc-gen-go-drpc:protoc-gen-go-drpc_compiler",
+    ],
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/sqlproxyccl/tenant",
     proto = ":tenant_proto",
     visibility = ["//visibility:public"],

pkg/cmd/protoc-gen-go-drpc/BUILD.bazel

@@ -0,0 +1,19 @@
+load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
+
+go_proto_compiler(
+    name = "protoc-gen-go-drpc_compiler",
+    options = [
+        "paths=source_relative",
+        "protolib=github.com/gogo/protobuf",
+    ],
+    plugin = "@io_storj_drpc//cmd/protoc-gen-go-drpc",
+    suffix = "_drpc.pb.go",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@com_github_cockroachdb_errors//:errors",
+        "@com_github_gogo_protobuf//jsonpb",
+        "@com_github_gogo_protobuf//proto",
+        "@io_storj_drpc//:drpc",
+        "@io_storj_drpc//drpcerr",
+    ],
+)

pkg/gossip/BUILD.bazel

@@ -105,7 +105,10 @@ proto_library(
 
 go_proto_library(
     name = "gossip_go_proto",
-    compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler"],
+    compilers = [
+        "//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+        "//pkg/cmd/protoc-gen-go-drpc:protoc-gen-go-drpc_compiler",
+    ],
     importpath = "github.com/cockroachdb/cockroach/pkg/gossip",
     proto = ":gossip_proto",
     visibility = ["//visibility:public"],

pkg/inspectz/inspectzpb/BUILD.bazel

@@ -15,7 +15,10 @@ proto_library(
 
 go_proto_library(
     name = "inspectzpb_go_proto",
-    compilers = ["//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler"],
+    compilers = [
+        "//pkg/cmd/protoc-gen-gogoroach:protoc-gen-gogoroach_grpc_compiler",
+        "//pkg/cmd/protoc-gen-go-drpc:protoc-gen-go-drpc_compiler",
+    ],
     importpath = "github.com/cockroachdb/cockroach/pkg/inspectz/inspectzpb",
     proto = ":inspectzpb_proto",
     visibility = ["//visibility:public"],