Skip to content

When debug is enabled, all loggers set report caller to true #2631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pcarranza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

When debug is enabled, all loggers set report caller to true #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@
if input.jsonLogger {
log.SetFormatter(&log.JSONFormatter{})
}
if log.IsLevelEnabled(log.DebugLevel) {
log.SetReportCaller(true)
}

Check warning on line 357 in cmd/root.go

View check run for this annotation

Codecov / codecov/patch

cmd/root.go#L355-L357 

Added lines #L355 - L357 were not covered by tests

if ok, _ := cmd.Flags().GetBool("bug-report"); ok {
return bugReport(ctx, cmd.Version)
Expand Down
2 changes: 2 additions & 0 deletions pkg/runner/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ func WithJobLogger(ctx context.Context, jobID string, jobName string, config *Co
logger.SetFormatter(formatter)
}

// If the main logger is reporting caller, this inner one should too
logger.SetReportCaller(logrus.StandardLogger().ReportCaller)
logger.SetFormatter(&maskedFormatter{
Formatter: logger.Formatter,
masker: valueMasker(config.InsecureSecrets, config.Secrets),
Expand Down
Loading