From 04598f2c469af0eb7ab9fcc879dfc2951a47a290 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Fri, 29 Nov 2024 14:23:54 +0100 Subject: [PATCH 01/15] rpc: add BenchmarkGRPCPing This benchmarks simple unary requests across a gRPC server with CockroachDB-specific settings (snappy compression, etc). --- pkg/rpc/context_test.go | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/pkg/rpc/context_test.go b/pkg/rpc/context_test.go index 0eda6956f1cc..e062f93208e4 100644 --- a/pkg/rpc/context_test.go +++ b/pkg/rpc/context_test.go @@ -7,6 +7,7 @@ package rpc import ( "context" + "crypto/rand" "fmt" "io" "net" @@ -2230,3 +2231,58 @@ func TestInitialHeartbeatFailedError(t *testing.T) { return err }) } + +type benchmarkHeartbeatService struct { + resp *PingResponse +} + +func (b *benchmarkHeartbeatService) Ping( + ctx context.Context, request *PingRequest, +) (*PingResponse, error) { + if b.resp == nil { + b.resp = &PingResponse{} + } + return b.resp, nil +} + +func BenchmarkGRPCPing(b *testing.B) { + stopper := stop.NewStopper() + ctx := context.Background() + defer stopper.Stop(ctx) + + clock := &timeutil.DefaultTimeSource{} + maxOffset := 250 * time.Millisecond + srvRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) + const serverNodeID = 1 + srvRPCCtx.NodeID.Set(ctx, serverNodeID) + s := newTestServer(b, srvRPCCtx) + + randBytes := make([]byte, 200) + _, err := rand.Read(randBytes) + require.NoError(b, err) + + req := &PingRequest{Ping: string(randBytes)} + resp := &PingResponse{Pong: string(randBytes)} + RegisterHeartbeatServer(s, &benchmarkHeartbeatService{resp: resp}) + ln, err := netutil.ListenAndServeGRPC(srvRPCCtx.Stopper, s, util.TestAddr) + if err != nil { + b.Fatal(err) + } + remoteAddr := ln.Addr().String() + + cliRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) + cliRPCCtx.NodeID.Set(ctx, 2) + cc, err := cliRPCCtx.grpcDialRaw(ctx, remoteAddr, DefaultClass) + require.NoError(b, err) + hb := NewHeartbeatClient(cc) + _, err = hb.Ping(ctx, req) // warm-up + require.NoError(b, err) + + b.ResetTimer() + defer b.StopTimer() + for i := 0; i < b.N; i++ { + if _, err := hb.Ping(ctx, req); err != nil { + b.Fatal(err) + } + } +} From 4e53233fb99d423ebdc48e65f4e8b3344a87e8e8 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Mon, 2 Dec 2024 11:26:19 +0100 Subject: [PATCH 02/15] rpc: improve BenchmarkGRPCPing Use an existing test service that also does streaming-streaming, which allows the benchmark to highlight the overhead of unary RPCs as implemented by gRPC. --- pkg/rpc/BUILD.bazel | 2 + pkg/rpc/context_test.go | 156 ++++++++++++++++++++++++++++------------ 2 files changed, 111 insertions(+), 47 deletions(-) diff --git a/pkg/rpc/BUILD.bazel b/pkg/rpc/BUILD.bazel index 9e4fc352c5a0..ab519ec07e62 100644 --- a/pkg/rpc/BUILD.bazel +++ b/pkg/rpc/BUILD.bazel @@ -144,6 +144,7 @@ go_test( "//pkg/spanconfig", "//pkg/testutils", "//pkg/testutils/datapathutils", + "//pkg/testutils/grpcutils", "//pkg/testutils/skip", "//pkg/ts/tspb", "//pkg/util", @@ -161,6 +162,7 @@ go_test( "@com_github_cockroachdb_datadriven//:datadriven", "@com_github_cockroachdb_errors//:errors", "@com_github_cockroachdb_redact//:redact", + "@com_github_gogo_protobuf//types", "@com_github_gogo_status//:status", "@com_github_golang_mock//gomock", "@com_github_prometheus_client_model//go", diff --git a/pkg/rpc/context_test.go b/pkg/rpc/context_test.go index e062f93208e4..2d3228490952 100644 --- a/pkg/rpc/context_test.go +++ b/pkg/rpc/context_test.go @@ -11,6 +11,7 @@ import ( "fmt" "io" "net" + "strings" "sync" "sync/atomic" "testing" @@ -22,6 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" + "github.com/cockroachdb/cockroach/pkg/testutils/grpcutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/circuit" @@ -36,6 +38,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" + "github.com/gogo/protobuf/types" gogostatus "github.com/gogo/status" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" @@ -2232,57 +2235,116 @@ func TestInitialHeartbeatFailedError(t *testing.T) { }) } -type benchmarkHeartbeatService struct { - resp *PingResponse -} - -func (b *benchmarkHeartbeatService) Ping( - ctx context.Context, request *PingRequest, -) (*PingResponse, error) { - if b.resp == nil { - b.resp = &PingResponse{} - } - return b.resp, nil -} - func BenchmarkGRPCPing(b *testing.B) { - stopper := stop.NewStopper() - ctx := context.Background() - defer stopper.Stop(ctx) - - clock := &timeutil.DefaultTimeSource{} - maxOffset := 250 * time.Millisecond - srvRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) - const serverNodeID = 1 - srvRPCCtx.NodeID.Set(ctx, serverNodeID) - s := newTestServer(b, srvRPCCtx) + for _, bytes := range []int{1, 1 << 8, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, 1 << 18, 1 << 20} { + bstr := fmt.Sprintf("%d", bytes) + bname := strings.Repeat("_", 7-len(bstr)) + bstr + b.Run("bytes="+bname, func(b *testing.B) { + stopper := stop.NewStopper() + ctx := context.Background() + defer stopper.Stop(ctx) - randBytes := make([]byte, 200) - _, err := rand.Read(randBytes) - require.NoError(b, err) + clock := &timeutil.DefaultTimeSource{} + maxOffset := 250 * time.Millisecond + srvRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) + const serverNodeID = 1 + srvRPCCtx.NodeID.Set(ctx, serverNodeID) + s := newTestServer(b, srvRPCCtx) + + randBytes := make([]byte, bytes) + _, err := rand.Read(randBytes) + require.NoError(b, err) + + req := &PingRequest{Ping: string(randBytes)} + resp := &PingResponse{Pong: string(randBytes)} + anyreq, err := types.MarshalAny(req) + require.NoError(b, err) + anyresp, err := types.MarshalAny(resp) + require.NoError(b, err) + + require.NoError(b, err) + b.Logf("marshaled request size: %d bytes (%d bytes of overhead)", req.Size(), req.Size()-bytes) + + tsi := &grpcutils.TestServerImpl{ + UU: func(ctx context.Context, req *types.Any) (*types.Any, error) { + return anyresp, nil + }, + SU: func(srv grpcutils.GRPCTest_StreamUnaryServer) error { + for { + _, err := srv.Recv() + if err != nil { + return err + } + } + }, + SS: func(srv grpcutils.GRPCTest_StreamStreamServer) error { + for { + if _, err := srv.Recv(); err != nil { + return err + } + if err := srv.Send(anyresp); err != nil { + return err + } + } + }, + } - req := &PingRequest{Ping: string(randBytes)} - resp := &PingResponse{Pong: string(randBytes)} - RegisterHeartbeatServer(s, &benchmarkHeartbeatService{resp: resp}) - ln, err := netutil.ListenAndServeGRPC(srvRPCCtx.Stopper, s, util.TestAddr) - if err != nil { - b.Fatal(err) - } - remoteAddr := ln.Addr().String() + grpcutils.RegisterGRPCTestServer(s, tsi) - cliRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) - cliRPCCtx.NodeID.Set(ctx, 2) - cc, err := cliRPCCtx.grpcDialRaw(ctx, remoteAddr, DefaultClass) - require.NoError(b, err) - hb := NewHeartbeatClient(cc) - _, err = hb.Ping(ctx, req) // warm-up - require.NoError(b, err) + ln, err := netutil.ListenAndServeGRPC(srvRPCCtx.Stopper, s, util.TestAddr) + if err != nil { + b.Fatal(err) + } + remoteAddr := ln.Addr().String() - b.ResetTimer() - defer b.StopTimer() - for i := 0; i < b.N; i++ { - if _, err := hb.Ping(ctx, req); err != nil { - b.Fatal(err) - } + cliRPCCtx := newTestContext(uuid.MakeV4(), clock, maxOffset, stopper) + cliRPCCtx.NodeID.Set(ctx, 2) + cc, err := cliRPCCtx.grpcDialRaw(ctx, remoteAddr, DefaultClass) + require.NoError(b, err) + + for _, tc := range []struct { + name string + invoke func(c grpcutils.GRPCTestClient, N int) error + }{ + {"UnaryUnary", func(c grpcutils.GRPCTestClient, N int) error { + for i := 0; i < N; i++ { + _, err := c.UnaryUnary(ctx, anyreq) + if err != nil { + return err + } + } + return nil + }}, + { + "StreamStream", func(c grpcutils.GRPCTestClient, N int) error { + sc, err := c.StreamStream(ctx) + if err != nil { + return err + } + for i := 0; i < N; i++ { + if err := sc.Send(anyreq); err != nil { + return err + } + if _, err := sc.Recv(); err != nil { + return err + } + } + return nil + }}, + } { + + b.Run(tc.name, func(b *testing.B) { + + c := grpcutils.NewGRPCTestClient(cc) + + b.SetBytes(int64(req.Size() + resp.Size())) + b.ResetTimer() + defer b.StopTimer() + if err := tc.invoke(c, b.N); err != nil { + b.Fatal(err) + } + }) + } + }) } } From 11aed7d0745760a691cccc8dee1f2dda76ed7331 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Wed, 27 Nov 2024 13:07:41 +0100 Subject: [PATCH 03/15] *: silence deprecation warnings These will fire after the gRPC bump in the subsequent commits. --- pkg/ccl/changefeedccl/sink_pubsub_v2.go | 1 + pkg/ccl/changefeedccl/testfeed_test.go | 1 + pkg/ccl/sqlproxyccl/proxy_handler.go | 5 +++++ pkg/ccl/sqlproxyccl/tenantdirsvr/testutils.go | 1 + pkg/rpc/context.go | 3 +++ pkg/server/authserver/authentication_test.go | 2 ++ pkg/server/connectivity_test.go | 1 + pkg/server/grpc_gateway.go | 1 + pkg/server/init.go | 2 ++ pkg/util/tracing/grpcinterceptor/grpc_interceptor_test.go | 1 + 10 files changed, 18 insertions(+) diff --git a/pkg/ccl/changefeedccl/sink_pubsub_v2.go b/pkg/ccl/changefeedccl/sink_pubsub_v2.go index 72312f848bf9..af014b2cc93b 100644 --- a/pkg/ccl/changefeedccl/sink_pubsub_v2.go +++ b/pkg/ccl/changefeedccl/sink_pubsub_v2.go @@ -328,6 +328,7 @@ func makePublisherClient( // See https://pkg.go.dev/cloud.google.com/go/pubsub#hdr-Emulator for emulator information. if addr, _ := envutil.ExternalEnvString("PUBSUB_EMULATOR_HOST", 1); addr != "" { log.Infof(ctx, "Establishing connection to pubsub emulator at %s", addr) + //lint:ignore SA1019 grpc.Dial is deprecated conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { return nil, errors.Newf("grpc.Dial: %w", err) diff --git a/pkg/ccl/changefeedccl/testfeed_test.go b/pkg/ccl/changefeedccl/testfeed_test.go index a0be728e0daf..413a21553762 100644 --- a/pkg/ccl/changefeedccl/testfeed_test.go +++ b/pkg/ccl/changefeedccl/testfeed_test.go @@ -2465,6 +2465,7 @@ func (s *fakePubsubServer) NotifyMessage() chan struct{} { } func (ps *fakePubsubServer) Dial() (*grpc.ClientConn, error) { + //lint:ignore SA1019 grpc.Dial is deprecated return grpc.Dial(ps.srv.Addr, grpc.WithTransportCredentials(insecure.NewCredentials())) } diff --git a/pkg/ccl/sqlproxyccl/proxy_handler.go b/pkg/ccl/sqlproxyccl/proxy_handler.go index e40e23af1d66..18930cd2bad2 100644 --- a/pkg/ccl/sqlproxyccl/proxy_handler.go +++ b/pkg/ccl/sqlproxyccl/proxy_handler.go @@ -228,6 +228,8 @@ func newProxyHandler( if !ok { return nil, errors.New("unsupported test directory server") } + + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err = grpc.DialContext( ctx, "", @@ -238,6 +240,7 @@ func newProxyHandler( return nil, err } } else if handler.DirectoryAddr != "" { + //lint:ignore SA1019 grpc.Dial is deprecated conn, err = grpc.Dial( handler.DirectoryAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), @@ -258,6 +261,8 @@ func newProxyHandler( dialerFunc := func(ctx context.Context, addr string) (net.Conn, error) { return ln.DialContext(ctx) } + + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err = grpc.DialContext( ctx, "", diff --git a/pkg/ccl/sqlproxyccl/tenantdirsvr/testutils.go b/pkg/ccl/sqlproxyccl/tenantdirsvr/testutils.go index e4a42f185e42..5e916b5492b3 100644 --- a/pkg/ccl/sqlproxyccl/tenantdirsvr/testutils.go +++ b/pkg/ccl/sqlproxyccl/tenantdirsvr/testutils.go @@ -34,6 +34,7 @@ func SetupTestDirectory( require.NoError(t, directoryServer.Start(ctx)) // Dial the test directory server. + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext( ctx, "", diff --git a/pkg/rpc/context.go b/pkg/rpc/context.go index 510e822d1fce..cb7f6b4c4109 100644 --- a/pkg/rpc/context.go +++ b/pkg/rpc/context.go @@ -1602,6 +1602,7 @@ func (rpcCtx *Context) dialOptsNetwork( // Don't retry on dial errors either, otherwise the onlyOnceDialer will get // into a bad state for connection errors. + //lint:ignore SA1019 grpc.FailOnNonTempDialError is deprecated dialOpts = append(dialOpts, grpc.FailOnNonTempDialError(true)) return dialOpts, nil @@ -1951,6 +1952,7 @@ func (rpcCtx *Context) grpcDialRaw( dialOpts = append(dialOpts, additionalOpts...) + //lint:ignore SA1019 grpc.DialContext is deprecated return grpc.DialContext(ctx, target, dialOpts...) } @@ -2146,6 +2148,7 @@ func VerifyDialback( // A throwaway connection keeps it simple. ctx := rpcCtx.wrapCtx(ctx, target, request.OriginNodeID, SystemClass) ctx = logtags.AddTag(ctx, "dialback", nil) + //lint:ignore SA1019 grpc.WithBlock is deprecated conn, err := rpcCtx.grpcDialRaw(ctx, target, SystemClass, grpc.WithBlock()) if conn != nil { // NB: the nil check simplifies mocking in TestVerifyDialback _ = conn.Close() // nolint:grpcconnclose diff --git a/pkg/server/authserver/authentication_test.go b/pkg/server/authserver/authentication_test.go index f2967c742008..82889a953b48 100644 --- a/pkg/server/authserver/authentication_test.go +++ b/pkg/server/authserver/authentication_test.go @@ -900,6 +900,7 @@ func TestGRPCAuthentication(t *testing.T) { }, false}, } + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext(ctx, ts.RPCAddr(), grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{ InsecureSkipVerify: true, @@ -931,6 +932,7 @@ func TestGRPCAuthentication(t *testing.T) { if err != nil { t.Fatal(err) } + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err = grpc.DialContext(ctx, ts.RPCAddr(), grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig))) if err != nil { diff --git a/pkg/server/connectivity_test.go b/pkg/server/connectivity_test.go index 9a32530c88ff..fcea103d90b5 100644 --- a/pkg/server/connectivity_test.go +++ b/pkg/server/connectivity_test.go @@ -208,6 +208,7 @@ func TestClusterConnectivity(t *testing.T) { return err } + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext(ctx, target, dialOpts...) if err != nil { return err diff --git a/pkg/server/grpc_gateway.go b/pkg/server/grpc_gateway.go index 3ec91fc6f1c8..c5ea82cad8ed 100644 --- a/pkg/server/grpc_gateway.go +++ b/pkg/server/grpc_gateway.go @@ -91,6 +91,7 @@ func configureGRPCGateway( telemetry.Inc(getServerEndpointCounter(method)) return invoker(ctx, method, req, reply, cc, opts...) } + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext(ctx, GRPCAddr, append( dialOpts, grpc.WithUnaryInterceptor(callCountInterceptor), diff --git a/pkg/server/init.go b/pkg/server/init.go index 863ea10140ff..091ac8fa57e7 100644 --- a/pkg/server/init.go +++ b/pkg/server/init.go @@ -479,6 +479,8 @@ func (s *initServer) attemptJoinTo( if err != nil { return nil, err } + + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext(ctx, addr, dialOpts...) if err != nil { return nil, err diff --git a/pkg/util/tracing/grpcinterceptor/grpc_interceptor_test.go b/pkg/util/tracing/grpcinterceptor/grpc_interceptor_test.go index 1b667ae61937..b69093b819ed 100644 --- a/pkg/util/tracing/grpcinterceptor/grpc_interceptor_test.go +++ b/pkg/util/tracing/grpcinterceptor/grpc_interceptor_test.go @@ -226,6 +226,7 @@ func TestGRPCInterceptors(t *testing.T) { t.Error(err) } })) + //lint:ignore SA1019 grpc.DialContext is deprecated conn, err := grpc.DialContext(bgCtx, ln.Addr().String(), //lint:ignore SA1019 grpc.WithInsecure is deprecated grpc.WithInsecure(), From 971f138fed99cdac14efdb1459a6cdda7b96818c Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Tue, 12 Nov 2024 15:29:07 +0100 Subject: [PATCH 04/15] go.mod: upgrade gRPC to v.1.68.0 from v1.56.3 to v1.68.0. TODO: changelog --- DEPS.bzl | 142 +++++++++++++++++++----------- build/bazelutil/distdir_files.bzl | 38 ++++---- go.mod | 23 +++-- go.sum | 48 +++++----- 4 files changed, 146 insertions(+), 105 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index ac1d2789623a..cde24b199012 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1515,10 +1515,10 @@ def go_deps(): name = "com_github_cespare_xxhash_v2", build_file_proto_mode = "disable_global", importpath = "github.com/cespare/xxhash/v2", - sha256 = "fc180cdb0c00fbffbd39b774a72cdb5f0c32ace25370d5135195918a8c3fbd25", - strip_prefix = "github.com/cespare/xxhash/v2@v2.2.0", + sha256 = "145a26cdc7c49db566017b807c4989ee7f7ddeb569423e9cb99f995fac3621d3", + strip_prefix = "github.com/cespare/xxhash/v2@v2.3.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cespare/xxhash/v2/com_github_cespare_xxhash_v2-v2.2.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cespare/xxhash/v2/com_github_cespare_xxhash_v2-v2.3.0.zip", ], ) go_repository( @@ -1695,20 +1695,20 @@ def go_deps(): name = "com_github_cncf_udpa_go", build_file_proto_mode = "disable_global", importpath = "github.com/cncf/udpa/go", - sha256 = "8fe1585f25d40a5e3cd4243a92143d71ae4ee92e915e7192e72387047539438e", - strip_prefix = "github.com/cncf/udpa/go@v0.0.0-20220112060539-c52dc94e7fbe", + sha256 = "a449fa94e58117a79c17577e39f72f695c4876f74cbd9142d512278192ca90aa", + strip_prefix = "github.com/cncf/udpa/go@v0.0.0-20210930031921-04548b0d99d4", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/udpa/go/com_github_cncf_udpa_go-v0.0.0-20220112060539-c52dc94e7fbe.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/udpa/go/com_github_cncf_udpa_go-v0.0.0-20210930031921-04548b0d99d4.zip", ], ) go_repository( name = "com_github_cncf_xds_go", build_file_proto_mode = "disable_global", importpath = "github.com/cncf/xds/go", - sha256 = "a0c6e66eade357aeda4edaa9d09612085860dc4c0b44edf8226574939bdf6091", - strip_prefix = "github.com/cncf/xds/go@v0.0.0-20230607035331-e9ce68804cb4", + sha256 = "45796f91fb06f20e080cf5da9f173d7aa98bdf42e0b28fa332783aaa6b6ca6cb", + strip_prefix = "github.com/cncf/xds/go@v0.0.0-20240905190251-b4127c9b8d78", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/xds/go/com_github_cncf_xds_go-v0.0.0-20230607035331-e9ce68804cb4.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/xds/go/com_github_cncf_xds_go-v0.0.0-20240905190251-b4127c9b8d78.zip", ], ) go_repository( @@ -2905,10 +2905,10 @@ def go_deps(): name = "com_github_envoyproxy_go_control_plane", build_file_proto_mode = "disable_global", importpath = "github.com/envoyproxy/go-control-plane", - sha256 = "6825addb39c5e1e6dc4c82d5eba4c9503a6be6fd035f4c16de8eb5316e14a81b", - strip_prefix = "github.com/envoyproxy/go-control-plane@v0.11.1-0.20230524094728-9239064ad72f", + sha256 = "4e66cdfe90af8e99daab247dc791ddb0cb28eed2821be11be160ae98707cf3b2", + strip_prefix = "github.com/envoyproxy/go-control-plane@v0.13.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.11.1-0.20230524094728-9239064ad72f.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.13.0.zip", ], ) go_repository( @@ -2916,10 +2916,10 @@ def go_deps(): build_file_proto_mode = "disable_global", build_naming_convention = "go_default_library", importpath = "github.com/envoyproxy/protoc-gen-validate", - sha256 = "d9803ca09d732a15d994f16ef297f901496e8861eabfbe6bdfa00d280f1d608f", - strip_prefix = "github.com/envoyproxy/protoc-gen-validate@v0.10.1", + sha256 = "b61e64eaa80294deb265cf71e481d328ebbba1be26deba6c21efa6f5f638f796", + strip_prefix = "github.com/envoyproxy/protoc-gen-validate@v1.1.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/protoc-gen-validate/com_github_envoyproxy_protoc_gen_validate-v0.10.1.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/protoc-gen-validate/com_github_envoyproxy_protoc_gen_validate-v1.1.0.zip", ], ) go_repository( @@ -3920,10 +3920,10 @@ def go_deps(): name = "com_github_golang_glog", build_file_proto_mode = "disable_global", importpath = "github.com/golang/glog", - sha256 = "668beb5dd923378b00fda4ba0d965000f3f259be5ba05ebd341a2949e8f20db6", - strip_prefix = "github.com/golang/glog@v1.1.0", + sha256 = "6b0fbe67a83fd3d468fcfad080decbedea4edd6586b5174a8c638133c81c4b99", + strip_prefix = "github.com/golang/glog@v1.2.2", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/glog/com_github_golang_glog-v1.1.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/glog/com_github_golang_glog-v1.2.2.zip", ], ) go_repository( @@ -4815,10 +4815,10 @@ def go_deps(): name = "com_github_iancoleman_strcase", build_file_proto_mode = "disable_global", importpath = "github.com/iancoleman/strcase", - sha256 = "cb5027fec91d36426f0978a6c42ab52d8735fa3e1711be0127feda70a9a9fd05", - strip_prefix = "github.com/iancoleman/strcase@v0.2.0", + sha256 = "fe8d071a2f64f2fdf24a0b080a7fd277488bc4840503d7475045070fe50c3f58", + strip_prefix = "github.com/iancoleman/strcase@v0.3.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/iancoleman/strcase/com_github_iancoleman_strcase-v0.2.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/iancoleman/strcase/com_github_iancoleman_strcase-v0.3.0.zip", ], ) go_repository( @@ -6069,10 +6069,10 @@ def go_deps(): name = "com_github_lyft_protoc_gen_star_v2", build_file_proto_mode = "disable_global", importpath = "github.com/lyft/protoc-gen-star/v2", - sha256 = "96123d48294d899b522b6723bde580d16ce3e56d7ff524afbfba1fac26a22491", - strip_prefix = "github.com/lyft/protoc-gen-star/v2@v2.0.1", + sha256 = "d686a45affe55f593f20f4bfa6e83dec3fe67d51bb81346358366ca878a9f02c", + strip_prefix = "github.com/lyft/protoc-gen-star/v2@v2.0.4-0.20230330145011-496ad1ac90a4", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-star/v2/com_github_lyft_protoc_gen_star_v2-v2.0.1.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-star/v2/com_github_lyft_protoc_gen_star_v2-v2.0.4-0.20230330145011-496ad1ac90a4.zip", ], ) go_repository( @@ -7625,6 +7625,16 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pkg/term/com_github_pkg_term-v0.0.0-20180730021639-bffc007b7fd5.zip", ], ) + go_repository( + name = "com_github_planetscale_vtprotobuf", + build_file_proto_mode = "disable_global", + importpath = "github.com/planetscale/vtprotobuf", + sha256 = "6fdbac53c6ace58d732be8ec29c1aae928639eb12960cc4c52a9f7a25395ca05", + strip_prefix = "github.com/planetscale/vtprotobuf@v0.6.1-0.20240319094008-0393e58bdf10", + urls = [ + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/planetscale/vtprotobuf/com_github_planetscale_vtprotobuf-v0.6.1-0.20240319094008-0393e58bdf10.zip", + ], + ) go_repository( name = "com_github_pmezard_go_difflib", build_file_proto_mode = "disable_global", @@ -8346,10 +8356,10 @@ def go_deps(): name = "com_github_spf13_afero", build_file_proto_mode = "disable_global", importpath = "github.com/spf13/afero", - sha256 = "64dbd57907f1718a4b549f5275375c13eb9bed301242fdacdfece0e97bdd86c7", - strip_prefix = "github.com/spf13/afero@v1.9.2", + sha256 = "96f549d577731c5f75d5a1b2bf8b937ff4300fab318197776af4f335c0bc0ff6", + strip_prefix = "github.com/spf13/afero@v1.10.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/afero/com_github_spf13_afero-v1.9.2.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/afero/com_github_spf13_afero-v1.10.0.zip", ], ) go_repository( @@ -9576,20 +9586,20 @@ def go_deps(): name = "com_google_cloud_go_compute", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/compute", - sha256 = "8022cae67ccae3356f42262dd3720e7ea959ad4034d4ed982d09b1f1deaf5631", - strip_prefix = "cloud.google.com/go/compute@v1.19.1", + sha256 = "789696687da53dd22d22c5c49e0cc0636a44703459992236d18495e79d9b9c03", + strip_prefix = "cloud.google.com/go/compute@v1.19.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.19.1.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.19.0.zip", ], ) go_repository( name = "com_google_cloud_go_compute_metadata", build_file_proto_mode = "disable_global", importpath = "cloud.google.com/go/compute/metadata", - sha256 = "292864dbd0b1de37a968e285e949885e573384837d81cd3695be5ce2e2391887", - strip_prefix = "cloud.google.com/go/compute/metadata@v0.2.3", + sha256 = "5325feb8adc47daf4e4e74e21922c3e12b8f6201571b2aa3f7b413771190c2a3", + strip_prefix = "cloud.google.com/go/compute/metadata@v0.5.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/metadata/com_google_cloud_go_compute_metadata-v0.2.3.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/metadata/com_google_cloud_go_compute_metadata-v0.5.0.zip", ], ) go_repository( @@ -10572,6 +10582,16 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/sourcegraph.com/sourcegraph/appdash/com_sourcegraph_sourcegraph_appdash-v0.0.0-20190731080439-ebfcffb1b5c0.zip", ], ) + go_repository( + name = "dev_cel_expr", + build_file_proto_mode = "disable_global", + importpath = "cel.dev/expr", + sha256 = "4ce7d6a2d190cdeffe59cde1c870d76b5daa2fadc7c0c9d48a58797b1257b14c", + strip_prefix = "cel.dev/expr@v0.16.1", + urls = [ + "https://storage.googleapis.com/cockroach-godeps/gomod/cel.dev/expr/dev_cel_expr-v0.16.1.zip", + ], + ) go_repository( name = "ht_sr_git_~sbinet_cmpimg", build_file_proto_mode = "disable_global", @@ -11465,14 +11485,34 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip", ], ) + go_repository( + name = "org_golang_google_genproto_googleapis_api", + build_file_proto_mode = "disable_global", + importpath = "google.golang.org/genproto/googleapis/api", + sha256 = "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8", + strip_prefix = "google.golang.org/genproto/googleapis/api@v0.0.0-20240903143218-8af14fe29dc1", + urls = [ + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip", + ], + ) + go_repository( + name = "org_golang_google_genproto_googleapis_rpc", + build_file_proto_mode = "disable_global", + importpath = "google.golang.org/genproto/googleapis/rpc", + sha256 = "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac", + strip_prefix = "google.golang.org/genproto/googleapis/rpc@v0.0.0-20240903143218-8af14fe29dc1", + urls = [ + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip", + ], + ) go_repository( name = "org_golang_google_grpc", build_file_proto_mode = "disable_global", importpath = "google.golang.org/grpc", - sha256 = "7f9b83cd9dbe99783061160583dae09dd8f64187d890c51be52cc8e3bd0dcb56", - strip_prefix = "google.golang.org/grpc@v1.56.3", + sha256 = "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", + strip_prefix = "google.golang.org/grpc@v1.68.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.56.3.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip", ], ) go_repository( @@ -11519,10 +11559,10 @@ def go_deps(): name = "org_golang_x_crypto", build_file_proto_mode = "disable_global", importpath = "golang.org/x/crypto", - sha256 = "ec96acfe28be3ff2fb14201c5f51132f0e24c7d0d6f3201a8aa69c84f989d014", - strip_prefix = "golang.org/x/crypto@v0.26.0", + sha256 = "c724b619b457bb1c445a39541449b1348eb3851323a29d2c313ad0139634d0a5", + strip_prefix = "golang.org/x/crypto@v0.27.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/crypto/org_golang_x_crypto-v0.26.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/crypto/org_golang_x_crypto-v0.27.0.zip", ], ) go_repository( @@ -11599,20 +11639,20 @@ def go_deps(): name = "org_golang_x_net", build_file_proto_mode = "disable_global", importpath = "golang.org/x/net", - sha256 = "c6f7bde4bb418d1f5ee5dc437d09ce9f10743ddba043cdca82eb57ddeb18d6da", - strip_prefix = "golang.org/x/net@v0.28.0", + sha256 = "fec08ca53c4f3ddb0a81a0bfed2f7d36a6b2867d25380e4cc021c746fe4b722f", + strip_prefix = "golang.org/x/net@v0.29.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.28.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.29.0.zip", ], ) go_repository( name = "org_golang_x_oauth2", build_file_proto_mode = "disable_global", importpath = "golang.org/x/oauth2", - sha256 = "b682f8cf62ed36f3bec9f8a832ff61a2af1124f31f42c4e1e3f3efd23d88f93f", - strip_prefix = "golang.org/x/oauth2@v0.7.0", + sha256 = "9655523711f6a40da1851bd4fab3b43f1bc44e1af16bf1dba38572516822d4fc", + strip_prefix = "golang.org/x/oauth2@v0.23.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.7.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.23.0.zip", ], ) go_repository( @@ -11639,10 +11679,10 @@ def go_deps(): name = "org_golang_x_sys", build_file_proto_mode = "disable_global", importpath = "golang.org/x/sys", - sha256 = "5bf721c4404580d5350d0a0297c1f48f07c05db8a0d2a20677e6cb295380b9a7", - strip_prefix = "golang.org/x/sys@v0.23.0", + sha256 = "95e485046cac79d164d4d35a13e93b2a866a1ac2148184c37ca71514ddd94a52", + strip_prefix = "golang.org/x/sys@v0.25.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.23.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.25.0.zip", ], ) go_repository( @@ -11659,10 +11699,10 @@ def go_deps(): name = "org_golang_x_term", build_file_proto_mode = "disable_global", importpath = "golang.org/x/term", - sha256 = "2597a62b487b952c11c89b2001551af1fe1d29c484388ec1c3f5e3be7ff58ba5", - strip_prefix = "golang.org/x/term@v0.23.0", + sha256 = "80b2b247641ca1b8f54769de20d4d6a0c6861de57a3bc1b31e8432a2a7483ab3", + strip_prefix = "golang.org/x/term@v0.24.0", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/term/org_golang_x_term-v0.23.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/term/org_golang_x_term-v0.24.0.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 3c937d525cef..f8af5f6ce5e8 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -2,6 +2,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/bazil.org/fuse/org_bazil_fuse-v0.0.0-20160811212531-371fbbdaa898.zip": "c4f8d08b812e14a7689471372b43e43a0d6c984cdf3d9e541750d69398442e5a", + "https://storage.googleapis.com/cockroach-godeps/gomod/cel.dev/expr/dev_cel_expr-v0.16.1.zip": "4ce7d6a2d190cdeffe59cde1c870d76b5daa2fadc7c0c9d48a58797b1257b14c", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/accessapproval/com_google_cloud_go_accessapproval-v1.6.0.zip": "4fd31c02273e95e4032c7652822e740dbf074d77d66002df0fb96c1222fd0d1e", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/accesscontextmanager/com_google_cloud_go_accesscontextmanager-v1.7.0.zip": "90230ccc20b02821de0ef578914c7c32ac3189ebcce539da521228df768fa4f1", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/aiplatform/com_google_cloud_go_aiplatform-v1.37.0.zip": "e61385ceceb7eb9ef93c80daf51787f083470f104d113c8460794744a853c927", @@ -29,8 +30,8 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/clouddms/com_google_cloud_go_clouddms-v1.5.0.zip": "9a9488b44e7a18811c0fcb13beb1fe9c3c5f7613b3109734af6f88af19843d90", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/cloudtasks/com_google_cloud_go_cloudtasks-v1.10.0.zip": "9219724339007e7278d19a293285dcb45f4a38addc31d9722c98ce0b8095efe5", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/com_google_cloud_go-v0.110.0.zip": "8bdce0d7bfc07e71cebbbd7df2d93d1418a35eed09211bb21e3c1ee8d2fabf7c", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.19.1.zip": "8022cae67ccae3356f42262dd3720e7ea959ad4034d4ed982d09b1f1deaf5631", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/metadata/com_google_cloud_go_compute_metadata-v0.2.3.zip": "292864dbd0b1de37a968e285e949885e573384837d81cd3695be5ce2e2391887", + "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/com_google_cloud_go_compute-v1.19.0.zip": "789696687da53dd22d22c5c49e0cc0636a44703459992236d18495e79d9b9c03", + "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/compute/metadata/com_google_cloud_go_compute_metadata-v0.5.0.zip": "5325feb8adc47daf4e4e74e21922c3e12b8f6201571b2aa3f7b413771190c2a3", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/contactcenterinsights/com_google_cloud_go_contactcenterinsights-v1.6.0.zip": "e06630e09b6ee01e3693ff079ee6279de32566ae29fefeacdd410c61e1a1a5fe", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/container/com_google_cloud_go_container-v1.15.0.zip": "2dfba11e311b5dc9ea7e8b60cfd2dff3b060564a845bdac98945173dc3ef12ac", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/containeranalysis/com_google_cloud_go_containeranalysis-v0.9.0.zip": "6319d5102b56fa4c4576fb3aa9b4aeb30f1c3f5e45bccd747d0da27ccfceb147", @@ -324,7 +325,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cenkalti/backoff/v4/com_github_cenkalti_backoff_v4-v4.1.3.zip": "73ff572a901c0307aa1c16db43812da7ca2555aa403cfdd9d3a239ecbdad2274", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/census-instrumentation/opencensus-proto/com_github_census_instrumentation_opencensus_proto-v0.4.1.zip": "6fce66b7dcd2cba031ed9d73d77d6b21c2fe749c5de27cbb416a2d2cc1c68719", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cespare/xxhash/com_github_cespare_xxhash-v1.1.0.zip": "fe98c56670b21631f7fd3305a29a3b17e86a6cce3876a2119460717a18538e2e", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cespare/xxhash/v2/com_github_cespare_xxhash_v2-v2.2.0.zip": "fc180cdb0c00fbffbd39b774a72cdb5f0c32ace25370d5135195918a8c3fbd25", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cespare/xxhash/v2/com_github_cespare_xxhash_v2-v2.3.0.zip": "145a26cdc7c49db566017b807c4989ee7f7ddeb569423e9cb99f995fac3621d3", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/charmbracelet/bubbles/com_github_charmbracelet_bubbles-v0.15.1-0.20230123181021-a6a12c4a31eb.zip": "72954af77ec32995cfdf218fd31e9357a0fbef96f252bb1a9e6f0b8f158d3531", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/charmbracelet/harmonica/com_github_charmbracelet_harmonica-v0.2.0.zip": "8494d728916551f0fc9a065fa854dfae2d75c7191ce839bae07de1a6290db40a", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/charmbracelet/lipgloss/com_github_charmbracelet_lipgloss-v0.6.0.zip": "3f5fff79c178fface17013ea3feb4f2a3f16ea26c5618dce6535c19f78b1edcf", @@ -338,8 +339,8 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/circonus-labs/circonusllhist/com_github_circonus_labs_circonusllhist-v0.1.3.zip": "4dc805d9735dd9ca9b8875c0ad23126abb5bc969c5a40c61b5bc891808dbdcb6", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/clbanning/x2j/com_github_clbanning_x2j-v0.0.0-20191024224557-825249438eec.zip": "747daafe80e4ac504626c01a1d28b1a64b785586975a47b50d62853a444b72a0", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/client9/misspell/com_github_client9_misspell-v0.3.4.zip": "a3af206372e131dd10a68ac470c66a1b18eaf51c6afacb55b2e2a06e39b90728", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/udpa/go/com_github_cncf_udpa_go-v0.0.0-20220112060539-c52dc94e7fbe.zip": "8fe1585f25d40a5e3cd4243a92143d71ae4ee92e915e7192e72387047539438e", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/xds/go/com_github_cncf_xds_go-v0.0.0-20230607035331-e9ce68804cb4.zip": "a0c6e66eade357aeda4edaa9d09612085860dc4c0b44edf8226574939bdf6091", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/udpa/go/com_github_cncf_udpa_go-v0.0.0-20210930031921-04548b0d99d4.zip": "a449fa94e58117a79c17577e39f72f695c4876f74cbd9142d512278192ca90aa", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cncf/xds/go/com_github_cncf_xds_go-v0.0.0-20240905190251-b4127c9b8d78.zip": "45796f91fb06f20e080cf5da9f173d7aa98bdf42e0b28fa332783aaa6b6ca6cb", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/com_github_cockroachdb_apd-v1.1.0.zip": "fef7ec2fae220f84bfacb17fbfc1b04a666ab7f6fc04f3ff6d2b1e05c380777d", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.2.1.zip": "6ad54bb71a36fba8ca6725a00d916e51815a4c68de54096313ca6fffda6c87c2", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/bubbletea/com_github_cockroachdb_bubbletea-v0.23.1-bracketed-paste2.zip": "d7916a0e7d8d814566e8f8d162c3764aea947296396a0a669564ff3ee53414bc", @@ -457,8 +458,8 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/emicklei/dot/com_github_emicklei_dot-v0.15.0.zip": "b298e957fd7e38cd76b3953e47afcfd673a4f051884818a294ec4703476b6a39", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/emicklei/go-restful/com_github_emicklei_go_restful-v2.12.0+incompatible.zip": "cf4eb1c8f654dfae915d2d77e7ec679e11f15f737454a232293bb14bd7401162", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/emicklei/go-restful/v3/com_github_emicklei_go_restful_v3-v3.7.1.zip": "3fc4643688db4a2eab6a44505a9f29ab7171ed174e0bbfb9ecae245deb722a10", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.11.1-0.20230524094728-9239064ad72f.zip": "6825addb39c5e1e6dc4c82d5eba4c9503a6be6fd035f4c16de8eb5316e14a81b", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/protoc-gen-validate/com_github_envoyproxy_protoc_gen_validate-v0.10.1.zip": "d9803ca09d732a15d994f16ef297f901496e8861eabfbe6bdfa00d280f1d608f", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/go-control-plane/com_github_envoyproxy_go_control_plane-v0.13.0.zip": "4e66cdfe90af8e99daab247dc791ddb0cb28eed2821be11be160ae98707cf3b2", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/envoyproxy/protoc-gen-validate/com_github_envoyproxy_protoc_gen_validate-v1.1.0.zip": "b61e64eaa80294deb265cf71e481d328ebbba1be26deba6c21efa6f5f638f796", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/etcd-io/bbolt/com_github_etcd_io_bbolt-v1.3.3.zip": "6630d7aad4b10f76aea88ee6d9086a1edffe371651cc2432edfd0de6beb99120", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/evanphx/json-patch/com_github_evanphx_json_patch-v4.11.0+incompatible.zip": "4a3bf63543b0745ffa4940aa13f7dde43087582aabfbf8eb752180f031f23d18", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/fanixk/geohash/com_github_fanixk_geohash-v0.0.0-20150324002647-c1f9b5fa157a.zip": "74ff24640609365d393ddddb47b32cdd21d7de9274ae23cce1b2ac8b1cf74339", @@ -559,7 +560,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang-sql/civil/com_github_golang_sql_civil-v0.0.0-20190719163853-cb61b32ac6fe.zip": "22fcd1e01cabf6ec75c6b6c8e443de029611c9dd5cc4673818d52dac465ac688", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/freetype/com_github_golang_freetype-v0.0.0-20170609003504-e2365dfdc4a0.zip": "cdcb9e6a14933dcbf167b44dcd5083fc6a2e52c4fae8fb79747c691efeb7d84e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/geo/com_github_golang_geo-v0.0.0-20200319012246-673a6f80352d.zip": "f19bf757263775cf21790a1821cc8ac1b853fe41dd2499d9e6a434f01bd12332", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/glog/com_github_golang_glog-v1.1.0.zip": "668beb5dd923378b00fda4ba0d965000f3f259be5ba05ebd341a2949e8f20db6", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/glog/com_github_golang_glog-v1.2.2.zip": "6b0fbe67a83fd3d468fcfad080decbedea4edd6586b5174a8c638133c81c4b99", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/groupcache/com_github_golang_groupcache-v0.0.0-20210331224755-41bb18bfe9da.zip": "b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/mock/com_github_golang_mock-v1.6.0.zip": "fa25916b546f90da49418f436e3a61e4c5dae898cf3c82b0007b5a6fab74261b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/protobuf/com_github_golang_protobuf-v1.5.4.zip": "9a2f43d3eac8ceda506ebbeb4f229254b87235ce90346692a0e233614182190b", @@ -642,7 +643,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/huandu/xstrings/com_github_huandu_xstrings-v1.3.0.zip": "cdd580467bc14ea0ad6856782d8aeb3d954e9c3499f4a771b6813174d2713d0d", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/hudl/fargo/com_github_hudl_fargo-v1.3.0.zip": "040aa24d7c5cdf43ed18767d4dff7d5533c65f58f45424f38eed51a5956445cf", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/hydrogen18/memlistener/com_github_hydrogen18_memlistener-v1.0.0.zip": "c47c6f44a9c1096c1b61f6c49be924c42e69545ca23a008881d950ee942a2268", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/iancoleman/strcase/com_github_iancoleman_strcase-v0.2.0.zip": "cb5027fec91d36426f0978a6c42ab52d8735fa3e1711be0127feda70a9a9fd05", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/iancoleman/strcase/com_github_iancoleman_strcase-v0.3.0.zip": "fe8d071a2f64f2fdf24a0b080a7fd277488bc4840503d7475045070fe50c3f58", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/ianlancetaylor/demangle/com_github_ianlancetaylor_demangle-v0.0.0-20200824232613-28f6c0f3b639.zip": "f5709a6601f0b4dc17da3baba1a50cc95ebf3efdd040aecc7fcf4d0e89bab066", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/icrowley/fake/com_github_icrowley_fake-v0.0.0-20180203215853-4178557ae428.zip": "b503a0bc24e79b470d85701a11294430274f1203977e931008a88543f9f56fd4", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/imdario/mergo/com_github_imdario_mergo-v0.3.13.zip": "04f72d0e4695b4a004846a5d4f60d2dc381bacb032ebb8d58905e6eb00d121d2", @@ -761,7 +762,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lufia/iostat/com_github_lufia_iostat-v1.2.1.zip": "964e9c5528a9de240d77d17df387bae1d59ddedd25734542ae8d70a27c59199e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lufia/plan9stats/com_github_lufia_plan9stats-v0.0.0-20211012122336-39d0f177ccd0.zip": "94730432c565c238cb839bb4fa55bec3b3a19b592af0f7d1418a26a48f8359c6", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-star/com_github_lyft_protoc_gen_star-v0.5.1.zip": "f761b5662a8d192f134d81134cfc7b7045fa39a3ac0124b6647971fb57f0a978", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-star/v2/com_github_lyft_protoc_gen_star_v2-v2.0.1.zip": "96123d48294d899b522b6723bde580d16ce3e56d7ff524afbfba1fac26a22491", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-star/v2/com_github_lyft_protoc_gen_star_v2-v2.0.4-0.20230330145011-496ad1ac90a4.zip": "d686a45affe55f593f20f4bfa6e83dec3fe67d51bb81346358366ca878a9f02c", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lyft/protoc-gen-validate/com_github_lyft_protoc_gen_validate-v0.0.13.zip": "86cd7276113087955c832bc1a2d7a8acfed59404375616d6753c4b284d4cd46c", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/magiconair/properties/com_github_magiconair_properties-v1.8.5.zip": "fa056b3c72df6a36c991e9f22285818b07e377bf07c7beb441d9a097b2d6263e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mailgun/raymond/v2/com_github_mailgun_raymond_v2-v2.0.48.zip": "9ff5de08464b1bc2d0a0dd6f4e7cadd20888e5ad39bf2acea09652750b1e92e0", @@ -904,6 +905,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pkg/profile/com_github_pkg_profile-v1.6.0.zip": "a31530cc1be940d949f8c3ae285cf877858c9e71b0a4da457787a4fee80711b9", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pkg/sftp/com_github_pkg_sftp-v1.13.1.zip": "8709c6556ed68fc9a9c25b4950e2dc70e688b5ec03f751c511feb4d44ff34904", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pkg/term/com_github_pkg_term-v0.0.0-20180730021639-bffc007b7fd5.zip": "165bb00eeab26fe65c64e0e13bc29abc7ea18ac28d288e2218c137cd0bd91d9b", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/planetscale/vtprotobuf/com_github_planetscale_vtprotobuf-v0.6.1-0.20240319094008-0393e58bdf10.zip": "6fdbac53c6ace58d732be8ec29c1aae928639eb12960cc4c52a9f7a25395ca05", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pmezard/go-difflib/com_github_pmezard_go_difflib-v1.0.0.zip": "de04cecc1a4b8d53e4357051026794bcbc54f2e6a260cfac508ce69d5d6457a0", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/posener/complete/com_github_posener_complete-v1.2.3.zip": "88b48005b995dc6592fa6fda08130488c83f63bcaa4ccb0fb8e926fee63112ec", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/power-devops/perfstat/com_github_power_devops_perfstat-v0.0.0-20210106213030-5aafc221ea8c.zip": "3ef206586f26201742728d9ae351348179ae94bb8b0c7913aa1cdf0f13e24fd8", @@ -967,7 +969,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/soheilhy/cmux/com_github_soheilhy_cmux-v0.1.4.zip": "6d6cadade0e186f84b5f8e7ddf8f4256601b21e49b0ca49fd003a7e570ae1885", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/sony/gobreaker/com_github_sony_gobreaker-v0.4.1.zip": "eab9bf8f98b16b051d7d13c4f5c70d6d1039347e380e0a12cb9ff6e33200d784", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spaolacci/murmur3/com_github_spaolacci_murmur3-v1.1.0.zip": "60bd43ada88cc70823b31fd678a8b906d48631b47145300544d45219ee6a17bc", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/afero/com_github_spf13_afero-v1.9.2.zip": "64dbd57907f1718a4b549f5275375c13eb9bed301242fdacdfece0e97bdd86c7", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/afero/com_github_spf13_afero-v1.10.0.zip": "96f549d577731c5f75d5a1b2bf8b937ff4300fab318197776af4f335c0bc0ff6", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/cast/com_github_spf13_cast-v1.3.1.zip": "9431fba3679d68cb98976c0f87e20520555835ecf772182991a37831426f219e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/cobra/com_github_spf13_cobra-v1.6.1.zip": "10945bdd829f0abbedbeaecd722f4077ad3b317dedcbfc6eacde72fc8e5b3879", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/spf13/jwalterweatherman/com_github_spf13_jwalterweatherman-v1.1.0.zip": "43cc5f056caf66dc8225dca36637bfc18509521b103a69ca76fbc2b6519194a3", @@ -1087,7 +1089,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/go.uber.org/zap/org_uber_go_zap-v1.19.0.zip": "6437824258873fed421b7975b8e4cafd1be80cdc15e553beaa887b499dd01420", "https://storage.googleapis.com/cockroach-godeps/gomod/goji.io/io_goji-v2.0.2+incompatible.zip": "1ea69b28e356cb91381ce2339004fcf144ad1b268c9e3497c9ef304751ae0bb3", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/arch/org_golang_x_arch-v0.0.0-20180920145803-b19384d3c130.zip": "9f67b677a3fefc503111d9aa7df8bacd2677411b0fcb982eb1654aa6d14cc3f8", - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/crypto/org_golang_x_crypto-v0.26.0.zip": "ec96acfe28be3ff2fb14201c5f51132f0e24c7d0d6f3201a8aa69c84f989d014", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/crypto/org_golang_x_crypto-v0.27.0.zip": "c724b619b457bb1c445a39541449b1348eb3851323a29d2c313ad0139634d0a5", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/exp/org_golang_x_exp-v0.0.0-20231110203233-9a3e6036ecaa.zip": "3e3717f5151e8c2ebf267b4d53698b97847c0de144683c51b74ab7edf5039fa8", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/exp/shiny/org_golang_x_exp_shiny-v0.0.0-20230801115018-d63ba01acd4b.zip": "3b9053a5c76c778ca05061df763a8e9aa8a6cac9d5f0f80d18d81922f98a001d", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/exp/typeparams/org_golang_x_exp_typeparams-v0.0.0-20221208152030-732eee02a75a.zip": "9bd73f186851c6229484f486981f608d16e2b86acbbef6f4f7cc0480a508a4a4", @@ -1095,13 +1097,13 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/lint/org_golang_x_lint-v0.0.0-20210508222113-6edffad5e616.zip": "0a4a5ebd2b1d79e7f480cbf5a54b45a257ae1ec9d11f01688efc5c35268d4603", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/mobile/org_golang_x_mobile-v0.0.0-20190719004257-d2bd2a29d028.zip": "6b946c7da47acf3b6195336fd071bfc73d543cefab73f2d27528c5dc1dc829ec", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/mod/org_golang_x_mod-v0.20.0.zip": "3c3528c39639b7cd699c121c100ddb71ab49f94bff257a4a3935e3ae9e8571fc", - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.28.0.zip": "c6f7bde4bb418d1f5ee5dc437d09ce9f10743ddba043cdca82eb57ddeb18d6da", - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.7.0.zip": "b682f8cf62ed36f3bec9f8a832ff61a2af1124f31f42c4e1e3f3efd23d88f93f", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/net/org_golang_x_net-v0.29.0.zip": "fec08ca53c4f3ddb0a81a0bfed2f7d36a6b2867d25380e4cc021c746fe4b722f", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/oauth2/org_golang_x_oauth2-v0.23.0.zip": "9655523711f6a40da1851bd4fab3b43f1bc44e1af16bf1dba38572516822d4fc", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/perf/org_golang_x_perf-v0.0.0-20230113213139-801c7ef9e5c5.zip": "bc1b902e645fdd5d210b7db8f3280833af225b131dab5842d7a6d32a676f80f5", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sync/org_golang_x_sync-v0.8.0.zip": "c79473c265ca571d389bf64fa1e7b2d8999b4ab3eb7af5e3bc185644783a1087", - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.23.0.zip": "5bf721c4404580d5350d0a0297c1f48f07c05db8a0d2a20677e6cb295380b9a7", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/sys/org_golang_x_sys-v0.25.0.zip": "95e485046cac79d164d4d35a13e93b2a866a1ac2148184c37ca71514ddd94a52", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/telemetry/org_golang_x_telemetry-v0.0.0-20240521205824-bda55230c457.zip": "8e8649337973d064cc44fa858787db7d0eb90f0806807349766d180ed6889f5c", - "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/term/org_golang_x_term-v0.23.0.zip": "2597a62b487b952c11c89b2001551af1fe1d29c484388ec1c3f5e3be7ff58ba5", + "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/term/org_golang_x_term-v0.24.0.zip": "80b2b247641ca1b8f54769de20d4d6a0c6861de57a3bc1b31e8432a2a7483ab3", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/text/org_golang_x_text-v0.19.0.zip": "37f9f40b6c3c56e079684d612439b61ce4e891c3cea32298fbab53a1cac47c35", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/tools/go/vcs/org_golang_x_tools_go_vcs-v0.1.0-deprecated.zip": "ab155d94f90a98a5112967b89bfcd26b5825c1cd6875a5246c7905a568387260", "https://storage.googleapis.com/cockroach-godeps/gomod/golang.org/x/tools/org_golang_x_tools-v0.24.0.zip": "92607be1cacf4647fd31b19ee64b1a7c198178f1005c75371e38e7b08fb138e7", @@ -1112,10 +1114,12 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/api/org_golang_google_api-v0.114.0.zip": "42c62aaba1d76efede08c70d8aef7889c5c8ee9c9c4f1e7c455b07838cabb785", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/appengine/org_golang_google_appengine-v1.6.7.zip": "79f80dfac18681788f1414e21a4a7734eff4cdf992070be9163103eb8d9f92cd", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/cloud/org_golang_google_cloud-v0.0.0-20151119220103-975617b05ea8.zip": "b1d5595a11b88273665d35d4316edbd4545731c979d046c82844fafef2039c2a", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip": "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip": "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip": "28f0317e6948788a33c07698109005675062f0203ed06bc866350a575bc974bf", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11", - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.56.3.zip": "7f9b83cd9dbe99783061160583dae09dd8f64187d890c51be52cc8e3bd0dcb56", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip": "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf", diff --git a/go.mod b/go.mod index f7edce7b2e56..094e6d50f614 100644 --- a/go.mod +++ b/go.mod @@ -10,14 +10,14 @@ go 1.22.8 // merge of any upgrades we should communicate to all teams to be on the lookout // for behavior changes, just like we would after a go upgrade. require ( - golang.org/x/crypto v0.26.0 + golang.org/x/crypto v0.27.0 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 - golang.org/x/oauth2 v0.7.0 + golang.org/x/net v0.29.0 + golang.org/x/oauth2 v0.23.0 golang.org/x/sync v0.8.0 - golang.org/x/sys v0.23.0 + golang.org/x/sys v0.25.0 golang.org/x/text v0.19.0 golang.org/x/time v0.3.0 golang.org/x/tools v0.24.0 @@ -39,7 +39,7 @@ require ( github.com/google/uuid v1.6.0 // indirect google.golang.org/api v0.114.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.3 + google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.1 ) @@ -228,7 +228,7 @@ require ( github.com/shirou/gopsutil/v3 v3.21.12 github.com/slack-go/slack v0.9.5 github.com/snowflakedb/gosnowflake v1.3.4 - github.com/spf13/afero v1.9.2 + github.com/spf13/afero v1.10.0 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 @@ -248,7 +248,7 @@ require ( go.opentelemetry.io/otel/trace v1.17.0 go.opentelemetry.io/proto/otlp v0.11.0 golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5 - golang.org/x/term v0.23.0 + golang.org/x/term v0.24.0 golang.org/x/tools/go/vcs v0.1.0-deprecated gonum.org/v1/gonum v0.15.1 gopkg.in/yaml.v2 v2.4.0 @@ -259,8 +259,7 @@ require ( require ( cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.1 // indirect - cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v0.13.0 // indirect cloud.google.com/go/longrunning v0.4.1 // indirect git.sr.ht/~sbinet/gg v0.6.0 // indirect @@ -304,7 +303,7 @@ require ( github.com/bits-and-blooms/bitset v1.4.0 // indirect github.com/campoy/embedmd v1.0.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charmbracelet/bubbletea v0.23.1 // indirect github.com/charmbracelet/lipgloss v0.6.0 // indirect github.com/cockroachdb/swiss v0.0.0-20240612210725-f4de07ae6964 // indirect @@ -454,8 +453,8 @@ require ( github.com/containerd/console v1.0.3 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect - github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect + github.com/golang/glog v1.2.2 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mattn/go-zglob v0.0.3 // indirect github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect diff --git a/go.sum b/go.sum index 3c19c374e255..e777aff92be6 100644 --- a/go.sum +++ b/go.sum @@ -41,10 +41,8 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/bigtable v1.3.0/go.mod h1:z5EyKrPE8OQmeg4h5MNdKvuSnI9CCT49Ki3f23aBzio= -cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= -cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= -cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= -cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -481,8 +479,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.13.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc= github.com/charmbracelet/bubbles v0.15.1-0.20230123181021-a6a12c4a31eb h1:OYmHuDqyuzWwiurw7eeYJ2482BENoX3hScpzamwF5K8= github.com/charmbracelet/bubbles v0.15.1-0.20230123181021-a6a12c4a31eb/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74= @@ -807,8 +805,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go. github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.1/go.mod h1:txg5va2Qkip90uYoSKH+nkAAmXrb2j3iq4FLwdrCbXQ= -github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8= -github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= +github.com/envoyproxy/protoc-gen-validate v1.1.0 h1:tntQDh69XqOCOZsDz0lVJQez/2L6Uu2PdjCQwWCJ3bM= +github.com/envoyproxy/protoc-gen-validate v1.1.0/go.mod h1:sXRDRVmzEbkM7CVcM06s9shE/m23dg3wzjl0UWqJ2q4= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -1116,8 +1114,8 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgR github.com/golang/geo v0.0.0-20200319012246-673a6f80352d h1:C/hKUcHT483btRbeGkrRjJz+Zbcj8audldIi9tRJDCc= github.com/golang/geo v0.0.0-20200319012246-673a6f80352d/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY= +github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -2186,8 +2184,8 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= @@ -2515,13 +2513,13 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2660,8 +2658,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2679,8 +2677,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5 h1:ObuXPmIgI4ZMyQLIz48cJYgSyWdjUXc2SZAdyJMwEAU= golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5/go.mod h1:UBKtEnL8aqnd+0JHqZ+2qoMDwtuy6cYhhKNoHLBiTQc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2844,8 +2842,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2855,8 +2853,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -3155,8 +3153,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0-dev.0.20210907181116-2f3355d2244e/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= +google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d h1:CJP00gEaaYNJuaTXEg456rWNC1oUOfiAiUjuwyAhEmM= google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= From 2febd082fe8c31c215f7138e14a62dc348e08a6e Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Tue, 12 Nov 2024 16:59:59 +0100 Subject: [PATCH 05/15] BUILD.bazel: different package path for annotations pkg Similar but different error: ``` link: package conflict error: google.golang.org/genproto/googleapis/cloud/location: package imports google.golang.org/genproto/googleapis/api/annotations was compiled with: @org_golang_google_genproto//googleapis/api/annotations:annotations but was linked with: @org_golang_google_genproto_googleapis_api//annotations:annotations ``` Compare with the original: ``` link: package conflict error: cloud.google.com/go/pubsub/apiv1/pubsubpb: package imports google.golang.org/genproto/googleapis/api/annotations was compiled with: @org_golang_google_genproto_googleapis_api//annotations:annotations but was linked with: @org_golang_google_genproto//googleapis/api/annotations:annotations ``` --- BUILD.bazel | 2 +- pkg/server/serverpb/BUILD.bazel | 2 +- pkg/ts/tspb/BUILD.bazel | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index c0c2d1a2232d..9834866920f8 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -45,7 +45,7 @@ exports_files([ # gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto # gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto # gazelle:resolve proto proto google/api/annotations.proto @go_googleapis//google/api:annotations_proto -# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto//googleapis/api/annotations:go_default_library +# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations:go_default_library # gazelle:resolve proto io/prometheus/client/metrics.proto @com_github_prometheus_client_model//io/prometheus/client:io_prometheus_client_proto # gazelle:resolve proto go io/prometheus/client/metrics.proto @com_github_prometheus_client_model//go # gazelle:resolve go github.com/prometheus/client_model/go @com_github_prometheus_client_model//go diff --git a/pkg/server/serverpb/BUILD.bazel b/pkg/server/serverpb/BUILD.bazel index dec568961239..871d6bf73bb8 100644 --- a/pkg/server/serverpb/BUILD.bazel +++ b/pkg/server/serverpb/BUILD.bazel @@ -94,7 +94,7 @@ go_proto_library( # NB: The grpc-gateway compiler injects a dependency on the descriptor # package that Gazelle isn't prepared to deal with. "@com_github_golang_protobuf//descriptor:go_default_library_gen", # keep - "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", ], ) diff --git a/pkg/ts/tspb/BUILD.bazel b/pkg/ts/tspb/BUILD.bazel index b349a741042c..73759f3792e3 100644 --- a/pkg/ts/tspb/BUILD.bazel +++ b/pkg/ts/tspb/BUILD.bazel @@ -38,6 +38,6 @@ go_proto_library( "//pkg/roachpb", "@com_github_gogo_protobuf//gogoproto", "@com_github_golang_protobuf//descriptor:go_default_library_gen", # keep - "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", ], ) From 9d4d62b4ca52814f96658b6e089dd346ac9995f6 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Tue, 12 Nov 2024 17:08:34 +0100 Subject: [PATCH 06/15] also replace annotation refs in patch files Error unchanged from last commit. I did remember to `./dev gen bazel`. ``` link: package conflict error: google.golang.org/genproto/googleapis/cloud/location: package imports google.golang.org/genproto/googleapis/api/annotations was compiled with: @org_golang_google_genproto//googleapis/api/annotations:annotations but was linked with: @org_golang_google_genproto_googleapis_api//annotations:annotations ``` --- build/patches/com_github_buchgr_bazel_remote.patch | 4 ++-- build/patches/com_github_grpc_ecosystem_grpc_gateway.patch | 2 +- build/patches/go_googleapis.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/patches/com_github_buchgr_bazel_remote.patch b/build/patches/com_github_buchgr_bazel_remote.patch index f83782dc9e1a..c2de4ac43cd6 100644 --- a/build/patches/com_github_buchgr_bazel_remote.patch +++ b/build/patches/com_github_buchgr_bazel_remote.patch @@ -113,7 +113,7 @@ diff -urN a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/ba - "@go_googleapis//google/rpc:status_go_proto", - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", @@ -133,7 +133,7 @@ diff -urN a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/buil - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//googleapis/longrunning:go_default_library", + "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", diff --git a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch index a2256cfcb0df..817e5efa499c 100644 --- a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch +++ b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch @@ -40,7 +40,7 @@ index 02aa7d2a8..fd922a156 100644 + "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library", "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto", - "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", ], ) diff --git a/build/patches/go_googleapis.patch b/build/patches/go_googleapis.patch index 6ebc6706fd9a..e63566cea164 100644 --- a/build/patches/go_googleapis.patch +++ b/build/patches/go_googleapis.patch @@ -10,7 +10,7 @@ diff -urN a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", ], ) @@ -28,7 +28,7 @@ diff -urN a/google/devtools/build/v1/BUILD.bazel a/google/devtools/build/v1/BUIL + "@com_github_golang_protobuf//ptypes/empty:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", ], ) From e3b137c096ee77022bb9d9ee82ffed5495f9ce1b Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Tue, 12 Nov 2024 17:44:34 +0100 Subject: [PATCH 07/15] go.mod: go get google.golang.org/genproto@v0.0.0-20230526161137-0005af68ea54 See https://github.com/googleapis/go-genproto/issues/1015. Sadly grpc-gateway is incompatible with this version of `genproto`: ``` ERROR: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. ERROR: /private/var/tmp/_bazel_tbg/b1346cddcc70d57afdaa90f7f09f9b2c/external/com_github_grpc_ecosystem_grpc_gateway/runtime/BUILD.bazel:5:11: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. and referenced by '@@com_github_grpc_ecosystem_grpc_gateway//runtime:go_default_library' ``` Since we are on the final `grpc-gateway/v1` version already[^1], we'll have to make the leap to v2 to fix this. [^1]: https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.16.0 --- DEPS.bzl | 46 ++----------------------------- build/bazelutil/distdir_files.bzl | 6 +--- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 7 insertions(+), 49 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index cde24b199012..c725783f7975 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -9392,16 +9392,6 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeregistry/com_google_cloud_go_apigeeregistry-v0.6.0.zip", ], ) - go_repository( - name = "com_google_cloud_go_apikeys", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/apikeys", - sha256 = "511ba83f3837459a9e553026ecf556ebec9007403054635d90f065f7d735ddbe", - strip_prefix = "cloud.google.com/go/apikeys@v0.6.0", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apikeys/com_google_cloud_go_apikeys-v0.6.0.zip", - ], - ) go_repository( name = "com_google_cloud_go_appengine", build_file_proto_mode = "disable_global", @@ -10322,16 +10312,6 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/securitycenter/com_google_cloud_go_securitycenter-v1.19.0.zip", ], ) - go_repository( - name = "com_google_cloud_go_servicecontrol", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/servicecontrol", - sha256 = "499ce8763d315e0ffdf3705549a507051a27eff9b8dec9debe43bca8d130fabb", - strip_prefix = "cloud.google.com/go/servicecontrol@v1.11.1", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicecontrol/com_google_cloud_go_servicecontrol-v1.11.1.zip", - ], - ) go_repository( name = "com_google_cloud_go_servicedirectory", build_file_proto_mode = "disable_global", @@ -10342,26 +10322,6 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicedirectory/com_google_cloud_go_servicedirectory-v1.9.0.zip", ], ) - go_repository( - name = "com_google_cloud_go_servicemanagement", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/servicemanagement", - sha256 = "2e02a723d1c226c2ecba4e47892b96052efb941be2910fd7afc38197f5bc6083", - strip_prefix = "cloud.google.com/go/servicemanagement@v1.8.0", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicemanagement/com_google_cloud_go_servicemanagement-v1.8.0.zip", - ], - ) - go_repository( - name = "com_google_cloud_go_serviceusage", - build_file_proto_mode = "disable_global", - importpath = "cloud.google.com/go/serviceusage", - sha256 = "377bad0176bbec558ddb55b1fe10318e2c034c9e87536aba1ba8216b57548f3f", - strip_prefix = "cloud.google.com/go/serviceusage@v1.6.0", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/serviceusage/com_google_cloud_go_serviceusage-v1.6.0.zip", - ], - ) go_repository( name = "com_google_cloud_go_shell", build_file_proto_mode = "disable_global", @@ -11479,10 +11439,10 @@ def go_deps(): name = "org_golang_google_genproto", build_file_proto_mode = "disable_global", importpath = "google.golang.org/genproto", - sha256 = "28f0317e6948788a33c07698109005675062f0203ed06bc866350a575bc974bf", - strip_prefix = "google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1", + sha256 = "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766", + strip_prefix = "google.golang.org/genproto@v0.0.0-20230526161137-0005af68ea54", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index f8af5f6ce5e8..d9c19961d91a 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -10,7 +10,6 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigateway/com_google_cloud_go_apigateway-v1.5.0.zip": "81f9cf7d46093a4cf3bb6dfb7ea942784295f093261c45698656dd844bdfa163", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeconnect/com_google_cloud_go_apigeeconnect-v1.5.0.zip": "a0ae141afd9c762b722778b3508dcc459e18c6890a22586235dafc0f436532a2", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeregistry/com_google_cloud_go_apigeeregistry-v0.6.0.zip": "1cf7728c1b8d31247d5c2ec10b4b252d6224e9549c2ee7d2222b482dec8aeba4", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apikeys/com_google_cloud_go_apikeys-v0.6.0.zip": "511ba83f3837459a9e553026ecf556ebec9007403054635d90f065f7d735ddbe", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/appengine/com_google_cloud_go_appengine-v1.7.1.zip": "09f35ee5b9d8782bced76b733c7c3a2a5f3b9e41630236a47854b4a92567e646", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/area120/com_google_cloud_go_area120-v0.7.1.zip": "7dcfdf365eb9f29fcedf29b8e32f0023b829732869dc7ad9a2cd8450cbdea8df", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/artifactregistry/com_google_cloud_go_artifactregistry-v1.13.0.zip": "abf73586bdced0f590918b37f19643646c3aa04a651480cbdbfad86171f03d98", @@ -104,10 +103,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/secretmanager/com_google_cloud_go_secretmanager-v1.10.0.zip": "d24cb4f507e9d531f7d75a4b070bff5f9dc548a2be1591337f4865cd8b084929", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/security/com_google_cloud_go_security-v1.13.0.zip": "e74202ce5419ed745d1c8089a2e4ffb790c0bc045d4f4ab788129ea0f0f5576d", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/securitycenter/com_google_cloud_go_securitycenter-v1.19.0.zip": "0f451a28499260a21edf268bb8b657fc55fb81a883ab47fb3d2ca472f8707afd", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicecontrol/com_google_cloud_go_servicecontrol-v1.11.1.zip": "499ce8763d315e0ffdf3705549a507051a27eff9b8dec9debe43bca8d130fabb", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicedirectory/com_google_cloud_go_servicedirectory-v1.9.0.zip": "4705df69c7e353bfa6a03dad8a50dde5066151b82528946b818df40547c79088", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicemanagement/com_google_cloud_go_servicemanagement-v1.8.0.zip": "2e02a723d1c226c2ecba4e47892b96052efb941be2910fd7afc38197f5bc6083", - "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/serviceusage/com_google_cloud_go_serviceusage-v1.6.0.zip": "377bad0176bbec558ddb55b1fe10318e2c034c9e87536aba1ba8216b57548f3f", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/shell/com_google_cloud_go_shell-v1.6.0.zip": "f88e9c2ff25a5ea22d71a1125cc6e756845ec8221c821092d05e67859966ca48", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/spanner/com_google_cloud_go_spanner-v1.45.0.zip": "e4f3951ea69d07ed383f41579c3a6af8e639558ecfa796421dc6cf3d268118ec", "https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/speech/com_google_cloud_go_speech-v1.15.0.zip": "27c7d30f3573b4d14a6096588fef65635bf7df8b98e921e934a0af1c7fcf7771", @@ -1116,7 +1112,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/cloud/org_golang_google_cloud-v0.0.0-20151119220103-975617b05ea8.zip": "b1d5595a11b88273665d35d4316edbd4545731c979d046c82844fafef2039c2a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip": "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip": "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac", - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip": "28f0317e6948788a33c07698109005675062f0203ed06bc866350a575bc974bf", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip": "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", diff --git a/go.mod b/go.mod index 094e6d50f614..4060bea85ae4 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( github.com/google/pprof v0.0.0-20210827144239-02619b876842 github.com/google/uuid v1.6.0 // indirect google.golang.org/api v0.114.0 - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 + google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.1 ) diff --git a/go.sum b/go.sum index e777aff92be6..ea97d5f7a0e1 100644 --- a/go.sum +++ b/go.sum @@ -3115,6 +3115,8 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M= +google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= From 91eaa33b9ddd0cdcce00e180a3f91f425cfd6391 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Tue, 26 Nov 2024 14:45:07 -0600 Subject: [PATCH 08/15] build: update patches to be consistent with new version of pkgs This also adds the bytestream and rpc packages from genproto which are required. Epic: none Release note: None --- DEPS.bzl | 16 +++++++++++++--- build/bazelutil/distdir_files.bzl | 3 ++- .../patches/com_github_buchgr_bazel_remote.patch | 12 ++++++------ .../com_github_grpc_ecosystem_grpc_gateway.patch | 2 +- go.mod | 4 +++- go.sum | 6 ++++++ 6 files changed, 31 insertions(+), 12 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index c725783f7975..86a2346c0ee1 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -11455,6 +11455,16 @@ def go_deps(): "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip", ], ) + go_repository( + name = "org_golang_google_genproto_googleapis_bytestream", + build_file_proto_mode = "disable_global", + importpath = "google.golang.org/genproto/googleapis/bytestream", + sha256 = "7bd7611524b7d7bbb16b622b76875da123daefbc5d933a1f23106303d0061970", + strip_prefix = "google.golang.org/genproto/googleapis/bytestream@v0.0.0-20241118233622-e639e219e697", + urls = [ + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/bytestream/org_golang_google_genproto_googleapis_bytestream-v0.0.0-20241118233622-e639e219e697.zip", + ], + ) go_repository( name = "org_golang_google_genproto_googleapis_rpc", build_file_proto_mode = "disable_global", @@ -11499,10 +11509,10 @@ def go_deps(): name = "org_golang_google_protobuf", build_file_proto_mode = "disable_global", importpath = "google.golang.org/protobuf", - sha256 = "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e", - strip_prefix = "google.golang.org/protobuf@v1.35.1", + sha256 = "6e509c9d87452302b9c3484ae7dfdbf740a33cc9cb54095e7eec305d7a4dfdc4", + strip_prefix = "google.golang.org/protobuf@v1.35.2", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.2.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index d9c19961d91a..081cd811b000 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -1111,12 +1111,13 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/appengine/org_golang_google_appengine-v1.6.7.zip": "79f80dfac18681788f1414e21a4a7734eff4cdf992070be9163103eb8d9f92cd", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/cloud/org_golang_google_cloud-v0.0.0-20151119220103-975617b05ea8.zip": "b1d5595a11b88273665d35d4316edbd4545731c979d046c82844fafef2039c2a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip": "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/bytestream/org_golang_google_genproto_googleapis_bytestream-v0.0.0-20241118233622-e639e219e697.zip": "7bd7611524b7d7bbb16b622b76875da123daefbc5d933a1f23106303d0061970", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip": "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip": "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip": "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e", + "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.2.zip": "6e509c9d87452302b9c3484ae7dfdbf740a33cc9cb54095e7eec305d7a4dfdc4", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/alecthomas/kingpin.v2/in_gopkg_alecthomas_kingpin_v2-v2.2.6.zip": "638080591aefe7d2642f2575b627d534c692606f02ea54ba89f42db112ba8839", diff --git a/build/patches/com_github_buchgr_bazel_remote.patch b/build/patches/com_github_buchgr_bazel_remote.patch index c2de4ac43cd6..7bc6240bc94b 100644 --- a/build/patches/com_github_buchgr_bazel_remote.patch +++ b/build/patches/com_github_buchgr_bazel_remote.patch @@ -114,7 +114,7 @@ diff -urN a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/ba - "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:timestamp_go_proto", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", -+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", ++ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", "@org_golang_google_grpc//:go_default_library", @@ -135,7 +135,7 @@ diff -urN a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/buil - "@io_bazel_rules_go//proto/wkt:wrappers_go_proto", + "@org_golang_google_genproto_googleapis_api//annotations:go_default_library", + "@org_golang_google_genproto//googleapis/longrunning:go_default_library", -+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", ++ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", @@ -153,9 +153,9 @@ index f60cf80..ba707d3 100644 - "@go_googleapis//google/bytestream:bytestream_go_proto", - "@go_googleapis//google/rpc:code_go_proto", - "@go_googleapis//google/rpc:status_go_proto", -+ "@org_golang_google_genproto//googleapis/bytestream:go_default_library", -+ "@org_golang_google_genproto//googleapis/rpc/code:go_default_library", -+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", ++ "@org_golang_google_genproto_googleapis_bytestream//:go_default_library", ++ "@org_golang_google_genproto_googleapis_rpc//code:go_default_library", ++ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//encoding/gzip:go_default_library", @@ -164,7 +164,7 @@ index f60cf80..ba707d3 100644 "@com_github_golang_protobuf//proto:go_default_library", "@com_github_google_uuid//:go_default_library", - "@go_googleapis//google/bytestream:bytestream_go_proto", -+ "@org_golang_google_genproto//googleapis/bytestream:go_default_library", ++ "@org_golang_google_genproto_googleapis_bytestream//:go_default_library", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//status:go_default_library", diff --git a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch index 817e5efa499c..ba38eda61967 100644 --- a/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch +++ b/build/patches/com_github_grpc_ecosystem_grpc_gateway.patch @@ -65,7 +65,7 @@ index c4d18f624..41d5319fb 100644 + "@com_github_golang_protobuf//ptypes/duration:go_default_library", + "@com_github_golang_protobuf//ptypes/timestamp:go_default_library", + "@com_github_golang_protobuf//ptypes/wrappers:go_default_library", -+ "@org_golang_google_genproto//googleapis/api/httpbody:go_default_library", ++ "@org_golang_google_genproto_googleapis_api//httpbody:go_default_library", + "@org_golang_google_genproto//protobuf/field_mask:go_default_library", "@org_golang_google_grpc//codes:go_default_library", "@org_golang_google_grpc//grpclog:go_default_library", diff --git a/go.mod b/go.mod index 4060bea85ae4..099ada308709 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,7 @@ require ( google.golang.org/api v0.114.0 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 google.golang.org/grpc v1.68.0 - google.golang.org/protobuf v1.35.1 + google.golang.org/protobuf v1.35.2 ) // If any of the following dependencies get updated as a side-effect @@ -444,6 +444,8 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gonum.org/v1/plot v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) diff --git a/go.sum b/go.sum index ea97d5f7a0e1..96ed2f83b12c 100644 --- a/go.sum +++ b/go.sum @@ -3117,6 +3117,10 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 h1:rY93Be8/KL+EtFM4im9lxMzjGn796GnwVUd75cyFCJg= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697/go.mod h1:qUsLYwbwz5ostUWtuFuXPlHmSJodC5NI/88ZlHj4M1o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -3176,6 +3180,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/DataDog/dd-trace-go.v1 v1.17.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= From 003514d3d148c991d8faec1136af6adcada83c76 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Wed, 27 Nov 2024 09:33:19 +0100 Subject: [PATCH 09/15] go mod tidy --- go.mod | 1 + go.sum | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 099ada308709..63c1f4b020d4 100644 --- a/go.mod +++ b/go.mod @@ -251,6 +251,7 @@ require ( golang.org/x/term v0.24.0 golang.org/x/tools/go/vcs v0.1.0-deprecated gonum.org/v1/gonum v0.15.1 + google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 honnef.co/go/tools v0.4.5 diff --git a/go.sum b/go.sum index 96ed2f83b12c..ef1bcd9c28f6 100644 --- a/go.sum +++ b/go.sum @@ -3113,10 +3113,10 @@ google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwy google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= +google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 h1:rY93Be8/KL+EtFM4im9lxMzjGn796GnwVUd75cyFCJg= google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697/go.mod h1:qUsLYwbwz5ostUWtuFuXPlHmSJodC5NI/88ZlHj4M1o= google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= @@ -3178,8 +3178,6 @@ google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX7 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/DataDog/dd-trace-go.v1 v1.17.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg= From e8199931b8bbd274a8afa04eb9cb6267ff27fe8c Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Thu, 28 Nov 2024 16:16:49 +0100 Subject: [PATCH 10/15] DEPS: switch to grpc fork at v1.68.0-noalpncheck This works around the issue discussed in #136367. Apparently, we have some misconfiguration or bug in gRPC v1.56.3 that makes the gRPC server seem unable to properly support HTTP2. This effectively breaks communication between CRDB nodes at these two different gRPC versions. Switch to a fork that disables the check (there is no other way to disable it other than changing code). --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 3 +++ go.sum | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 86a2346c0ee1..5faebfe2d6c3 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -11479,10 +11479,10 @@ def go_deps(): name = "org_golang_google_grpc", build_file_proto_mode = "disable_global", importpath = "google.golang.org/grpc", - sha256 = "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", - strip_prefix = "google.golang.org/grpc@v1.68.0", + sha256 = "69298d07c23c6fd53d5a8e1fc30f9f697875aa8367074306bb57cf5487fbf927", + strip_prefix = "github.com/cockroachdb/grpc-go@v1.68.0-noalpncheck", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 081cd811b000..f8e8281c196d 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -349,6 +349,7 @@ DISTDIR_FILES = { "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.20241118145159-46874edb1b83.zip": "1382d1ef3a015855f8268c595e2afeef7ae7374b7e27c2181b27a42c2fb639a7", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.zip": "69298d07c23c6fd53d5a8e1fc30f9f697875aa8367074306bb57cf5487fbf927", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241125211801-f5057c948b65.zip": "7139420e4eb4a61d1b1b01e921eb12480d9b5ae1045509178533d492d8dc49a6", @@ -1116,7 +1117,6 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip": "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11", - "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562", "https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.2.zip": "6e509c9d87452302b9c3484ae7dfdbf740a33cc9cb54095e7eec305d7a4dfdc4", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09", "https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf", diff --git a/go.mod b/go.mod index 63c1f4b020d4..8e4c3670461e 100644 --- a/go.mod +++ b/go.mod @@ -486,3 +486,6 @@ replace github.com/docker/docker => github.com/moby/moby v24.0.6+incompatible replace golang.org/x/time => github.com/cockroachdb/x-time v0.3.1-0.20230525123634-71747adb5d5c replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83 + +// See https://github.com/cockroachdb/cockroach/issues/136367. +replace google.golang.org/grpc v1.68.0 => github.com/cockroachdb/grpc-go v1.68.0-noalpncheck diff --git a/go.sum b/go.sum index ef1bcd9c28f6..fce8624273fd 100644 --- a/go.sum +++ b/go.sum @@ -538,6 +538,8 @@ github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83 h1:PVow08b github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83/go.mod h1:wIrkfXJOUk95vmhcdlmaou6FpqbEExZWBM7EAtKDvYg= github.com/cockroachdb/gostdlib v1.19.0 h1:cSISxkVnTlWhTkyple/T6NXzOi5659FkhxvUgZv+Eb0= github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTymPZUKMfURjBtY= +github.com/cockroachdb/grpc-go v1.68.0-noalpncheck h1:odM3/chhjRTmDlD/3ndnBNsswAbbImC1RQCf+qrtO98= +github.com/cockroachdb/grpc-go v1.68.0-noalpncheck/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= @@ -3159,8 +3161,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0-dev.0.20210907181116-2f3355d2244e/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= -google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d h1:CJP00gEaaYNJuaTXEg456rWNC1oUOfiAiUjuwyAhEmM= google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= From 8030eb35d69274c1dcc5aa9e2ac5ebb2d5e1aa7a Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Thu, 28 Nov 2024 16:39:06 +0100 Subject: [PATCH 11/15] go.mod: add comments about `replace`d deps Replacements unconditionally replace the dependency, so it's nice to point out that whatever the version in go.mod claims is not actually what is being used. --- go.mod | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/go.mod b/go.mod index 8e4c3670461e..beb3406b24ae 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( golang.org/x/sync v0.8.0 golang.org/x/sys v0.25.0 golang.org/x/text v0.19.0 + // NOTE: `replace` directive in effect! golang.org/x/time v0.3.0 golang.org/x/tools v0.24.0 ) @@ -29,6 +30,7 @@ require ( // reviewers. require ( github.com/gogo/googleapis v1.4.1 // indirect + // NOTE: `replace` directive in effect! github.com/gogo/protobuf v1.3.2 github.com/golang/geo v0.0.0-20200319012246-673a6f80352d github.com/golang/mock v1.6.0 @@ -39,6 +41,7 @@ require ( github.com/google/uuid v1.6.0 // indirect google.golang.org/api v0.114.0 google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 + // NOTE: `replace` directive in effect. google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.2 ) @@ -147,6 +150,7 @@ require ( github.com/dave/dst v0.24.0 github.com/davecgh/go-spew v1.1.1 github.com/docker/distribution v2.7.1+incompatible + // NOTE: `replace` directive in effect! github.com/docker/docker v24.0.6+incompatible github.com/docker/go-connections v0.4.0 github.com/dustin/go-humanize v1.0.0 @@ -206,6 +210,7 @@ require ( github.com/montanaflynn/stats v0.7.0 github.com/mozillazg/go-slugify v0.2.0 github.com/nightlyone/lockfile v1.0.0 + // NOTE: `replace` directive in effect! github.com/olekukonko/tablewriter v0.0.5-0.20200416053754-163badb3bac6 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 github.com/otan/gopgkrb5 v1.0.3 @@ -252,9 +257,11 @@ require ( golang.org/x/tools/go/vcs v0.1.0-deprecated gonum.org/v1/gonum v0.15.1 google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 + // NOTE: `replace` directive in effect! gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 honnef.co/go/tools v0.4.5 + // NOTE: `replace` directive in effect! vitess.io/vitess v0.0.0-00010101000000-000000000000 ) @@ -305,6 +312,7 @@ require ( github.com/campoy/embedmd v1.0.0 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect + // NOTE: `replace` directive in effect! github.com/charmbracelet/bubbletea v0.23.1 // indirect github.com/charmbracelet/lipgloss v0.6.0 // indirect github.com/cockroachdb/swiss v0.0.0-20240612210725-f4de07ae6964 // indirect From e122511e4cb4a11db12adc26b0f295d176a13735 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Thu, 28 Nov 2024 16:39:45 +0100 Subject: [PATCH 12/15] go.mod: explain gRPC replace directive Closes https://github.com/cockroachdb/cockroach/issues/136367. --- go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.mod b/go.mod index beb3406b24ae..e462c31ffa76 100644 --- a/go.mod +++ b/go.mod @@ -496,4 +496,6 @@ 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.20241118145159-46874edb1b83 // See https://github.com/cockroachdb/cockroach/issues/136367. +// We must use the noalpncheck version of grpc-go until the MinSupportedVersion +// also uses gRPC at v1.68.0 or above. replace google.golang.org/grpc v1.68.0 => github.com/cockroachdb/grpc-go v1.68.0-noalpncheck From 61086c9dbb15bb80c68522b6823dc13716e99323 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Thu, 28 Nov 2024 16:40:45 +0100 Subject: [PATCH 13/15] go.mod: remove replace directive for unused dep --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index e462c31ffa76..68b51ab2ba35 100644 --- a/go.mod +++ b/go.mod @@ -483,8 +483,6 @@ replace github.com/charmbracelet/bubbletea => github.com/cockroachdb/bubbletea v replace github.com/olekukonko/tablewriter => github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847 -replace github.com/abourget/teamcity => github.com/cockroachdb/teamcity v0.0.0-20180905144921-8ca25c33eb11 - replace vitess.io/vitess => github.com/cockroachdb/vitess v0.0.0-20210218160543-54524729cc82 replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20210825132133-2d6955c8edbc From 30c2d902db06a9f1eb2a07b56d6cf61a2f642d3d Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Fri, 29 Nov 2024 12:41:58 +0100 Subject: [PATCH 14/15] rpc: adopt io.Reader in snappyCompressor.DecompressedSize This is less efficient since it needs to scan the entire reader but our hand is forced by gRPC changing away from a byte slice. --- pkg/rpc/snappy.go | 44 ++++++++++++++++++++++++++++++------------ pkg/rpc/snappy_test.go | 4 ++-- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/pkg/rpc/snappy.go b/pkg/rpc/snappy.go index a8a234b6ac09..282a549b986e 100644 --- a/pkg/rpc/snappy.go +++ b/pkg/rpc/snappy.go @@ -154,8 +154,8 @@ func (snappyCompressor) Decompress(r io.Reader) (io.Reader, error) { // pre-allocate a buffer with the exact decompressed size instead of needing to // dynamically grow the buffer while decompressing (in io.ReadAll), which can // incur multiple allocations and memory copies. -func (snappyCompressor) DecompressedSize(p []byte) int { - v, ok := readDecompressedLength(p) +func (snappyCompressor) DecompressedSize(p io.Reader) int { + v, ok := readDecompressedLengthReader(p) if !ok { // No decompressed size chunk. return -1 @@ -175,6 +175,13 @@ func writeDecompressedLength(dst *[chunkTypeDecompressedLengthMaxSize]byte, v in return 4 + chunkLen } +var readDecompressedLengthScratchPool = sync.Pool{ + New: func() any { + sl := make([]byte, binary.MaxVarintLen64) + return &sl + }, +} + // readDecompressedLength reads the decompressed length from the snappy // compressed data. It does so by stepping through the data chunk by chunk until // it finds the decompressed length chunk. @@ -183,26 +190,39 @@ func writeDecompressedLength(dst *[chunkTypeDecompressedLengthMaxSize]byte, v in // first will be returned. We could change this if it ever becomes important. // // The function returns (0, false) if the decompressed length chunk is missing. -func readDecompressedLength(p []byte) (int, bool) { +// +// TODO(server): this is called by grpc.decompress() and would be more efficient +// if the `p` they're passing in (mem.BufferSlice().Reader())` were an `io.Seeker`. +// Then we could more efficiently skip over all of the data chunks. +func readDecompressedLengthReader(p io.Reader) (int, bool) { + scratchRef := readDecompressedLengthScratchPool.Get() + defer readDecompressedLengthScratchPool.Put(scratchRef) + scratch := *(scratchRef.(*[]byte)) for { - if len(p) < 4 { + if n, err := p.Read(scratch[:4]); err != nil || n != 4 { // Corrupt chunk. return 0, false } - chunkType := p[0] - chunkLen := int(p[1]) | int(p[2])<<8 | int(p[3])<<16 - p = p[4:] // strip chunk header + chunkType := scratch[0] + chunkLen := int(scratch[1]) | int(scratch[2])<<8 | int(scratch[3])<<16 if chunkType != chunkTypeDecompressedLength { - if chunkLen > len(p) { - // Corrupt chunk. + // Jump to next chunk. + if _, err := io.CopyN(io.Discard, p, int64(chunkLen)); err != nil { + // Corruption. return 0, false } - // Jump to next chunk. - p = p[chunkLen:] continue } + if chunkLen > binary.MaxVarintLen64 { + // Corruption. + return 0, false + } // Decode the decompressed length chunk. - v, n := binary.Uvarint(p) + if _, err := io.ReadFull(p, scratch[:chunkLen]); err != nil { + // Corruption. + return 0, false + } + v, n := binary.Uvarint(scratch) if n <= 0 { // Uvarint decoding failed. return 0, false diff --git a/pkg/rpc/snappy_test.go b/pkg/rpc/snappy_test.go index 8245467ddd94..9cc1c14649e2 100644 --- a/pkg/rpc/snappy_test.go +++ b/pkg/rpc/snappy_test.go @@ -39,7 +39,7 @@ func TestSnappyCompressorCompressDecompress(t *testing.T) { require.Equal(t, tt.expOut, out) // Decompress. - n := c.DecompressedSize(out) + n := c.DecompressedSize(bytes.NewReader(out)) require.Equal(t, len(tt.in), n) r, err := c.Decompress(bytes.NewReader(out)) @@ -65,7 +65,7 @@ func TestSnappyCompressorDecompressedSize(t *testing.T) { {"corrupt length chunk", []byte{0xff, 0x6, 0x0, 0x0, 0x73, 0x4e, 0x61, 0x50, 0x70, 0x59, 0x1, 0x7, 0x0, 0x0, 0x4b, 0xfb, 0x81, 0xf5, 0x41, 0x42, 0x43, 0xb0, 0x2, 0x0, 0x0, 0x3}, -1}, } { t.Run(fmt.Sprintf("input=%v", tt.in), func(t *testing.T) { - n := c.DecompressedSize(tt.in) + n := c.DecompressedSize(bytes.NewReader(tt.in)) require.Equal(t, tt.exp, n) }) } From 130165697310704388794ff0eab3f4d07f12fb85 Mon Sep 17 00:00:00 2001 From: Tobias Grieger Date: Fri, 29 Nov 2024 13:55:21 +0100 Subject: [PATCH 15/15] DEPS: bump grpc to pick up Decompressor patch See https://github.com/cockroachdb/grpc-go/releases/tag/v1.68.0-noalpncheck%2Bdecompsize: Re-instate (Decompressor).DecompressedSize optimization This is a) for parity with how gRPC v1.56.3 worked. But also it showed up as a giant regression in allocations, as we were now going through `io.Copy` which allocates a temporary 32KiB buffer. Our payloads are often much smaller. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 11 ++++++++--- go.sum | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 5faebfe2d6c3..6d47c584c752 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -11479,10 +11479,10 @@ def go_deps(): name = "org_golang_google_grpc", build_file_proto_mode = "disable_global", importpath = "google.golang.org/grpc", - sha256 = "69298d07c23c6fd53d5a8e1fc30f9f697875aa8367074306bb57cf5487fbf927", - strip_prefix = "github.com/cockroachdb/grpc-go@v1.68.0-noalpncheck", + sha256 = "8378992958322f6f002fd9fddd621055ddba00653d30b4fa3b16bc4faef9a0e9", + strip_prefix = "github.com/cockroachdb/grpc-go@v1.68.0-noalpncheck.0.20241129124825-5710e83f714e", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.0.20241129124825-5710e83f714e.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index f8e8281c196d..92761cd1b131 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -349,7 +349,7 @@ DISTDIR_FILES = { "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.20241118145159-46874edb1b83.zip": "1382d1ef3a015855f8268c595e2afeef7ae7374b7e27c2181b27a42c2fb639a7", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.zip": "69298d07c23c6fd53d5a8e1fc30f9f697875aa8367074306bb57cf5487fbf927", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/grpc-go/com_github_cockroachdb_grpc_go-v1.68.0-noalpncheck.0.20241129124825-5710e83f714e.zip": "8378992958322f6f002fd9fddd621055ddba00653d30b4fa3b16bc4faef9a0e9", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241125211801-f5057c948b65.zip": "7139420e4eb4a61d1b1b01e921eb12480d9b5ae1045509178533d492d8dc49a6", diff --git a/go.mod b/go.mod index 68b51ab2ba35..1b3601b18c8a 100644 --- a/go.mod +++ b/go.mod @@ -493,7 +493,12 @@ 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.20241118145159-46874edb1b83 -// See https://github.com/cockroachdb/cockroach/issues/136367. // We must use the noalpncheck version of grpc-go until the MinSupportedVersion -// also uses gRPC at v1.68.0 or above. -replace google.golang.org/grpc v1.68.0 => github.com/cockroachdb/grpc-go v1.68.0-noalpncheck +// also uses gRPC at v1.68.0 or above. Also, v1.68.0 lost an optimization that +// allowed the Decompressor (snappyDecompressor) in our case to announce how many +// bytes the decompressed data will occupy. This led to a blow-up in allocated bytes +// for workloads in which requests weigh in at less than 32KiB, which is common. +// +// See https://github.com/cockroachdb/cockroach/issues/136367 for `noalpncheck`. +// See https://github.com/cockroachdb/cockroach/pull/136278#issuecomment-2506494078 for `decompsize`. +replace google.golang.org/grpc v1.68.0 => github.com/cockroachdb/grpc-go v1.68.0-noalpncheck.0.20241129124825-5710e83f714e diff --git a/go.sum b/go.sum index fce8624273fd..7480a52f63c5 100644 --- a/go.sum +++ b/go.sum @@ -538,8 +538,8 @@ github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83 h1:PVow08b github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83/go.mod h1:wIrkfXJOUk95vmhcdlmaou6FpqbEExZWBM7EAtKDvYg= github.com/cockroachdb/gostdlib v1.19.0 h1:cSISxkVnTlWhTkyple/T6NXzOi5659FkhxvUgZv+Eb0= github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTymPZUKMfURjBtY= -github.com/cockroachdb/grpc-go v1.68.0-noalpncheck h1:odM3/chhjRTmDlD/3ndnBNsswAbbImC1RQCf+qrtO98= -github.com/cockroachdb/grpc-go v1.68.0-noalpncheck/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= +github.com/cockroachdb/grpc-go v1.68.0-noalpncheck.0.20241129124825-5710e83f714e h1:GQwFV3zGH//OOqgUUhV2rL22w6SL9MAau0MlDRzFS6E= +github.com/cockroachdb/grpc-go v1.68.0-noalpncheck.0.20241129124825-5710e83f714e/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=