Some renaming

Author: Russ Egan

v2/handler_test.go

@@ -299,7 +299,7 @@ func TestHandlerOptions_ReplaceAttrs(t *testing.T) {
 
 func TestHandlerOptions_Middleware(t *testing.T) {
 	addAttrMW := func(attr slog.Attr) Middleware {
-		return HandlerMiddlewareFunc(func(ctx context.Context, record slog.Record, next slog.Handler) error {
+		return SimpleMiddlewareFn(func(ctx context.Context, record slog.Record, next slog.Handler) error {
 			record.AddAttrs(attr)
 			return next.Handle(ctx, record)
 		})
@@ -332,7 +332,7 @@ func TestHandlerOptions_Clone(t *testing.T) {
 					},
 				},
 				Middleware: []Middleware{
-					HandlerMiddlewareFunc(func(ctx context.Context, record slog.Record, next slog.Handler) error {
+					SimpleMiddlewareFn(func(ctx context.Context, record slog.Record, next slog.Handler) error {
 						return next.Handle(ctx, record)
 					}),
 				},
@@ -363,7 +363,7 @@ func TestHandlerOptions_Clone(t *testing.T) {
 			tC.opts.ReplaceAttrs = append(tC.opts.ReplaceAttrs, func(_ []string, _ slog.Attr) slog.Attr {
 				return slog.Attr{}
 			})
-			tC.opts.Middleware = append(tC.opts.Middleware, HandlerMiddlewareFunc(func(_ context.Context, _ slog.Record, _ slog.Handler) error {
+			tC.opts.Middleware = append(tC.opts.Middleware, SimpleMiddlewareFn(func(_ context.Context, _ slog.Record, _ slog.Handler) error {
 				return nil
 			}))
 			tC.opts.HandlerFn = nil

v2/middleware.go

@@ -210,20 +210,25 @@ type Middleware interface {
 	Apply(slog.Handler) slog.Handler
 }
 
-type MiddlewareFunc func(slog.Handler) slog.Handler
+// MiddlewareFn adapts a function to the Middleware interface.
+type MiddlewareFn func(slog.Handler) slog.Handler
 
-func (f MiddlewareFunc) Apply(h slog.Handler) slog.Handler {
+func (f MiddlewareFn) Apply(h slog.Handler) slog.Handler {
 	return f(h)
 }
 
-func (f HandlerMiddlewareFunc) Apply(h slog.Handler) slog.Handler {
+// Apply implements Middleware
+func (f SimpleMiddlewareFn) Apply(h slog.Handler) slog.Handler {
 	return &middlewareHandler{
 		next:       h,
 		middleware: f,
 	}
 }
 
-type HandlerMiddlewareFunc func(ctx context.Context, record slog.Record, next slog.Handler) error
+// SimpleMiddlewareFn defines a simple middleware function which intercepts
+// *slog.Handler.Handle() calls.  SimpleMiddlewareFn adapts this to the Middleware
+// interface.
+type SimpleMiddlewareFn func(ctx context.Context, record slog.Record, next slog.Handler) error
 
 type middlewareHandler struct {
 	next       slog.Handler

v2/middleware_test.go

@@ -365,7 +365,7 @@ func TestHandlerMiddlewareFunc(t *testing.T) {
 		Level: slog.LevelDebug,
 	})
 
-	middleware := HandlerMiddlewareFunc(func(ctx context.Context, record slog.Record, next slog.Handler) error {
+	middleware := SimpleMiddlewareFn(func(ctx context.Context, record slog.Record, next slog.Handler) error {
 		record.AddAttrs(slog.String("foo", "bar"))
 		return next.Handle(ctx, record)
 	})