Cleanup v2 with some updates (#419)

* update grpc to v1.37.0

Signed-off-by: Yash Sharma <[email protected]>

* updated other dependencies

Signed-off-by: Yash Sharma <[email protected]>

* updated some issues due to err-check

Signed-off-by: Yash Sharma <[email protected]>

* Added mustEmbedUnimplementedGreeterServer for upstreaming changes from grpc examples package

Signed-off-by: Yash Sharma <[email protected]>

* renamed tocken to token

Signed-off-by: Yash Sharma <[email protected]>

* Apply suggestions from code review

Signed-off-by: Yash Sharma <[email protected]>

* make lint

Signed-off-by: Yash Sharma <[email protected]>

* make lint changes from prev projects

Signed-off-by: Yash Sharma <[email protected]>

Author: yashrsharma44

go.mod

@@ -3,13 +3,13 @@ module github.com/grpc-ecosystem/go-grpc-middleware/v2
 go 1.14
 
 require (
-	github.com/golang/protobuf v1.4.3
-	github.com/opentracing/opentracing-go v1.1.0
+	github.com/golang/protobuf v1.5.2
+	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/net v0.0.0-20200822124328-c89045814202
-	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
-	google.golang.org/grpc v1.30.1
-	google.golang.org/grpc/examples v0.0.0-20200723182653-9106c3fff523
-	google.golang.org/protobuf v1.25.0
+	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
+	golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78
+	google.golang.org/grpc v1.37.0
+	google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae
+	google.golang.org/protobuf v1.26.0
 )

go.sum

@@ -54,22 +54,26 @@ func Example_serverConfig() {
 	)
 }
 
-type gRPCserverAuthenticated struct{}
+type gRPCServerAuthenticated struct {
+	pb.UnimplementedGreeterServer
+}
 
 // SayHello only can be called by client when authenticated by exampleAuthFunc
-func (g gRPCserverAuthenticated) SayHello(ctx context.Context, request *pb.HelloRequest) (*pb.HelloReply, error) {
+func (g gRPCServerAuthenticated) SayHello(ctx context.Context, request *pb.HelloRequest) (*pb.HelloReply, error) {
 	return &pb.HelloReply{Message: "pong authenticated"}, nil
 }
 
-type gRPCserverUnauthenticated struct{}
+type gRPCServerUnauthenticated struct {
+	pb.UnimplementedGreeterServer
+}
 
 // SayHello can be called by client without being authenticated by exampleAuthFunc as AuthFuncOverride is called instead
-func (g *gRPCserverUnauthenticated) SayHello(ctx context.Context, request *pb.HelloRequest) (*pb.HelloReply, error) {
+func (g *gRPCServerUnauthenticated) SayHello(ctx context.Context, request *pb.HelloRequest) (*pb.HelloReply, error) {
 	return &pb.HelloReply{Message: "pong unauthenticated"}, nil
 }
 
 // AuthFuncOverride is called instead of exampleAuthFunc
-func (g *gRPCserverUnauthenticated) AuthFuncOverride(ctx context.Context, fullMethodName string) (context.Context, error) {
+func (g *gRPCServerUnauthenticated) AuthFuncOverride(ctx context.Context, fullMethodName string) (context.Context, error) {
 	log.Println("client is calling method:", fullMethodName)
 	return ctx, nil
 }
@@ -84,8 +88,8 @@ func Example_serverConfigWithAuthOverride() {
 	overrideActive := true
 
 	if overrideActive {
-		pb.RegisterGreeterServer(server, &gRPCserverUnauthenticated{})
+		pb.RegisterGreeterServer(server, &gRPCServerUnauthenticated{})
 	} else {
-		pb.RegisterGreeterServer(server, &gRPCserverAuthenticated{})
+		pb.RegisterGreeterServer(server, &gRPCServerAuthenticated{})
 	}
 }

interceptors/auth/examples_test.go

@@ -38,6 +38,9 @@ type ClientInterceptorTestSuite struct {
 func (s *ClientInterceptorTestSuite) SetupSuite() {
 	var err error
 
+	// Make all RPC calls last at most 2 sec, meaning all async issues or deadlock will not kill tests.
+	s.ctx, s.cancel = context.WithTimeout(context.TODO(), 2*time.Second)
+
 	s.clientMetrics = NewClientMetrics(WithClientHandlingTimeHistogram())
 
 	s.serverListener, err = net.Listen("tcp", "127.0.0.1:0")
@@ -48,23 +51,23 @@ func (s *ClientInterceptorTestSuite) SetupSuite() {
 	pb_testproto.RegisterTestServiceServer(s.server, &testService{t: s.T()})
 
 	go func() {
-		s.server.Serve(s.serverListener)
+		err = s.server.Serve(s.serverListener)
+		require.NoError(s.T(), err, "must not error on server listening")
 	}()
 
-	s.clientConn, err = grpc.Dial(
+	s.clientConn, err = grpc.DialContext(
+		s.ctx,
 		s.serverListener.Addr().String(),
 		grpc.WithInsecure(),
 		grpc.WithBlock(),
 		grpc.WithUnaryInterceptor(UnaryClientInterceptor(s.clientMetrics)),
 		grpc.WithStreamInterceptor(StreamClientInterceptor(s.clientMetrics)),
-		grpc.WithTimeout(2*time.Second))
+	)
 	require.NoError(s.T(), err, "must not error on client Dial")
 	s.testClient = pb_testproto.NewTestServiceClient(s.clientConn)
 }
 
 func (s *ClientInterceptorTestSuite) SetupTest() {
-	// Make all RPC calls last at most 2 sec, meaning all async issues or deadlock will not kill tests.
-	s.ctx, s.cancel = context.WithTimeout(context.TODO(), 2*time.Second)
 
 	// Make sure every test starts with same fresh, intialized metric state.
 	s.clientMetrics.clientStartedCounter.Reset()

providers/openmetrics/client_test.go

@@ -3,13 +3,13 @@ module github.com/grpc-ecosystem/go-grpc-middleware/providers/openmetrics/v2
 go 1.15
 
 require (
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20210128111500-3ff779b52992
 	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/stretchr/testify v1.7.0
-	google.golang.org/grpc v1.35.0
-	google.golang.org/protobuf v1.25.0
+	google.golang.org/grpc v1.37.0
+	google.golang.org/protobuf v1.26.0
 )
 
 replace github.com/grpc-ecosystem/go-grpc-middleware/v2 => ../..