Skip to content

Commit fc7ac59

Browse files
gregwgarrettjonesgoogle
authored andcommitted
---
yaml --- r: 7687 b: refs/heads/tswast-patch-1 c: 628b7c9 h: refs/heads/master i: 7685: 02af1bf 7683: 56db2dc 7679: 91f58f2
1 parent 92d43fe commit fc7ac59

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 164878e2ac8c4ad0aaa9704b4da287358d92be4c
60+
refs/heads/tswast-patch-1: 628b7c931a82a40ac5978b1d75ca3fd79eb60da8
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import java.util.LinkedList;
2828
import java.util.List;
29-
import java.util.Map;
3029
import java.util.Set;
3130
import java.util.logging.ErrorManager;
3231
import java.util.logging.Filter;
@@ -303,15 +302,18 @@ private LogEntry entryFor(LogRecord record) {
303302
return null;
304303
}
305304
Level level = record.getLevel();
306-
Map<String, String> labels = ImmutableMap.of(
307-
"levelName", level.getName(),
308-
"levelValue", String.valueOf(level.intValue()));
309-
return LogEntry.newBuilder(Payload.StringPayload.of(payload))
310-
.setLabels(labels)
311-
.setSeverity(severityFor(level))
312-
.build();
305+
LogEntry.Builder builder = LogEntry.newBuilder(Payload.StringPayload.of(payload))
306+
.addLabel("levelName", level.getName())
307+
.addLabel("levelValue", String.valueOf(level.intValue()))
308+
.setSeverity(severityFor(level));
309+
enhanceLogEntry(builder, record);
310+
return builder.build();
313311
}
314-
312+
313+
protected void enhanceLogEntry(LogEntry.Builder builder, LogRecord record) {
314+
// no-op in this class
315+
}
316+
315317
private static Severity severityFor(Level level) {
316318
if (level instanceof LoggingLevel) {
317319
return ((LoggingLevel) level).getSeverity();

0 commit comments

Comments
 (0)