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

otelzap: Add caller and stacktrace to attributes if present #6268

Merged
merged 14 commits into from
Oct 24, 2024
Merged

otelzap: Add caller and stacktrace to attributes if present #6268

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
70a4c4f
added caller to record attributes
suniastar Oct 21, 2024
0951147
added changelog
suniastar Oct 21, 2024
253487c
adjusted to follow semconv conventions
suniastar Oct 21, 2024
1bbaa6b
added stack trace to log record if persistent in log entry
suniastar Oct 21, 2024
2a0d9be
applied changelog review suggestion
suniastar Oct 21, 2024
335a4b4
added tests
suniastar Oct 21, 2024
54969a4
reformat code
suniastar Oct 21, 2024
35d5e27
removed debug print statements
suniastar Oct 22, 2024
3f0d61b
applied linting suggestion
suniastar Oct 22, 2024
2b13733
Merge branch 'main' into main
dmathieu Oct 22, 2024
f2bc56c
removed unnecessary tests
suniastar Oct 22, 2024
59d480b
Update CHANGELOG.md
pellared Oct 22, 2024
3545115
updated go mod file
suniastar Oct 22, 2024
bf0da84
Merge branch 'main' into main
pellared Oct 23, 2024
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: 7 additions & 0 deletions bridges/otelzap/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,13 @@ func (o *Core) Write(ent zapcore.Entry, fields []zapcore.Field) error {
r.SetSeverityText(ent.Level.String())

r.AddAttributes(o.attr...)
if ent.Caller.Defined {
r.AddAttributes(
log.String("file", ent.Caller.File),
log.Int("line", ent.Caller.Line),
log.String("function", ent.Caller.Function),
suniastar marked this conversation as resolved.
Show resolved Hide resolved
)
}
if len(fields) > 0 {
ctx, attrbuf := convertField(fields)
if ctx != nil {
Expand Down