Skip to content

Logback: Fix loggerName in log entry. #6104

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

Merged
chingor13 merged 2 commits into from
Aug 21, 2019
Merged

Logback: Fix loggerName in log entry. #6104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2ea07
fix loggerName
Aug 19, 2019
12abf92
modified code
Aug 19, 2019
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
4 changes: 3 additions & 1 deletion ...cloud-logging-logback/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {

private static final String LEVEL_NAME_KEY = "levelName";
private static final String LEVEL_VALUE_KEY = "levelValue";
private static final String LOGGER_NAME_KEY = "loggerName";

private volatile Logging logging;
private LoggingOptions loggingOptions;
Expand Down Expand Up @@ -274,7 +275,8 @@ private LogEntry logEntryFor(ILoggingEvent e) {

builder
.addLabel(LEVEL_NAME_KEY, level.toString())
.addLabel(LEVEL_VALUE_KEY, String.valueOf(level.toInt()));
.addLabel(LEVEL_VALUE_KEY, String.valueOf(level.toInt()))
.addLabel(LOGGER_NAME_KEY, e.getLoggerName());

for (Map.Entry<String, String> entry : e.getMDCPropertyMap().entrySet()) {
if (null != entry.getKey() && null != entry.getValue()) {
Expand Down
5 changes: 5 additions & 0 deletions ...d-logging-logback/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public void testFlushLevelConfigUpdatesLoggingFlushSeverity() {
new ImmutableMap.Builder<String, String>()
.put("levelName", "WARN")
.put("levelValue", String.valueOf(30000L))
.put("loggerName", this.getClass().getName())
.build())
.build();
logging.setFlushSeverity(Severity.WARNING);
Expand Down Expand Up @@ -113,6 +114,7 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() {
new ImmutableMap.Builder<String, String>()
.put("levelName", "ERROR")
.put("levelValue", String.valueOf(40000L))
.put("loggerName", this.getClass().getName())
.build())
.build();
logging.setFlushSeverity(Severity.ERROR);
Expand Down Expand Up @@ -147,6 +149,7 @@ public void testEnhancersAddCorrectLabelsToLogEntries() {
new ImmutableMap.Builder<String, String>()
.put("levelName", "WARN")
.put("levelValue", String.valueOf(30000L))
.put("loggerName", this.getClass().getName())
.put("test-label-1", "test-value-1")
.put("test-label-2", "test-value-2")
.build())
Expand Down Expand Up @@ -195,6 +198,7 @@ public void testMdcValuesAreConvertedToLabels() {
new ImmutableMap.Builder<String, String>()
.put("levelName", "INFO")
.put("levelValue", String.valueOf(20000L))
.put("loggerName", this.getClass().getName())
.put("mdc1", "value1")
.put("mdc2", "value2")
.build())
Expand Down Expand Up @@ -246,6 +250,7 @@ private LoggingEvent createLoggingEvent(Level level, long timestamp) {
loggingEvent.setMessage("this is a test");
loggingEvent.setLevel(level);
loggingEvent.setTimeStamp(timestamp);
loggingEvent.setLoggerName(this.getClass().getName());
return loggingEvent;
}

Expand Down