Fixed v2 after merge.

Signed-off-by: bwplotka <[email protected]>

Author: bwplotka

README.md

@@ -4,13 +4,6 @@
 
 This repository holds [gRPC Go](https://github.com/grpc/grpc-go) Middlewares: interceptors, helpers and utilities.
 
-## ⚠️  Status
-
-Version [v2](https://github.com/grpc-ecosystem/go-grpc-middleware/tree/v2) is about to be released, with migration guide, which will replace v1. Try v2 and give us feedback! 
-
-Version v1 is currently in deprecation mode, which means only critical and safety bug fixes will be merged.
-
-
 ## Middleware
 
 [gRPC Go](https://github.com/grpc/grpc-go) has support for "interceptors", i.e. [middleware](https://medium.com/@matryer/writing-middleware-in-golang-and-how-go-makes-it-so-much-fun-4375c1246e81#.gv7tdlghs) that is executed either on the gRPC Server before the request is passed onto the user's application logic, or on the gRPC client either around the user call. It is a perfect way to implement common patterns: auth, logging, tracing, metrics, validation, retries, rate limiting and more, which can be a great generic building blocks that make it easy to build multiple microservices easily.

interceptors/recovery/interceptors.go

@@ -26,14 +26,12 @@ func UnaryServerInterceptor(opts ...Option) grpc.UnaryServerInterceptor {
 	o := evaluateOptions(opts)
 	return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (_ any, err error) {
 		defer func() {
-			if r := recover(); r != nil || panicked {
+			if r := recover(); r != nil {
 				err = recoverFrom(ctx, r, o.recoveryHandlerFunc)
 			}
 		}()
 
-		resp, err := handler(ctx, req)
-		panicked = false
-		return resp, err
+		return handler(ctx, req)
 	}
 }
 
@@ -42,14 +40,12 @@ func StreamServerInterceptor(opts ...Option) grpc.StreamServerInterceptor {
 	o := evaluateOptions(opts)
 	return func(srv any, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) (err error) {
 		defer func() {
-			if r := recover(); r != nil || panicked {
+			if r := recover(); r != nil {
 				err = recoverFrom(stream.Context(), r, o.recoveryHandlerFunc)
 			}
 		}()
 
-		err = handler(srv, stream)
-		panicked = false
-		return err
+		return handler(srv, stream)
 	}
 }
 

interceptors/recovery/interceptors_test.go

@@ -28,19 +28,13 @@ func (s *recoveryAssertService) Ping(ctx context.Context, ping *testpb.PingReque
 	if ping.Value == "panic" {
 		panic("very bad thing happened")
 	}
-	if ping.Value == "nilpanic" {
-		panic(nil)
-	}
 	return s.TestServiceServer.Ping(ctx, ping)
 }
 
 func (s *recoveryAssertService) PingList(ping *testpb.PingListRequest, stream testpb.TestService_PingListServer) error {
 	if ping.Value == "panic" {
 		panic("very bad thing happened")
 	}
-	if ping.Value == "nilpanic" {
-		panic(nil)
-	}
 	return s.TestServiceServer.PingList(ping, stream)
 }
 
@@ -76,13 +70,6 @@ func (s *RecoverySuite) TestUnary_PanickingRequest() {
 	assert.Contains(s.T(), status.Convert(err).Message(), "recovery.recoverFrom", "must include stack trace")
 }
 
-func (s *RecoverySuite) TestUnary_NilPanickingRequest() {
-	_, err := s.Client.Ping(s.SimpleCtx(), nilPanicPing)
-	require.Error(s.T(), err, "there must be an error")
-	assert.Equal(s.T(), codes.Internal, status.Code(err), "must error with internal")
-	assert.Equal(s.T(), "<nil>", status.Convert(err).Message(), "must error with <nil>")
-}
-
 func (s *RecoverySuite) TestStream_SuccessfulReceive() {
 	stream, err := s.Client.PingList(s.SimpleCtx(), testpb.GoodPingList)
 	require.NoError(s.T(), err, "should not fail on establishing the stream")
@@ -101,15 +88,6 @@ func (s *RecoverySuite) TestStream_PanickingReceive() {
 	assert.Contains(s.T(), status.Convert(err).Message(), "recovery.recoverFrom", "must include stack trace")
 }
 
-func (s *RecoverySuite) TestStream_NilPanickingReceive() {
-	stream, err := s.Client.PingList(s.SimpleCtx(), nilPanicPing)
-	require.NoError(s.T(), err, "should not fail on establishing the stream")
-	_, err = stream.Recv()
-	require.Error(s.T(), err, "there must be an error")
-	assert.Equal(s.T(), codes.Internal, status.Code(err), "must error with internal")
-	assert.Equal(s.T(), "<nil>", status.Convert(err).Message(), "must error with <nil>")
-}
-
 func TestRecoveryOverrideSuite(t *testing.T) {
 	opts := []recovery.Option{
 		recovery.WithRecoveryHandler(func(p any) (err error) {

interceptors/retry/doc.go

@@ -18,7 +18,7 @@ Other default options are: retry on `ResourceExhausted` and `Unavailable` gRPC c
 linear backoff with 10% jitter.
 
 For chained interceptors, the retry interceptor will call every interceptor that follows it
-whenever a retry happens.
+whenever when a retry happens.
 
 Please see examples for more advanced use.
 */

interceptors/retry/retry.go

@@ -5,8 +5,8 @@ package retry
 
 import (
 	"context"
+	"fmt"
 	"io"
-	"strconv"
 	"sync"
 	"time"
 
@@ -228,9 +228,7 @@ func (s *serverStreamingRetryingStream) receiveMsgAndIndicateRetry(m any) (bool,
 	return isRetriable(err, s.callOpts), err
 }
 
-func (s *serverStreamingRetryingStream) reestablishStreamAndResendBuffer(
-	callCtx context.Context,
-) (grpc.ClientStream, error) {
+func (s *serverStreamingRetryingStream) reestablishStreamAndResendBuffer(callCtx context.Context) (grpc.ClientStream, error) {
 	s.mu.RLock()
 	bufferedSends := s.bufferedSends
 	s.mu.RUnlock()
@@ -306,11 +304,11 @@ func perCallContext(parentCtx context.Context, callOpts *options, attempt uint)
 func contextErrToGrpcErr(err error) error {
 	switch err {
 	case context.DeadlineExceeded:
-		return status.Error(codes.DeadlineExceeded, err.Error())
+		return status.Errorf(codes.DeadlineExceeded, err.Error())
 	case context.Canceled:
-		return status.Error(codes.Canceled, err.Error())
+		return status.Errorf(codes.Canceled, err.Error())
 	default:
-		return status.Error(codes.Unknown, err.Error())
+		return status.Errorf(codes.Unknown, err.Error())
 	}
 }
 

interceptors/validator/interceptors.go

@@ -71,6 +71,5 @@ func (s *recvWrapper) RecvMsg(m any) error {
 	if err := validate(s.Context(), m, s.shouldFailFast, s.onValidationErrCallback); err != nil {
 		return err
 	}
-
 	return nil
 }

metadata/metadata.go

@@ -39,7 +39,7 @@ func ExtractOutgoing(ctx context.Context) MD {
 
 // Clone performs a *deep* copy of the grpcMetadata.MD.
 //
-// You can specify the lower-case copiedKeys to only copy certain allow-listed keys. If no keys are explicitly allow-listed
+// You can specify the lower-case copiedKeys to only copy certain whitelisted keys. If no keys are explicitly whitelisted
 // all keys get copied.
 func (m MD) Clone(copiedKeys ...string) MD {
 	newMd := MD(grpcMetadata.Pairs())