add multiple middlewares (#936)

examples/blog/internal/server/grpc.go

@@ -5,7 +5,6 @@ import (
 	"github.com/go-kratos/kratos/examples/blog/internal/conf"
 	"github.com/go-kratos/kratos/examples/blog/internal/service"
 	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/middleware"
 	"github.com/go-kratos/kratos/v2/middleware/logging"
 	"github.com/go-kratos/kratos/v2/middleware/recovery"
 	"github.com/go-kratos/kratos/v2/middleware/tracing"
@@ -17,11 +16,9 @@ import (
 func NewGRPCServer(c *conf.Server, tracer trace.TracerProvider, blog *service.BlogService) *grpc.Server {
 	var opts = []grpc.ServerOption{
 		grpc.Middleware(
-			middleware.Chain(
+			tracing.Server(tracing.WithTracerProvider(tracer)),
-				tracing.Server(tracing.WithTracerProvider(tracer)),
+			logging.Server(log.DefaultLogger),
-				logging.Server(log.DefaultLogger),
+			recovery.Recovery(),
-				recovery.Recovery(),
-			),
 		),
 	}
 	if c.Grpc.Network != "" {

examples/blog/internal/server/http.go

@@ -5,7 +5,6 @@ import (
 	"github.com/go-kratos/kratos/examples/blog/internal/conf"
 	"github.com/go-kratos/kratos/examples/blog/internal/service"
 	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/middleware"
 	"github.com/go-kratos/kratos/v2/middleware/logging"
 	"github.com/go-kratos/kratos/v2/middleware/recovery"
 	"github.com/go-kratos/kratos/v2/middleware/tracing"
@@ -26,11 +25,9 @@ func NewHTTPServer(c *conf.Server, tracer trace.TracerProvider, blog *service.Bl
 		opts = append(opts, http.Timeout(c.Http.Timeout.AsDuration()))
 	}
 	m := http.Middleware(
-		middleware.Chain(
+		tracing.Server(tracing.WithTracerProvider(tracer)),
-			tracing.Server(tracing.WithTracerProvider(tracer)),
+		logging.Server(log.DefaultLogger),
-			logging.Server(log.DefaultLogger),
+		recovery.Recovery(),
-			recovery.Recovery(),
-		),
 	)
 	srv := http.NewServer(opts...)
 	srv.HandlePrefix("/", v1.NewBlogServiceHandler(blog, m))

examples/helloworld/client/main.go

@@ -22,9 +22,7 @@ func callHTTP() {
 	client, err := transhttp.NewClient(
 		context.Background(),
 		transhttp.WithMiddleware(
-			middleware.Chain(
+			recovery.Recovery(),
-				recovery.Recovery(),
-			),
 		),
 	)
 	if err != nil {

examples/helloworld/server/main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/go-kratos/kratos/v2"
 	"github.com/go-kratos/kratos/v2/errors"
 	"github.com/go-kratos/kratos/v2/log"
-	"github.com/go-kratos/kratos/v2/middleware"
 	"github.com/go-kratos/kratos/v2/middleware/logging"
 	"github.com/go-kratos/kratos/v2/middleware/recovery"
 	"github.com/go-kratos/kratos/v2/transport/grpc"
@@ -48,10 +47,8 @@ func main() {
 	grpcSrv := grpc.NewServer(
 		grpc.Address(":9000"),
 		grpc.Middleware(
-			middleware.Chain(
+			recovery.Recovery(),
-				logging.Server(logger),
+			logging.Server(logger),
-				recovery.Recovery(),
-			),
 		))
 
 	s := &server{}
@@ -60,10 +57,8 @@ func main() {
 	httpSrv := http.NewServer(http.Address(":8000"))
 	httpSrv.HandlePrefix("/", pb.NewGreeterHandler(s,
 		http.Middleware(
-			middleware.Chain(
+			recovery.Recovery(),
-				logging.Server(logger),
+			logging.Server(logger),
-				recovery.Recovery(),
-			),
 		)),
 	)
 

middleware/middleware.go

@@ -11,11 +11,11 @@ type Handler func(ctx context.Context, req interface{}) (interface{}, error)
 type Middleware func(Handler) Handler
 
 // Chain returns a Middleware that specifies the chained handler for endpoint.
-func Chain(outer Middleware, others ...Middleware) Middleware {
+func Chain(m ...Middleware) Middleware {
 	return func(next Handler) Handler {
-		for i := len(others) - 1; i >= 0; i-- {
+		for i := len(m) - 1; i >= 0; i-- {
-			next = others[i](next)
+			next = m[i](next)
 		}
-		return outer(next)
+		return next
 	}
 }

transport/grpc/client.go

@@ -9,6 +9,8 @@ import (
 	"github.com/go-kratos/kratos/v2/registry"
 	"github.com/go-kratos/kratos/v2/transport"
 	"github.com/go-kratos/kratos/v2/transport/grpc/resolver/discovery"
+
+	// init resolver
 	_ "github.com/go-kratos/kratos/v2/transport/grpc/resolver/direct"
 
 	"google.golang.org/grpc"
@@ -33,9 +35,9 @@ func WithTimeout(timeout time.Duration) ClientOption {
 }
 
 // WithMiddleware with client middleware.
-func WithMiddleware(m middleware.Middleware) ClientOption {
+func WithMiddleware(m ...middleware.Middleware) ClientOption {
 	return func(o *clientOptions) {
-		o.middleware = m
+		o.middleware = middleware.Chain(m...)
 	}
 }
 

transport/grpc/server.go

@@ -52,9 +52,9 @@ func Logger(logger log.Logger) ServerOption {
 }
 
 // Middleware with server middleware.
-func Middleware(m middleware.Middleware) ServerOption {
+func Middleware(m ...middleware.Middleware) ServerOption {
 	return func(s *Server) {
-		s.middleware = m
+		s.middleware = middleware.Chain(m...)
 	}
 }
 

transport/http/client.go

@@ -43,9 +43,9 @@ func WithTransport(trans http.RoundTripper) ClientOption {
 }
 
 // WithMiddleware with client middleware.
-func WithMiddleware(m middleware.Middleware) ClientOption {
+func WithMiddleware(m ...middleware.Middleware) ClientOption {
 	return func(o *clientOptions) {
-		o.middleware = m
+		o.middleware = middleware.Chain(m...)
 	}
 }
 

transport/http/handle.go

@@ -67,9 +67,9 @@ func ErrorEncoder(en EncodeErrorFunc) HandleOption {
 }
 
 // Middleware with middleware option.
-func Middleware(m middleware.Middleware) HandleOption {
+func Middleware(m ...middleware.Middleware) HandleOption {
 	return func(o *HandleOptions) {
-		o.Middleware = m
+		o.Middleware = middleware.Chain(m...)
 	}
 }