rewrite

internal/transport/middleware/log.go

@@ -3,42 +3,28 @@ package middleware
 import (
 	"time"
 
-	"git.intra.yksa.space/gsn/predictor/internal/pkg/errcodes"
-	"git.intra.yksa.space/gsn/predictor/internal/pkg/log"
 	"github.com/ogen-go/ogen/middleware"
 	"go.uber.org/zap"
 )
 
-func Logging() middleware.Middleware {
+// Logging returns an ogen middleware that logs request duration.
+func Logging(log *zap.Logger) middleware.Middleware {
 	return func(req middleware.Request, next func(req middleware.Request) (middleware.Response, error)) (middleware.Response, error) {
-		lg := log.Ctx(req.Context).With(
-			zap.String("operationId", req.OperationID),
-		)
-
-		lg.Info("started request")
-
-		req.Context = log.ToCtx(req.Context, lg)
+		lg := log.With(zap.String("operation", req.OperationID))
 
 		start := time.Now()
 		resp, err := next(req)
-		dur := time.Since(start).Microseconds()
+		dur := time.Since(start)
 
 		if err != nil {
-			if errcode, ok := err.(*errcodes.ErrorCode); ok {
-				lg.Error("request error",
-					zap.Int("status_code", errcode.StatusCode),
-					zap.String("message", errcode.Message),
-					zap.String("details", errcode.Details),
-				)
-			} else {
-				lg.Error("request internal error",
-					zap.Error(err),
-				)
-			}
+			lg.Error("request failed",
+				zap.Duration("duration", dur),
+				zap.Error(err))
+		} else {
+			lg.Info("request completed",
+				zap.Duration("duration", dur))
 		}
 
-		lg.Info("done request", zap.Float64("duration_ms", float64(dur)/float64(1000)))
-
 		return resp, err
 	}
 }