fix: c.Writer

fix req context trace id; default logger with trace-id

ci: fix nfctl run

.github/workflows/nfctl.yml

@@ -2,7 +2,7 @@ name: Auto Build
 on:
   push:
     branches:
-      - 'master'
+      - 'release/nfctl/*'
 
 env:
   RELEASE_VERSION: v24.07.14-r3

ctx.go

@@ -51,11 +51,10 @@ func newContext(app *App, writer http.ResponseWriter, request *http.Request) *Ct
 	}
 
 	c := context.WithValue(request.Context(), TraceKey, traceId)
-	request.WithContext(c)
 
 	ctx := &Ctx{
 		lock:       sync.Mutex{},
-		Request:    request,
+		Request:    request.WithContext(c),
 		path:       request.URL.Path,
 		method:     request.Method,
 		StatusCode: 200,
@@ -75,6 +74,7 @@ func newContext(app *App, writer http.ResponseWriter, request *http.Request) *Ct
 	}
 
 	ctx.Writer = &ctx.writermem
+	ctx.writermem.Header().Set(TraceKey, traceId)
 
 	return ctx
 }
@@ -289,23 +289,23 @@ func (c *Ctx) Status(code int) *Ctx {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
-	c.writermem.WriteHeader(code)
+	c.Writer.WriteHeader(code)
 	c.StatusCode = c.writermem.status
 
 	return c
 }
 
 func (c *Ctx) Set(key string, value string) {
-	c.writermem.Header().Set(key, value)
+	c.Writer.Header().Set(key, value)
 }
 
 func (c *Ctx) SetHeader(key string, value string) {
-	c.writermem.Header().Set(key, value)
+	c.Writer.Header().Set(key, value)
 }
 
 func (c *Ctx) SendStatus(code int) error {
 	c.Status(code)
-	c.writermem.WriteHeaderNow()
+	c.Writer.WriteHeaderNow()
 	return nil
 }
 
@@ -323,7 +323,7 @@ func (c *Ctx) Writef(format string, values ...interface{}) (int, error) {
 func (c *Ctx) JSON(data interface{}) error {
 	c.SetHeader("Content-Type", MIMEApplicationJSON)
 
-	encoder := json.NewEncoder(&c.writermem)
+	encoder := json.NewEncoder(c.Writer)
 
 	if err := encoder.Encode(data); err != nil {
 		return err
@@ -356,5 +356,5 @@ func (c *Ctx) HTML(html string) error {
 }
 
 func (c *Ctx) Write(data []byte) (int, error) {
-	return c.writermem.Write(data)
+	return c.Writer.Write(data)
 }

middleware.go

@@ -2,11 +2,9 @@ package nf
 
 import (
 	"fmt"
-	"github.com/google/uuid"
 	"github.com/loveuer/nf/nft/log"
 	"os"
 	"runtime/debug"
-	"strings"
 	"time"
 )
 
@@ -29,33 +27,19 @@ func NewRecover(enableStackTrace bool) HandlerFunc {
 	}
 }
 
-func NewLogger(traceHeader ...string) HandlerFunc {
+func NewLogger() HandlerFunc {
-	Header := "X-Trace-ID"
-	if len(traceHeader) > 0 && traceHeader[0] != "" {
-		Header = traceHeader[0]
-	}
 
 	return func(c *Ctx) error {
 		var (
 			now   = time.Now()
-			trace = c.Get(Header)
 			logFn func(msg string, data ...any)
 			ip    = c.IP()
 		)
 
-		if trace == "" {
-			trace = uuid.Must(uuid.NewV7()).String()
-		}
-
-		c.SetHeader(Header, trace)
-
-		traces := strings.Split(trace, "-")
-		shortTrace := traces[len(traces)-1]
-
 		err := c.Next()
 		duration := time.Since(now)
 
-		msg := fmt.Sprintf("NF | %s | %15s | %3d | %s | %6s | %s", shortTrace, ip, c.StatusCode, HumanDuration(duration.Nanoseconds()), c.Method(), c.Path())
+		msg := fmt.Sprintf("NF | %v | %15s | %3d | %s | %6s | %s", c.Context().Value(TraceKey), ip, c.StatusCode, HumanDuration(duration.Nanoseconds()), c.Method(), c.Path())
 
 		switch {
 		case c.StatusCode >= 500: