add extra fields to core logger #201
Merged
Conversation
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
wsargent
commented
Jul 1, 2022
| * @param message the message string to be logged, may be null. | ||
| */ | ||
| void log( | ||
| @NotNull Level level, @NotNull Supplier<List<Field>> extraFields, @Nullable String message); |
There was a problem hiding this comment.
Add extraFields here
wsargent
commented
Jul 1, 2022
| */ | ||
| <FB> void log( | ||
| @NotNull Level level, | ||
| @NotNull Supplier<List<Field>> extraFields, |
There was a problem hiding this comment.
Add extra fields here
wsargent
commented
Jul 1, 2022
| */ | ||
| void log( | ||
| @NotNull Level level, | ||
| @NotNull Supplier<List<Field>> extraFields, |
There was a problem hiding this comment.
Add extra fields here
wsargent
commented
Jul 1, 2022
| */ | ||
| <FB> void log( | ||
| @NotNull Level level, | ||
| @NotNull Supplier<List<Field>> extraFields, |
There was a problem hiding this comment.
Add extra fields here
wsargent
commented
Jul 1, 2022
| if (logger.isEnabled(log4jLevel, marker)) { | ||
| Log4JLoggingContext ctx = | ||
| new Log4JLoggingContext( | ||
| context.withFields(extraFields), () -> convertToFields(f.apply(builder))); |
There was a problem hiding this comment.
use context with fields without creating a new logger
wsargent
commented
Jul 1, 2022
| final org.apache.logging.log4j.Level log4jLevel = convertLevel(level); | ||
| // the isEnabled check always goes before the condition check, as conditions can be expensive | ||
| if (logger.isEnabled(log4jLevel, marker)) { | ||
| Log4JLoggingContext ctx = new Log4JLoggingContext(context.withFields(extraFields)); |
There was a problem hiding this comment.
use context with fields without creating a new logger
wsargent
commented
Jul 1, 2022
| final org.apache.logging.log4j.Level log4jLevel = convertLevel(level); | ||
| if (logger.isEnabled(log4jLevel, marker)) { | ||
| // We want to memoize context fields even if no argument... | ||
| Log4JLoggingContext ctx = new Log4JLoggingContext(context.withFields(extraFields)); |
There was a problem hiding this comment.
extra fields and condition
wsargent
commented
Jul 1, 2022
| @Override | ||
| public <FB> void log( | ||
| @NotNull Level level, | ||
| @NotNull Supplier<List<Field>> extraFields, |
There was a problem hiding this comment.
extra fields and condition.
wsargent
commented
Jul 1, 2022
| Marker m = context.resolveMarkers(); | ||
| if (logger.isEnabledFor(m, convertLogbackLevel(level))) { | ||
| LogstashLoggingContext snapshotContext = | ||
| new LogstashLoggingContext(context.withFields(extraFields)); |
wsargent
commented
Jul 1, 2022
| if (logger.isEnabledFor(m, convertLogbackLevel(level))) { | ||
| LoggingContext ctx = | ||
| new LogstashLoggingContext( | ||
| context.withFields(extraFields), () -> convertToFields(f.apply(builder))); |
wsargent
commented
Jul 1, 2022
| @Nullable String message) { | ||
| final Marker m = context.resolveMarkers(); | ||
| if (logger.isEnabledFor(m, convertLogbackLevel(level))) { | ||
| LoggingContext snapshotContext = new LogstashLoggingContext(context.withFields(extraFields)); |
There was a problem hiding this comment.
extra fields and condition
wsargent
commented
Jul 1, 2022
| final Marker marker = context.resolveMarkers(); | ||
| if (logger.isEnabledFor(marker, convertLogbackLevel(level))) { | ||
| LoggingContext snapshotContext = | ||
| new LogstashLoggingContext( |
There was a problem hiding this comment.
extra fields and condition
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Creating a new logger when we just want to add some extra fields in a single statement (especially source info / macro provided information) is unnecessarily expensive, especially on disabled loggers. Adding statements that allow for suppliers fills out some options for providers.