Skip to content

Commit d672f29

Browse files
janardhankrishna-saijanardhankrishna-sai
committed
updating log from dial to grpc.NewClient()
1 parent 1554a99 commit d672f29

40 files changed

+125
-126
lines changed

‎balancer/endpointsharding/endpointsharding_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"encoding/json"
2424
"errors"
2525
"fmt"
26-
"log"
2726
"strings"
2827
"testing"
2928
"time"
@@ -166,7 +165,7 @@ func (s) TestEndpointShardingBasic(t *testing.T) {
166165
}
167166
cc, err := grpc.NewClient(mr.Scheme()+":///", dOpts...)
168167
if err != nil {
169-
log.Fatalf("Failed to create new client: %v", err)
168+
t.Fatalf("grpc.NewClient() failed: %v", err)
170169
}
171170
defer cc.Close()
172171
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
@@ -246,7 +245,7 @@ func (s) TestEndpointShardingReconnectDisabled(t *testing.T) {
246245

247246
cc, err := grpc.NewClient(mr.Scheme()+":///", grpc.WithResolvers(mr), grpc.WithTransportCredentials(insecure.NewCredentials()))
248247
if err != nil {
249-
log.Fatalf("Failed to create new client: %v", err)
248+
t.Fatalf("grpc.NewClient() failed: %v", err)
250249
}
251250
defer cc.Close()
252251
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)

‎balancer/grpclb/grpclb_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ func (s) TestGRPCLB_Basic(t *testing.T) {
460460
}
461461
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
462462
if err != nil {
463-
t.Fatalf("Failed to create a client for the backend %v", err)
463+
t.Fatalf("grpc.NewClient() failed: %v", err)
464464
}
465465
defer cc.Close()
466466

@@ -517,7 +517,7 @@ func (s) TestGRPCLB_Weighted(t *testing.T) {
517517
}
518518
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
519519
if err != nil {
520-
t.Fatalf("Failed to create a client for the backend %v", err)
520+
t.Fatalf("grpc.NewClient() failed: %v", err)
521521
}
522522
defer cc.Close()
523523

@@ -597,7 +597,7 @@ func (s) TestGRPCLB_DropRequest(t *testing.T) {
597597
}
598598
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
599599
if err != nil {
600-
t.Fatalf("Failed to create a client for the backend %v", err)
600+
t.Fatalf("grpc.NewClient() failed: %v", err)
601601
}
602602
defer cc.Close()
603603
testC := testgrpc.NewTestServiceClient(cc)
@@ -769,7 +769,7 @@ func (s) TestGRPCLB_BalancerDisconnects(t *testing.T) {
769769
}
770770
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
771771
if err != nil {
772-
t.Fatalf("Failed to create a client for the backend %v", err)
772+
t.Fatalf("grpc.NewClient() failed: %v", err)
773773
}
774774
defer cc.Close()
775775
testC := testgrpc.NewTestServiceClient(cc)
@@ -844,7 +844,7 @@ func (s) TestGRPCLB_Fallback(t *testing.T) {
844844
}
845845
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
846846
if err != nil {
847-
t.Fatalf("Failed to create new client to the backend %v", err)
847+
t.Fatalf("grpc.NewClient() failed: %v", err)
848848
}
849849
defer cc.Close()
850850
testC := testgrpc.NewTestServiceClient(cc)
@@ -940,7 +940,7 @@ func (s) TestGRPCLB_ExplicitFallback(t *testing.T) {
940940
}
941941
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
942942
if err != nil {
943-
t.Fatalf("Failed to create a client for the backend %v", err)
943+
t.Fatalf("grpc.NewClient() failed: %v", err)
944944
}
945945
defer cc.Close()
946946
testC := testgrpc.NewTestServiceClient(cc)
@@ -1010,7 +1010,7 @@ func (s) TestGRPCLB_FallBackWithNoServerAddress(t *testing.T) {
10101010
}
10111011
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
10121012
if err != nil {
1013-
t.Fatalf("Failed to create a client for the backend %v", err)
1013+
t.Fatalf("grpc.NewClient() failed: %v", err)
10141014
}
10151015
defer cc.Close()
10161016
cc.Connect()
@@ -1105,7 +1105,7 @@ func (s) TestGRPCLB_PickFirst(t *testing.T) {
11051105
}
11061106
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
11071107
if err != nil {
1108-
t.Fatalf("Failed to create a client for the backend: %v", err)
1108+
t.Fatalf("grpc.NewClient() failed: %v", err)
11091109
}
11101110
cc.Connect()
11111111
defer cc.Close()
@@ -1200,7 +1200,7 @@ func (s) TestGRPCLB_BackendConnectionErrorPropagation(t *testing.T) {
12001200
grpc.WithTransportCredentials(&serverNameCheckCreds{}),
12011201
grpc.WithContextDialer(fakeNameDialer))
12021202
if err != nil {
1203-
t.Fatalf("Failed to create a client for the backend: %v", err)
1203+
t.Fatalf("grpc.NewClient() failed: %v", err)
12041204
}
12051205
defer cc.Close()
12061206
testC := testgrpc.NewTestServiceClient(cc)
@@ -1245,7 +1245,7 @@ func testGRPCLBEmptyServerList(t *testing.T, svcfg string) {
12451245
}
12461246
cc, err := grpc.NewClient(r.Scheme()+":///"+beServerName, dopts...)
12471247
if err != nil {
1248-
t.Fatalf("Failed to create a client for the backend %v", err)
1248+
t.Fatalf("grpc.NewClient() failed: %v", err)
12491249
}
12501250
cc.Connect()
12511251
defer cc.Close()
@@ -1320,7 +1320,7 @@ func (s) TestGRPCLBWithTargetNameFieldInConfig(t *testing.T) {
13201320
grpc.WithContextDialer(fakeNameDialer),
13211321
grpc.WithUserAgent(testUserAgent))
13221322
if err != nil {
1323-
t.Fatalf("Failed to create a client for the backend %v", err)
1323+
t.Fatalf("grpc.NewClient() failed: %v", err)
13241324
}
13251325
defer cc.Close()
13261326
cc.Connect()
@@ -1427,7 +1427,7 @@ func runAndCheckStats(t *testing.T, drop bool, statsChan chan *lbpb.ClientStats,
14271427
grpc.WithPerRPCCredentials(failPreRPCCred{}),
14281428
grpc.WithContextDialer(fakeNameDialer))
14291429
if err != nil {
1430-
t.Fatalf("Failed to create a client for the backend %v", err)
1430+
t.Fatalf("grpc.NewClient() failed: %v", err)
14311431
}
14321432
cc.Connect()
14331433
defer cc.Close()

