feat(zapslog): implement stack trace handling #1339
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright (c) 2023 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| //go:build go1.21 | ||
|
|
||
| package zapslog | ||
|
|
||
| import "log/slog" | ||
|
|
||
| // An Option configures a slog Handler. | ||
| type Option interface { | ||
| apply(*Handler) | ||
| } | ||
|
|
||
| // optionFunc wraps a func so it satisfies the Option interface. | ||
| type optionFunc func(*Handler) | ||
|
|
||
| func (f optionFunc) apply(handler *Handler) { | ||
| f(handler) | ||
| } | ||
|
|
||
| // WithName configures the Logger to annotate each message with the logger name. | ||
| func WithName(name string) Option { | ||
| return optionFunc(func(h *Handler) { | ||
| h.name = name | ||
| }) | ||
| } | ||
|
|
||
| // WithCaller configures the Logger to include the filename and line number | ||
| // of the caller in log messages--if available. | ||
| func WithCaller(enabled bool) Option { | ||
| return optionFunc(func(handler *Handler) { | ||
| handler.addCaller = enabled | ||
| }) | ||
| } | ||
|
|
||
| // WithCallerSkip increases the number of callers skipped by caller annotation | ||
| // (as enabled by the [WithCaller] option). | ||
| // | ||
| // When building wrappers around the Logger, | ||
| // supplying this Option prevents Zap from always reporting | ||
| // the wrapper code as the caller. | ||
| func WithCallerSkip(skip int) Option { | ||
| return optionFunc(func(log *Handler) { | ||
| log.callerSkip += skip | ||
| }) | ||
| } | ||
|
|
||
| // AddStacktraceAt configures the Logger to record a stack trace | ||
| // for all messages at or above a given level. | ||
| func AddStacktraceAt(lvl slog.Level) Option { | ||
| return optionFunc(func(log *Handler) { | ||
| log.addStackAt = lvl | ||
| }) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for adding this. Much more obvious what's going on now.