Use context.WithTimeout instead of grpc.WithTimeout (GoogleCloudPlatform#610)

* Use context.WithTimeout instead of grpc.WithTimeout

WithTimeout returns a DialOption that configures a timeout for dialing a ClientConn initially. This is valid if and only if WithBlock() is present.
Deprecated: use DialContext and context.WithTimeout instead.

* Use DialContext instead of Dial

Author: jxlwqq

src/frontend/main.go

@@ -263,9 +263,10 @@ func mustMapEnv(target *string, envKey string) {
 
 func mustConnGRPC(ctx context.Context, conn **grpc.ClientConn, addr string) {
 	var err error
+	ctx, cancel := context.WithTimeout(ctx, time.Second*3)
+	defer cancel()
 	*conn, err = grpc.DialContext(ctx, addr,
 		grpc.WithInsecure(),
-		grpc.WithTimeout(time.Second*3),
 		grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
 	if err != nil {
 		panic(errors.Wrapf(err, "grpc: failed to connect %s", addr))

src/productcatalogservice/server_test.go

@@ -30,7 +30,7 @@ import (
 func TestServer(t *testing.T) {
 	ctx := context.Background()
 	addr := run(port)
-	conn, err := grpc.Dial(addr,
+	conn, err := grpc.DialContext(ctx, addr,
 		grpc.WithInsecure(),
 		grpc.WithStatsHandler(&ocgrpc.ClientHandler{}))
 	if err != nil {