Skip to content

Commit 235cc67

Browse files
biosvsbiosvs
authored
Upgraded grpc-go to v1.59.0 (#2320)
1 parent a368e37 commit 235cc67

File tree

9 files changed

+50
-234
lines changed

9 files changed

+50
-234
lines changed

‎CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
=======
88
## [Unreleased]
9-
- No changes yet.
9+
### Changed
10+
- Updated grpc-go to v1.59.0
1011

1112
## [1.75.0] - 2024-10-15
1213
### Added

‎go.mod

+3-8
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ require (
3333
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
3434
golang.org/x/net v0.27.0
3535
golang.org/x/tools v0.22.0
36-
google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
37-
google.golang.org/grpc v1.50.0
36+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
37+
google.golang.org/grpc v1.59.0
3838
google.golang.org/protobuf v1.34.1
3939
gopkg.in/yaml.v2 v2.4.0
4040
honnef.co/go/tools v0.4.3
@@ -45,14 +45,12 @@ require (
4545
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
4747
github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748 // indirect
48-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
48+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4949
github.com/davecgh/go-spew v1.1.1 // indirect
5050
github.com/fatih/structtag v1.2.0 // indirect
51-
github.com/google/go-cmp v0.6.0 // indirect
5251
github.com/jessevdk/go-flags v1.5.0 // indirect
5352
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
5453
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
55-
github.com/pkg/errors v0.9.1 // indirect
5654
github.com/pmezard/go-difflib v1.0.0 // indirect
5755
github.com/prometheus/client_golang v1.4.1 // indirect
5856
github.com/prometheus/client_model v0.2.0 // indirect
@@ -71,6 +69,3 @@ require (
7169
golang.org/x/text v0.16.0 // indirect
7270
gopkg.in/yaml.v3 v3.0.1 // indirect
7371
)
74-
75-
// google.golang.org/genproto upgrade leads to grpc upgrade, which we're not ready for yet.
76-
replace google.golang.org/grpc => google.golang.org/grpc v1.44.0

‎go.sum

+12-94
Large diffs are not rendered by default.

‎internal/crossdock/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ require (
1919
go.uber.org/yarpc v1.42.1
2020
go.uber.org/zap v1.27.0
2121
golang.org/x/net v0.27.0
22-
google.golang.org/grpc v1.50.0
22+
google.golang.org/grpc v1.59.0
2323
)
2424

2525
require (
2626
github.com/BurntSushi/toml v1.2.1 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
28-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
28+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2929
github.com/davecgh/go-spew v1.1.1 // indirect
3030
github.com/gogo/googleapis v1.4.1 // indirect
3131
github.com/gogo/status v1.1.0 // indirect
@@ -50,7 +50,7 @@ require (
5050
golang.org/x/sys v0.22.0 // indirect
5151
golang.org/x/text v0.16.0 // indirect
5252
golang.org/x/tools v0.22.0 // indirect
53-
google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b // indirect
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
5454
google.golang.org/protobuf v1.34.1 // indirect
5555
gopkg.in/yaml.v2 v2.4.0 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -65,5 +65,3 @@ replace go.uber.org/yarpc => ../..
6565
// 'v' prefix for their SemVer releases, which is incompatible with Go
6666
// modules.
6767
replace github.com/apache/thrift => github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7
68-
69-
replace google.golang.org/grpc => google.golang.org/grpc v1.44.0

‎internal/crossdock/go.sum

+7-54
Large diffs are not rendered by default.

‎internal/examples/go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ require (
1313
go.uber.org/thriftrw v1.32.0
1414
go.uber.org/yarpc v1.42.1
1515
go.uber.org/zap v1.27.0
16-
google.golang.org/grpc v1.50.0
16+
google.golang.org/grpc v1.59.0
1717
)
1818

1919
require (
2020
github.com/BurntSushi/toml v1.2.1 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
22+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/gogo/googleapis v1.4.1 // indirect
2525
github.com/gogo/status v1.1.0 // indirect
@@ -46,13 +46,11 @@ require (
4646
golang.org/x/sys v0.22.0 // indirect
4747
golang.org/x/text v0.16.0 // indirect
4848
golang.org/x/tools v0.22.0 // indirect
49-
google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b // indirect
49+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
5050
google.golang.org/protobuf v1.34.1 // indirect
5151
gopkg.in/yaml.v2 v2.4.0 // indirect
5252
gopkg.in/yaml.v3 v3.0.1 // indirect
5353
honnef.co/go/tools v0.4.3 // indirect
5454
)
5555

5656
replace go.uber.org/yarpc => ../..
57-
58-
replace google.golang.org/grpc => google.golang.org/grpc v1.44.0

‎internal/examples/go.sum

+7-54
Large diffs are not rendered by default.

‎pkg/multiaddrpassthrough/multiaddrpassthrough_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -50,38 +50,38 @@ func TestParseTarget(t *testing.T) {
5050
}{
5151
{
5252
msg: "Single IPv4",
53-
target: resolver.Target{Endpoint: "1.2.3.4:1234", URL: url.URL{Path: "/1.2.3.4:1234"}},
53+
target: resolver.Target{URL: url.URL{Path: "/1.2.3.4:1234"}},
5454
addrsWant: []resolver.Address{{Addr: "1.2.3.4:1234"}},
5555
},
5656
{
5757
msg: "Single IPv4, leading slash",
58-
target: resolver.Target{Endpoint: "1.2.3.4:1234", URL: url.URL{Path: "/1.2.3.4:1234"}},
58+
target: resolver.Target{URL: url.URL{Path: "/1.2.3.4:1234"}},
5959
addrsWant: []resolver.Address{{Addr: "1.2.3.4:1234"}},
6060
},
6161
{
6262
msg: "Single IPv6",
63-
target: resolver.Target{Endpoint: "[2607:f8b0:400a:801::1001]:9000", URL: url.URL{Path: "/[2607:f8b0:400a:801::1001]:9000"}},
63+
target: resolver.Target{URL: url.URL{Path: "/[2607:f8b0:400a:801::1001]:9000"}},
6464
addrsWant: []resolver.Address{{Addr: "[2607:f8b0:400a:801::1001]:9000"}},
6565
},
6666
{
6767
msg: "Multiple IPv4s",
68-
target: resolver.Target{Endpoint: "1.2.3.4:1234/5.6.7.8:1234", URL: url.URL{Path: "/1.2.3.4:1234/5.6.7.8:1234"}},
68+
target: resolver.Target{URL: url.URL{Path: "/1.2.3.4:1234/5.6.7.8:1234"}},
6969
addrsWant: []resolver.Address{
7070
{Addr: "1.2.3.4:1234"},
7171
{Addr: "5.6.7.8:1234"},
7272
},
7373
},
7474
{
7575
msg: "Multiple IPv4s, double slash",
76-
target: resolver.Target{Endpoint: "1.2.3.4:1234//5.6.7.8:1234", URL: url.URL{Path: "/1.2.3.4:1234/5.6.7.8:1234"}},
76+
target: resolver.Target{URL: url.URL{Path: "/1.2.3.4:1234/5.6.7.8:1234"}},
7777
addrsWant: []resolver.Address{
7878
{Addr: "1.2.3.4:1234"},
7979
{Addr: "5.6.7.8:1234"},
8080
},
8181
},
8282
{
8383
msg: "Mixed IPv6 and IPv4",
84-
target: resolver.Target{Endpoint: "[2607:f8b0:400a:801::1001]:9000/[2607:f8b0:400a:801::1002]:2345/127.0.0.1:4567", URL: url.URL{Path: "/[2607:f8b0:400a:801::1001]:9000/[2607:f8b0:400a:801::1002]:2345/127.0.0.1:4567"}},
84+
target: resolver.Target{URL: url.URL{Path: "/[2607:f8b0:400a:801::1001]:9000/[2607:f8b0:400a:801::1002]:2345/127.0.0.1:4567"}},
8585
addrsWant: []resolver.Address{
8686
{Addr: "[2607:f8b0:400a:801::1001]:9000"},
8787
{Addr: "[2607:f8b0:400a:801::1002]:2345"},
@@ -90,12 +90,12 @@ func TestParseTarget(t *testing.T) {
9090
},
9191
{
9292
msg: "Empty target",
93-
target: resolver.Target{Endpoint: "", URL: url.URL{Path: "/"}},
93+
target: resolver.Target{URL: url.URL{Path: "/"}},
9494
errWant: errMissingAddr.Error(),
9595
},
9696
{
9797
msg: "Localhost",
98-
target: resolver.Target{Endpoint: "localhost:1000", URL: url.URL{Path: "/localhost:1000"}},
98+
target: resolver.Target{URL: url.URL{Path: "/localhost:1000"}},
9999
addrsWant: []resolver.Address{
100100
{Addr: "localhost:1000"},
101101
},
@@ -123,12 +123,12 @@ func TestBuild(t *testing.T) {
123123
}{
124124
{
125125
msg: "IPv6",
126-
target: resolver.Target{Endpoint: "[2001:db8::1]:http", URL: url.URL{Path: "/[2001:db8::1]:http"}},
126+
target: resolver.Target{URL: url.URL{Path: "/[2001:db8::1]:http"}},
127127
watAddress: []resolver.Address{{Addr: "[2001:db8::1]:http"}},
128128
},
129129
{
130130
msg: "Empty target",
131-
target: resolver.Target{Endpoint: "", URL: url.URL{Path: "/"}},
131+
target: resolver.Target{URL: url.URL{Path: "/"}},
132132
wantErr: errMissingAddr.Error(),
133133
},
134134
}
@@ -156,12 +156,12 @@ func TestClientConnectionIntegration(t *testing.T) {
156156
b := NewBuilder()
157157

158158
cc := &testClientConn{}
159-
_, err := b.Build(resolver.Target{Endpoint: dest, URL: url.URL{Path: dest}}, cc, resolver.BuildOptions{})
159+
_, err := b.Build(resolver.Target{URL: url.URL{Path: dest}}, cc, resolver.BuildOptions{})
160160
assert.ElementsMatch(t, cc.State.Addresses, wantAddr, "Client connection received the wrong list of addresses")
161161
require.NoError(t, err, "unexpected error building the resolver")
162162

163163
cc.failUpdate = true
164-
_, err = b.Build(resolver.Target{Endpoint: dest, URL: url.URL{Path: dest}}, cc, resolver.BuildOptions{})
164+
_, err = b.Build(resolver.Target{URL: url.URL{Path: dest}}, cc, resolver.BuildOptions{})
165165
require.Error(t, err)
166166

167167
}

‎transport/grpc/integration_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func TestGRPCCompression(t *testing.T) {
336336
{
337337
msg: "fail decompression of request",
338338
compressor: _badDecompressor,
339-
wantErr: "code:internal message:grpc: failed to decompress the received message assert.AnError general error for testing",
339+
wantErr: "code:internal message:grpc: failed to decompress the received message: assert.AnError general error for testing",
340340
wantMetrics: []metric{
341341
{32777, tagsCompression},
342342
{0, tagsDecompression},

0 commit comments

Comments
 (0)