perf: logger print trace info

internal/app/adapter/server/http/middleware/auth.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/pkg/errors"
 
 	"go-scaffold/internal/app/domain"
 )
@@ -98,7 +99,9 @@ func Auth(config AuthConfig) echo.MiddlewareFunc {
 			}
 
 			user, err := config.TokenValidator.ValidateToken(c.Request().Context(), token)
-			if err != nil {
+			if errors.Is(err, context.DeadlineExceeded) {
+				return err
+			} else if err != nil {
 				return echo.NewHTTPError(http.StatusUnauthorized, "malformed token").SetInternal(err)
 			}
 

internal/app/adapter/server/http/middleware/logger.go

@@ -11,7 +11,7 @@ import (
 func Logger(logger *slog.Logger) echo.MiddlewareFunc {
 	return middleware.RequestLoggerWithConfig(middleware.RequestLoggerConfig{
 		LogValuesFunc: func(c echo.Context, v middleware.RequestLoggerValues) error {
-			logger.Info("request",
+			logger.InfoContext(c.Request().Context(), "request",
 				slog.String("id", v.RequestID),
 				slog.String("remote_ip", v.RemoteIP),
 				slog.String("host", v.Host),

internal/app/adapter/server/http/router/router.go

@@ -47,10 +47,10 @@ func New(
 func (r *router) useMiddlewares(e *echo.Echo) {
 	e.HTTPErrorHandler = imiddleware.ErrorHandler(e.Debug, r.logger)
 	e.JSONSerializer = imiddleware.JSONSerializer()
-	e.Use(middleware.RequestID())
 	e.Use(imiddleware.Recover(r.logger))
-	e.Use(imiddleware.Logger(r.logger))
+	e.Use(middleware.RequestID())
 	e.Use(otelecho.Middleware(r.appName.String()))
+	e.Use(imiddleware.Logger(r.logger))
 }
 
 func (r *router) useRoutes(e *echo.Echo) {

internal/command/base.go

@@ -19,7 +19,7 @@ import (
 	"go-scaffold/pkg/ioutils"
 	"go-scaffold/pkg/log"
 	iklog "go-scaffold/pkg/log/kratos"
-	tlog "go-scaffold/pkg/log/otel"
+	otlog "go-scaffold/pkg/log/otel"
 	"go-scaffold/pkg/trace"
 )
 
@@ -155,7 +155,7 @@ func (c *baseCmd) initTrace(cmd *cobra.Command) {
 		traceConfig.Endpoint,
 		trace.WithServiceName(appName.String()),
 		trace.WithEnv(appEnv.String()),
-		trace.WithErrorLogger(tlog.NewLogger(c.logger)),
+		trace.WithErrorLogger(otlog.NewLogger(c.logger)),
 	)
 	if err != nil {
 		panic(err)
@@ -168,6 +168,7 @@ func (c *baseCmd) initTrace(cmd *cobra.Command) {
 	))
 
 	c.trace = tracing
+	c.logger = log.NewWithHandler(otlog.NewHandler(c.logger.Handler()))
 }
 
 func (c *baseCmd) closeConfig() {

pkg/log/log.go

@@ -79,40 +79,45 @@ func WithAttrs(attrs []slog.Attr) Option {
 
 // New build *slog.Logger
 func New(options ...Option) *slog.Logger {
-	logger := &config{
+	c := &config{
 		level:  DefaultLevel,
 		format: DefaultFormat,
 		writer: DefaultWriter,
 	}
 
-	for _, opf := range options {
-		opf(logger)
+	for _, option := range options {
+		option(c)
 	}
 
 	ops := &slog.HandlerOptions{
 		AddSource:   true,
-		Level:       logger.level.Convert(),
+		Level:       c.level.Convert(),
 		ReplaceAttr: ReplaceAttr,
 	}
 
 	var handler slog.Handler
-	if logger.format == Text {
-		handler = slog.NewTextHandler(logger.writer, ops)
+	if c.format == Text {
+		handler = slog.NewTextHandler(c.writer, ops)
 	} else {
-		handler = slog.NewJSONHandler(logger.writer, ops)
+		handler = slog.NewJSONHandler(c.writer, ops)
 	}
 
-	if logger.group != "" {
-		handler = handler.WithGroup(logger.group)
+	if c.group != "" {
+		handler = handler.WithGroup(c.group)
 	}
 
-	if len(logger.attrs) > 0 {
-		handler = handler.WithAttrs(logger.attrs)
+	if len(c.attrs) > 0 {
+		handler = handler.WithAttrs(c.attrs)
 	}
 
 	return slog.New(handler)
 }
 
+// NewWithHandler build *slog.Logger with slog Handler
+func NewWithHandler(handler slog.Handler) *slog.Logger {
+	return slog.New(handler)
+}
+
 // Format log format
 type Format string
 

pkg/log/otel/handler.go

@@ -0,0 +1,42 @@
+package otel
+
+import (
+	"context"
+	"log/slog"
+
+	sdktrace "go.opentelemetry.io/otel/trace"
+)
+
+const (
+	TraceIDLogKey = "trace_id"
+	SpanIDLogKey  = "span_id"
+)
+
+// Handler slog handler
+type Handler struct {
+	slog.Handler
+}
+
+func NewHandler(handler slog.Handler) *Handler {
+	return &Handler{Handler: handler}
+}
+
+func (h *Handler) Handle(ctx context.Context, record slog.Record) error {
+	spanCtx := sdktrace.SpanContextFromContext(ctx)
+
+	var attrs []slog.Attr
+
+	if spanCtx.HasTraceID() {
+		attrs = append(attrs, slog.String(TraceIDLogKey, spanCtx.TraceID().String()))
+	}
+
+	if spanCtx.HasSpanID() {
+		attrs = append(attrs, slog.String(SpanIDLogKey, spanCtx.SpanID().String()))
+	}
+
+	if len(attrs) > 0 {
+		record.Add("trace", slog.GroupValue(attrs...))
+	}
+
+	return h.Handler.Handle(ctx, record)
+}