优化

pkg/logging/zap_test.go

@@ -5,12 +5,16 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 func TestZapHandlerHonorsConfiguredLevel(t *testing.T) {
 	root := t.TempDir()
-	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "error", Format: "json"})
+	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "error", Format: "json"}, nil)
 	defer cleanup()
 
 	if handler.Enabled(context.Background(), slog.LevelInfo) {
@@ -23,7 +27,7 @@ func TestZapHandlerHonorsConfiguredLevel(t *testing.T) {
 
 func TestZapHandlerUsesDebugFallbackForInvalidLevel(t *testing.T) {
 	root := t.TempDir()
-	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "not-a-level", Format: "json"})
+	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "not-a-level", Format: "json"}, nil)
 	defer cleanup()
 
 	if !handler.Enabled(context.Background(), slog.LevelDebug) {
@@ -33,7 +37,7 @@ func TestZapHandlerUsesDebugFallbackForInvalidLevel(t *testing.T) {
 
 func TestZapHandlerRoutesHTTPAndErrorLogs(t *testing.T) {
 	root := t.TempDir()
-	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "info", Format: "json"})
+	handler, cleanup := newZapHandler(root, "application.log", Options{Level: "info", Format: "json"}, nil)
 	logger := slog.New(handler)
 	logger.Info("request", "mod", "http", "request_id", "req-1")
 	logger.Error("failed", "mod", "users")
@@ -56,3 +60,59 @@ func TestZapHandlerRoutesHTTPAndErrorLogs(t *testing.T) {
 		}
 	}
 }
+
+func TestZapHandlerRecordsEveryErrorThroughSink(t *testing.T) {
+	root := t.TempDir()
+	var entries []ErrorEntry
+	logger, control := NewReloadableZapLogger(root, "application.log", Options{Level: "info", Format: "json"})
+	defer control.Close()
+	control.SetErrorSink(ErrorSinkFunc(func(_ context.Context, entry ErrorEntry) error {
+		entries = append(entries, entry)
+		return nil
+	}))
+	logger.Error("task execution failed", "mod", "timedTask", "request_id", "request-1", "trace_id", "trace-1", "error", os.ErrPermission)
+	control.Reload(t.TempDir(), Options{Level: "info", Format: "json"})
+	logger.Error("reloaded logger failure", "mod", "system")
+
+	if len(entries) != 2 {
+		t.Fatalf("expected two error entries across reload, got %d", len(entries))
+	}
+	entry := entries[0]
+	if entry.Form != "后端" || entry.Level != "error" || entry.RequestID != "request-1" || entry.TraceID != "trace-1" || !strings.Contains(entry.Info, "task execution failed") || !strings.Contains(entry.Info, os.ErrPermission.Error()) {
+		t.Fatalf("unexpected error entry: %+v", entry)
+	}
+}
+
+func TestErrorEntryIncludesFinalApplicationSource(t *testing.T) {
+	filename := filepath.Join(t.TempDir(), "worker.go")
+	content := "package sample\n\nfunc execute() {\n\tprintln(\"failed\")\n}\n"
+	if err := os.WriteFile(filename, []byte(content), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	entry := errorEntryFromZap(zapcore.Entry{Message: "task failed", Level: zapcore.ErrorLevel, Stack: "kra/internal/worker.execute\n" + filename + ":4"}, nil)
+	if !strings.Contains(entry.Info, "最终调用方法:"+filename+":4 (execute lines 3-5)") || !strings.Contains(entry.Info, "func execute()") {
+		t.Fatalf("expected final caller source in error entry: %s", entry.Info)
+	}
+}
+
+func TestErrorSinkSkipsGORMBridge(t *testing.T) {
+	root := t.TempDir()
+	var entries []ErrorEntry
+	state := &errorSinkState{sink: ErrorSinkFunc(func(_ context.Context, entry ErrorEntry) error {
+		entries = append(entries, entry)
+		return nil
+	})}
+	base := zapcore.NewNopCore()
+	core := &routedFileCore{base: base, encoder: zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()), level: zapcore.ErrorLevel, root: root, state: &routedFileState{writers: map[string]*DailyWriter{}}, errorSink: state}
+	for _, filename := range []string{"/tmp/gorm_logger_writer.go", "/workspace/internal/data/gorm_logger.go"} {
+		if err := core.Write(zapcore.Entry{Level: zapcore.ErrorLevel, Message: "database failed", Caller: zapcore.EntryCaller{Defined: true, File: filename, Line: 10}}, nil); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := core.Write(zapcore.Entry{Level: zapcore.ErrorLevel, Message: "database failed"}, []zapcore.Field{zap.Bool("gorm_logger", true)}); err != nil {
+		t.Fatal(err)
+	}
+	if len(entries) != 0 {
+		t.Fatalf("gorm bridge error must not recurse into sys_error: %+v", entries)
+	}
+}