Skip to content

Fix nil panic caused by Logrus not being initialized due to init execution order #235

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
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix nil panic caused by Logrus not being initialized due to init execution order #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28589ca
Add nil check to prevent panic during init execution
Sep 24, 2025
f734472
test: test workflow
Sep 25, 2025
fa3c48e
test: test workflow
Sep 25, 2025
65db3de
test: test workflow
Sep 25, 2025
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
7 changes: 5 additions & 2 deletions tools/go-agent/instrument/logger/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,14 @@ func (span *NoopSpan) GetEndPointName() string {
}

func GetLogContext(withEndpoint bool) interface{} {
report, ok := GetOperator().LogReporter().(LogReporter)
operator := GetOperator()
if operator == nil {
return nil
}
report, ok := operator.LogReporter().(LogReporter)
if !ok || report == nil {
return nil
}

return report.GetLogContext(withEndpoint)
}

Expand Down
8 changes: 7 additions & 1 deletion tools/go-agent/instrument/logger/frameworks/logrus_adapt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,18 @@ import (
)

func UpdateLogrusLogger(l *logrus.Logger) {
if l == nil {
return
}

if LogTracingContextEnable {
if _, wrapperd := l.Formatter.(*WrapFormat); !wrapperd {
l.Formatter = Wrap(l.Formatter, LogTracingContextKey)
}
}
ChangeLogger(NewLogrusAdapter(l))
if ChangeLogger != nil {
ChangeLogger(NewLogrusAdapter(l))
}
}

type LogrusAdapter struct {
Expand Down
Loading