slog: Ignore frames with a zero PC (#1258)

uber-go · Mar 20, 2023 · 42b7ef0 · 42b7ef0
1 parent 05c4b6c
commit 42b7ef0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/exp/zapslog/slog.go b/exp/zapslog/slog.go
@@ -144,14 +144,16 @@ func (h *Handler) Handle(ctx context.Context, record slog.Record) error {
 		return nil
 	}
 
-	if h.addSource {
+	if h.addSource && record.PC != 0 {
 		frame, _ := runtime.CallersFrames([]uintptr{record.PC}).Next()
-		ce.Caller = zapcore.EntryCaller{
-			Defined:  true,
-			PC:       frame.PC,
-			File:     frame.File,
-			Line:     frame.Line,
-			Function: frame.Function,
+		if frame.PC != 0 {
+			ce.Caller = zapcore.EntryCaller{
+				Defined:  true,
+				PC:       frame.PC,
+				File:     frame.File,
+				Line:     frame.Line,
+				Function: frame.Function,
+			}
 		}
 	}