Skip to content

fix(fxevent): slog logger raw errors #1266

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
oPOCCOMAXAo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(fxevent): slog logger raw errors #1266

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
2 changes: 1 addition & 1 deletion fxevent/slog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func slogMaybeBool(name string, b bool) slog.Attr {
}

func slogErr(err error) slog.Attr {
return slog.String("error", err.Error())
return slog.Any("error", err)
}

func slogStrings(key string, str []string) slog.Attr {
Expand Down
26 changes: 13 additions & 13 deletions fxevent/slog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"caller": "bytes.NewBuffer",
"callee": "hook.onStart1",
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"caller": "bytes.NewBuffer",
"callee": "hook.onStart1",
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -221,7 +221,7 @@ func TestSlogLogger(t *testing.T) {
"type": "*bytes.Buffer",
"stacktrace": []interface{}{"main.main", "runtime.main"},
"moduletrace": []interface{}{"main.main"},
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -274,7 +274,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"stacktrace": []interface{}{"main.main", "runtime.main"},
"moduletrace": []interface{}{"main.main"},
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -305,7 +305,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"stacktrace": []interface{}{"main.main", "runtime.main"},
"moduletrace": []interface{}{"main.main"},
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -337,7 +337,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"stacktrace": []interface{}{"main.main", "runtime.main"},
"moduletrace": []interface{}{"main.main"},
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down Expand Up @@ -377,7 +377,7 @@ func TestSlogLogger(t *testing.T) {
wantFields: map[string]interface{}{
"name": "bytes.NewBuffer()",
"kind": "constructor",
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand All @@ -394,7 +394,7 @@ func TestSlogLogger(t *testing.T) {
give: &Invoked{FunctionName: "bytes.NewBuffer()", Err: someError},
wantMessage: "invoke failed",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
"stack": "",
"function": "bytes.NewBuffer()",
},
Expand All @@ -404,7 +404,7 @@ func TestSlogLogger(t *testing.T) {
give: &Started{Err: someError},
wantMessage: "start failed",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand All @@ -420,23 +420,23 @@ func TestSlogLogger(t *testing.T) {
give: &Stopped{Err: someError},
wantMessage: "stop failed",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
name: "RollingBack/Error",
give: &RollingBack{StartErr: someError},
wantMessage: "start failed, rolling back",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
name: "RolledBack/Error",
give: &RolledBack{Err: someError},
wantMessage: "rollback failed",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand All @@ -450,7 +450,7 @@ func TestSlogLogger(t *testing.T) {
give: &LoggerInitialized{Err: someError},
wantMessage: "custom logger initialization failed",
wantFields: map[string]interface{}{
"error": "some error",
"error": fmt.Errorf("some error"),
},
},
{
Expand Down