zapslog: Apply callerSkip when addCaller #1380

sjones4 · 2023-11-03T22:16:45Z

CallerSkip was added to the Handler but only used for the stacktrace, it should also be applied to the caller with an appropriate offset.

Currently the stacktrace can be correct for a wrapped logger but there is no way to fix the caller information.

Here is the equivalent logger functionality where the skip is applied for the caller:

zap/logger.go

Lines 393 to 414 in c17272e

    
           stack := stacktrace.Capture(log.callerSkip+callerSkipOffset, stackDepth) 
        
           defer stack.Free() 
        
           if stack.Count() == 0 { 
        
           	if log.addCaller { 
        
           		fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC()) 
        
           		_ = log.errorOutput.Sync() 
        
           	} 
        
           	return ce 
        
           } 
        
           frame, more := stack.Next() 
        
           if log.addCaller { 
        
           	ce.Caller = zapcore.EntryCaller{ 
        
           		Defined:  frame.PC != 0, 
        
           		PC:       frame.PC, 
        
           		File:     frame.File, 
        
           		Line:     frame.Line, 
        
           		Function: frame.Function, 
        
           	} 
        
           }

CLAassistant · 2023-11-03T22:16:53Z

All committers have signed the CLA.

zapslog: Apply callerSkip when addCaller

44cee32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

zapslog: Apply callerSkip when addCaller #1380

zapslog: Apply callerSkip when addCaller #1380

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

	stack := stacktrace.Capture(log.callerSkip+callerSkipOffset, stackDepth)
	defer stack.Free()

	if stack.Count() == 0 {
	if log.addCaller {
	fmt.Fprintf(log.errorOutput, "%v Logger.check error: failed to get caller\n", ent.Time.UTC())
	_ = log.errorOutput.Sync()
	}
	return ce
	}

	frame, more := stack.Next()

	if log.addCaller {
	ce.Caller = zapcore.EntryCaller{
	Defined: frame.PC != 0,
	PC: frame.PC,
	File: frame.File,
	Line: frame.Line,
	Function: frame.Function,
	}
	}

zapslog: Apply callerSkip when addCaller #1380

Are you sure you want to change the base?

zapslog: Apply callerSkip when addCaller #1380

Uh oh!

Conversation

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants