Skip to content
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

feat(zapslog): implement stack trace handling #1339

Merged
merged 18 commits into from
Sep 1, 2023
Merged

feat(zapslog): implement stack trace handling #1339

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3e34ef1
feat(zapslog): implement stack trace handling
zekth Aug 23, 2023
855ea4b
options.go: Fix year in copyright header
abhinav Aug 25, 2023
46f5228
option: Drop AddCaller
abhinav Aug 25, 2023
f6bf507
fix(example): NewHandler shouldn't be called with nil
abhinav Aug 25, 2023
b8c0132
go.mod: Add replace zap => ../
abhinav Aug 25, 2023
397c305
feat(slog): use internal stacktrace package
zekth Aug 25, 2023
b66a3d3
feat(slog): replace to latest
zekth Aug 25, 2023
b0bb45f
fix(slog): test
zekth Aug 25, 2023
34f37b7
fix build tag
zekth Aug 25, 2023
3a38323
lint
zekth Aug 25, 2023
6fe8c05
go.mod: replace Zap to ../
abhinav Aug 27, 2023
e63605e
Rename AddCallerSkip to WithCallerSkip
abhinav Aug 27, 2023
d5ebf65
AddStacktrace: Use slog.Level, rename to AddStacktraceAt
abhinav Aug 27, 2023
b68ffcf
AddStacktraceAt: Fix test
abhinav Aug 27, 2023
41948fb
test: Don't use require.New
abhinav Aug 27, 2023
31b7f03
Handler.Handle: Inline zapLevel back
abhinav Aug 27, 2023
fd6cc64
doc(WithCaller): remove Zap logger reference
abhinav Aug 27, 2023
573bc29
Merge branch 'master' into feat/slog-stacktrace
abhinav Sep 1, 2023
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
Prev Previous commit
Next Next commit
test: Don't use require.New 
We avoid use of assert.New and require.New in our tests.
  • Loading branch information
@abhinav
abhinav committed Aug 27, 2023
commit 41948fb84d1644a7aef59af534b21ccab4284f0a
5 changes: 2 additions & 3 deletions exp/zapslog/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,13 @@ func TestAddCaller(t *testing.T) {
}

func TestAddStack(t *testing.T) {
r := require.New(t)
fac, logs := observer.New(zapcore.DebugLevel)
sl := slog.New(NewHandler(fac, AddStacktraceAt(slog.LevelDebug)))
sl.Info("msg")

r.Len(logs.AllUntimed(), 1, "Expected exactly one entry to be logged")
require.Len(t, logs.AllUntimed(), 1, "Expected exactly one entry to be logged")
entry := logs.AllUntimed()[0]
r.Equal("msg", entry.Message, "Unexpected message")
require.Equal(t, "msg", entry.Message, "Unexpected message")
assert.Regexp(t,
`^go.uber.org/zap/exp/zapslog.TestAddStack`,
entry.Stack,
Expand Down