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
lymboy 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 2 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
6 changes: 6 additions & 0 deletions .github/workflows/plugin-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ concurrency:
cancel-in-progress: true

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'
# pull_request:
Copy link
Copy Markdown
Member

@wu-sheng wu-sheng Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be added. Please run these tests locally. And PR will trigger CI automatically.

Copy link
Copy Markdown
Author

@lymboy lymboy Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks! I’m testing the workflow to meet the CI requirements. I’ll create a new branch to avoid affecting this PR.


jobs:
build:
Expand Down
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))
}
Comment on lines +25 to +36
Copy link
Copy Markdown
Member

@wu-sheng wu-sheng Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these changes? It seems code style change, please revert and follow the upstream pattern.

Copy link
Copy Markdown
Author

@lymboy lymboy Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thanks! I’m testing the workflow to meet the CI requirements. I’ll create a new branch to avoid affecting this PR.

}

type LogrusAdapter struct {
Expand Down