fix: Make LoggingHandler.logEntryFor extensible (#1021)

bpcreech · Ben Creech · gcf-owl-bot[bot] · web-flow · commit 79baac68a60c · 2022-08-18T21:02:42.000-07:00
* feat: Make LoggingHandler.logEntryFor extensible * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Ben Creech <bpcreech@google.com> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
@@ -306,7 +306,7 @@ public void publish(LogRecord record) {
     }
     LogEntry logEntry;
     try {
-      logEntry = logEntryFor(record);
+      logEntry = logEntryFor(record).build();
     } catch (Exception ex) {
       getErrorManager().error(null, ex, ErrorManager.FORMAT_FAILURE);
       return;
@@ -344,7 +344,7 @@ public void publish(LogRecord record) {
     return null;
   }
 
-  private LogEntry logEntryFor(LogRecord record) throws Exception {
+  protected LogEntry.Builder logEntryFor(LogRecord record) throws Exception {
     String payload = getFormatter().format(record);
     Level level = record.getLevel();
     LogEntry.Builder builder =
@@ -361,7 +361,7 @@ private LogEntry logEntryFor(LogRecord record) throws Exception {
     for (LoggingEnhancer enhancer : enhancers) {
       enhancer.enhanceLogEntry(builder);
     }
-    return builder.build();
+    return builder;
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ public void publish(LogRecord record) {`
`306`	`306`	`}`
`307`	`307`	`LogEntry logEntry;`
`308`	`308`	`try {`
`309`		`- logEntry = logEntryFor(record);`
	`309`	`+ logEntry = logEntryFor(record).build();`
`310`	`310`	`} catch (Exception ex) {`
`311`	`311`	`getErrorManager().error(null, ex, ErrorManager.FORMAT_FAILURE);`
`312`	`312`	`return;`
`@@ -344,7 +344,7 @@ public void publish(LogRecord record) {`
`344`	`344`	`return null;`
`345`	`345`	`}`
`346`	`346`
`347`		`- private LogEntry logEntryFor(LogRecord record) throws Exception {`
	`347`	`+ protected LogEntry.Builder logEntryFor(LogRecord record) throws Exception {`
`348`	`348`	`String payload = getFormatter().format(record);`
`349`	`349`	`Level level = record.getLevel();`
`350`	`350`	`LogEntry.Builder builder =`
`@@ -361,7 +361,7 @@ private LogEntry logEntryFor(LogRecord record) throws Exception {`
`361`	`361`	`for (LoggingEnhancer enhancer : enhancers) {`
`362`	`362`	`enhancer.enhanceLogEntry(builder);`
`363`	`363`	`}`
`364`		`- return builder.build();`
	`364`	`+ return builder;`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`@Override`