‎balancer/pickfirst/pickfirst_ext_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ func (s) TestPickFirst_StickyTransientFailure(t *testing.T) {
378378
}
379379
cc, err := grpc.NewClient(lis.Addr().String(), dopts...)
380380
if err != nil {
381-
t.Fatalf("Failed to create new client: %v", err)
381+
t.Fatalf("grpc.NewClient(%q) = %v", lis.Addr().String(), err)
382382
}
383383
t.Cleanup(func() { cc.Close() })
384384
cc.Connect()

‎balancer/rls/balancer_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s) TestConfigUpdate_ControlChannel(t *testing.T) {
8282

8383
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
8484
if err != nil {
85-
t.Fatalf("Failed to create gRPC client: %v", err)
85+
t.Fatalf("grpc.NewClient() failed: %v", err)
8686
}
8787
defer cc.Close()
8888

@@ -168,7 +168,7 @@ func (s) TestConfigUpdate_ControlChannelWithCreds(t *testing.T) {
168168
// subdomain of the same here.
169169
cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(clientCreds))
170170
if err != nil {
171-
t.Fatalf("Failed to create gRPC client: %v", err)
171+
t.Fatalf("grpc.NewClient() failed: %v", err)
172172
}
173173
defer cc.Close()
174174

@@ -228,7 +228,7 @@ func (s) TestConfigUpdate_ControlChannelServiceConfig(t *testing.T) {
228228

229229
cc, err := grpc.NewClient(r.Scheme()+":///rls.test.example.com", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
230230
if err != nil {
231-
t.Fatalf("Failed to create gRPC client: %v", err)
231+
t.Fatalf("grpc.NewClient() failed: %v", err)
232232
}
233233
defer cc.Close()
234234

@@ -265,7 +265,7 @@ func (s) TestConfigUpdate_DefaultTarget(t *testing.T) {
265265

266266
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
267267
if err != nil {
268-
t.Fatalf("Failed to create gRPC client: %v", err)
268+
t.Fatalf("grpc.NewClient() failed: %v", err)
269269
}
270270
defer cc.Close()
271271

@@ -541,7 +541,7 @@ func (s) TestConfigUpdate_BadChildPolicyConfigs(t *testing.T) {
541541

542542
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
543543
if err != nil {
544-
t.Fatalf("Failed to create gRPC client: %v", err)
544+
t.Fatalf("grpc.NewClient() failed: %v", err)
545545
}
546546
defer cc.Close()
547547

@@ -872,7 +872,7 @@ func (s) TestDataCachePurging(t *testing.T) {
872872

873873
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
874874
if err != nil {
875-
t.Fatalf("Failed to create gRPC client: %v", err)
875+
t.Fatalf("grpc.NewClient() failed: %v", err)
876876
}
877877
defer cc.Close()
878878

@@ -963,7 +963,7 @@ func (s) TestControlChannelConnectivityStateMonitoring(t *testing.T) {
963963

964964
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
965965
if err != nil {
966-
t.Fatalf("Failed to create gRPC client: %v", err)
966+
t.Fatalf("grpc.NewClient() failed: %v", err)
967967
}
968968
defer cc.Close()
969969

‎balancer/rls/metrics_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s) TestRLSTargetPickMetric(t *testing.T) {
8282
grpcTarget := r.Scheme() + ":///"
8383
cc, err := grpc.NewClient(grpcTarget, grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()), opentelemetry.DialOption(opentelemetry.Options{MetricsOptions: mo}))
8484
if err != nil {
85-
t.Fatalf("Failed to dial local test server: %v", err)
85+
t.Fatalf("grpc.NewClient(%q) = %v", grpcTarget, err)
8686
}
8787
defer cc.Close()
8888

@@ -193,7 +193,7 @@ func (s) TestRLSDefaultTargetPickMetric(t *testing.T) {
193193
grpcTarget := r.Scheme() + ":///"
194194
cc, err := grpc.NewClient(grpcTarget, grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()), opentelemetry.DialOption(opentelemetry.Options{MetricsOptions: mo}))
195195
if err != nil {
196-
t.Fatalf("Failed to dial local test server: %v", err)
196+
t.Fatalf("grpc.NewClient(%q) = %v", grpcTarget, err)
197197
}
198198
defer cc.Close()
199199

@@ -291,7 +291,7 @@ func (s) TestRLSFailedRPCMetric(t *testing.T) {
291291
grpcTarget := r.Scheme() + ":///"
292292
cc, err := grpc.NewClient(grpcTarget, grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()), opentelemetry.DialOption(opentelemetry.Options{MetricsOptions: mo}))
293293
if err != nil {
294-
t.Fatalf("Failed to dial local test server: %v", err)
294+
t.Fatalf("grpc.NewClient(%q) = %v", grpcTarget, err)
295295
}
296296
defer cc.Close()
297297

‎balancer/rls/picker_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (s) TestNoNonEmptyTargetsReturnsError(t *testing.T) {
6161
// Create new client.
6262
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
6363
if err != nil {
64-
t.Fatalf("Failed to create gRPC client: %v", err)
64+
t.Fatalf("grpc.NewClient() failed: %v", err)
6565
}
6666
defer cc.Close()
6767

@@ -93,7 +93,7 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithDefaultTarget(t *tes
9393

9494
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
9595
if err != nil {
96-
t.Fatalf("Failed to create gRPC client: %v", err)
96+
t.Fatalf("grpc.NewClient() failed: %v", err)
9797
}
9898
defer cc.Close()
9999

@@ -124,7 +124,7 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_ThrottledWithoutDefaultTarget(t *
124124
// Create new client.
125125
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
126126
if err != nil {
127-
t.Fatalf("Failed to create gRPC client: %v", err)
127+
t.Fatalf("grpc.NewClient() failed: %v", err)
128128
}
129129
defer cc.Close()
130130

@@ -155,7 +155,7 @@ func (s) TestPick_DataCacheMiss_NoPendingEntry_NotThrottled(t *testing.T) {
155155
// Create new client.
156156
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
157157
if err != nil {
158-
t.Fatalf("Failed to create gRPC client: %v", err)
158+
t.Fatalf("grpc.NewClient() failed: %v", err)
159159
}
160160
defer cc.Close()
161161

@@ -219,7 +219,7 @@ func (s) TestPick_DataCacheMiss_PendingEntryExists(t *testing.T) {
219219
// Create new client.
220220
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
221221
if err != nil {
222-
t.Fatalf("Failed to create gRPC client: %v", err)
222+
t.Fatalf("grpc.NewClient() failed: %v", err)
223223
}
224224
defer cc.Close()
225225

@@ -398,7 +398,7 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry(t *testing.T) {
398398
// Create new client.
399399
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
400400
if err != nil {
401-
t.Fatalf("Failed to create gRPC client: %v", err)
401+
t.Fatalf("grpc.NewClient() failed: %v", err)
402402
}
403403
defer cc.Close()
404404

@@ -461,7 +461,7 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ValidEntry_WithHeaderData(t *testi
461461
// Create new client.
462462
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
463463
if err != nil {
464-
t.Fatalf("Failed to create gRPC client: %v", err)
464+
t.Fatalf("grpc.NewClient() failed: %v", err)
465465
}
466466
defer cc.Close()
467467

@@ -528,7 +528,7 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_StaleEntry(t *testing.T) {
528528
// Create new client.
529529
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
530530
if err != nil {
531-
t.Fatalf("Failed to create gRPC client: %v", err)
531+
t.Fatalf("grpc.NewClient() failed: %v", err)
532532
}
533533
defer cc.Close()
534534

@@ -637,7 +637,7 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntry(t *testing.T) {
637637
// Create new client.
638638
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
639639
if err != nil {
640-
t.Fatalf("Failed to create gRPC client: %v", err)
640+
t.Fatalf("grpc.NewClient() failed: %v", err)
641641
}
642642
defer cc.Close()
643643

@@ -735,7 +735,7 @@ func (s) TestPick_DataCacheHit_NoPendingEntry_ExpiredEntryInBackoff(t *testing.T
735735
// Create new client.
736736
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
737737
if err != nil {
738-
t.Fatalf("Failed to create gRPC client: %v", err)
738+
t.Fatalf("grpc.NewClient() failed: %v", err)
739739
}
740740
defer cc.Close()
741741

@@ -837,7 +837,7 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_StaleEntry(t *testing.T) {
837837
// Create new client.
838838
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
839839
if err != nil {
840-
t.Fatalf("Failed to create gRPC client: %v", err)
840+
t.Fatalf("grpc.NewClient() failed: %v", err)
841841
}
842842
defer cc.Close()
843843

@@ -935,7 +935,7 @@ func (s) TestPick_DataCacheHit_PendingEntryExists_ExpiredEntry(t *testing.T) {
935935
// Create new client.
936936
cc, err := grpc.NewClient(r.Scheme()+":///", grpc.WithResolvers(r), grpc.WithTransportCredentials(insecure.NewCredentials()))
937937
if err != nil {
938-
t.Fatalf("Failed to create gRPC client: %v", err)
938+
t.Fatalf("grpc.NewClient() failed: %v", err)
939939
}
940940
defer cc.Close()
941941

‎encoding/encoding_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (s) TestEncodeDoesntPanicOnServer(t *testing.T) {
125125
// Create a channel to the above server.
126126
cc, err := grpc.NewClient(backend.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
127127
if err != nil {
128-
t.Fatalf("Failed to dial test backend at %q: %v", backend.Address, err)
128+
t.Fatalf("grpc.NewClient(%q) = %v", backend.Address, err)
129129
}
130130
defer cc.Close()
131131

@@ -162,7 +162,7 @@ func (s) TestDecodeDoesntPanicOnServer(t *testing.T) {
162162
// here, the proto codec will get automatically used.
163163
cc, err := grpc.NewClient(backend.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
164164
if err != nil {
165-
t.Fatalf("Failed to dial test backend at %q: %v", backend.Address, err)
165+
t.Fatalf("grpc.NewClient(%q) = %v", backend.Address, err)
166166
}
167167
defer cc.Close()
168168

@@ -199,7 +199,7 @@ func (s) TestEncodeDoesntPanicOnClient(t *testing.T) {
199199
// Create a channel to the above server.
200200
cc, err := grpc.NewClient(backend.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
201201
if err != nil {
202-
t.Fatalf("Failed to dial test backend at %q: %v", backend.Address, err)
202+
t.Fatalf("grpc.NewClient(%q) = %v", backend.Address, err)
203203
}
204204
defer cc.Close()
205205

@@ -235,7 +235,7 @@ func (s) TestDecodeDoesntPanicOnClient(t *testing.T) {
235235
// Create a channel to the above server.
236236
cc, err := grpc.NewClient(backend.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
237237
if err != nil {
238-
t.Fatalf("Failed to dial test backend at %q: %v", backend.Address, err)
238+
t.Fatalf("grpc.NewClient(%q) = %v", backend.Address, err)
239239
}
240240
defer cc.Close()
241241

@@ -291,7 +291,7 @@ func (s) TestForceServerCodec(t *testing.T) {
291291
// Create a channel to the above server.
292292
cc, err := grpc.NewClient(backend.Address, grpc.WithTransportCredentials(insecure.NewCredentials()))
293293
if err != nil {
294-
t.Fatalf("Failed to dial test backend at %q: %v", backend.Address, err)
294+
t.Fatalf("grpc.NewClient(%q) = %v", backend.Address, err)
295295
}
296296
defer cc.Close()
297297

0 commit comments

Comments
 (0)