Skip to content

Commit a6ca6a5

Browse files
authoredMay 24, 2024··
Replace grpc.Dial with grpc.NewClient (#1488)
* Replace grpc.Dial with grpc.NewClient * update comment
1 parent bf2c79d commit a6ca6a5

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed
 

‎converter/grpc_interceptor_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func TestPayloadCodecGRPCClientInterceptor(t *testing.T) {
7474
)
7575
require.NoError(err)
7676

77-
c, err := grpc.Dial(
77+
c, err := grpc.NewClient(
7878
server.addr,
7979
grpc.WithTransportCredentials(insecure.NewCredentials()),
8080
grpc.WithChainUnaryInterceptor(interceptor),
@@ -115,7 +115,7 @@ func TestFailureGRPCClientInterceptor(t *testing.T) {
115115
)
116116
require.NoError(err)
117117

118-
c, err := grpc.Dial(
118+
c, err := grpc.NewClient(
119119
server.addr,
120120
grpc.WithTransportCredentials(insecure.NewCredentials()),
121121
grpc.WithChainUnaryInterceptor(interceptor),
@@ -181,7 +181,7 @@ func (t *testGRPCServer) waitUntilServing() error {
181181
// Try 20 times, waiting 100ms between
182182
var lastErr error
183183
for i := 0; i < 20; i++ {
184-
conn, err := grpc.Dial(t.addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
184+
conn, err := grpc.NewClient(t.addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
185185
if err != nil {
186186
lastErr = err
187187
} else {

‎internal/client.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ type (
405405
// will use a registered resolver. By default all hosts returned from the resolver will be used in a round-robin
406406
// fashion.
407407
//
408-
// The "dns" resolver is registered by default. Using a "dns:///" prefixed address will periodically resolve all IPs
409-
// for DNS address given and round robin amongst them.
408+
// The "dns" resolver is registered by and used by default.
410409
//
411410
// A custom resolver can be created to provide multiple hosts in other ways. For example, to manually provide
412411
// multiple IPs to round-robin across, a google.golang.org/grpc/resolver/manual resolver can be created and

‎internal/common/metrics/grpc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestGRPCInterceptor(t *testing.T) {
5050

5151
// Create client with interceptor
5252
handler := metrics.NewCapturingHandler()
53-
cc, err := grpc.Dial(l.Addr().String(),
53+
cc, err := grpc.NewClient(l.Addr().String(),
5454
grpc.WithTransportCredentials(insecure.NewCredentials()),
5555
grpc.WithUnaryInterceptor(metrics.NewGRPCInterceptor(handler, "_my_suffix", true)))
5656
require.NoError(t, err)

‎internal/grpc_dialer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func dial(params dialParameters) (*grpc.ClientConn, error) {
141141
// Append any user-supplied options
142142
opts = append(opts, params.UserConnectionOptions.DialOptions...)
143143

144-
return grpc.Dial(params.HostPort, opts...)
144+
return grpc.NewClient(params.HostPort, opts...)
145145
}
146146

147147
func requiredInterceptors(

‎internal/grpc_dialer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func TestMissingGetServerInfo(t *testing.T) {
153153
var lastErr error
154154
for i := 0; i < 20; i++ {
155155
lastErr = nil
156-
conn, err := grpc.Dial(l.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
156+
conn, err := grpc.NewClient(l.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
157157
if err != nil {
158158
lastErr = err
159159
} else {
@@ -550,7 +550,7 @@ func (t *testGRPCServer) waitUntilServing() error {
550550
// Try 20 times, waiting 100ms between
551551
var lastErr error
552552
for i := 0; i < 20; i++ {
553-
conn, err := grpc.Dial(t.addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
553+
conn, err := grpc.NewClient(t.addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
554554
if err != nil {
555555
lastErr = err
556556
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.