centralize printing the exception stacktrace to root logger

Author: Neenu1995

java-bigquery/google-cloud-bigquery-jdbc/.gitignore

@@ -1,3 +1,3 @@
 drivers/**
 target-it/**
-*logs**/**
+*logs*/**

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcCustomLogger.java

@@ -16,10 +16,9 @@
 
 package com.google.cloud.bigquery.jdbc;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.function.Supplier;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 class BigQueryJdbcCustomLogger extends Logger {
@@ -35,6 +34,10 @@ protected BigQueryJdbcCustomLogger(String name, String resourceBundleName) {
   }
 
   private void logWithCaller(Level level, Supplier<String> msgSupplier) {
+    logWithCaller(level, null, msgSupplier);
+  }
+
+  private void logWithCaller(Level level, Throwable thrown, Supplier<String> msgSupplier) {
     if (!isLoggable(level)) {
       return;
     }
@@ -52,13 +55,15 @@ private void logWithCaller(Level level, Supplier<String> msgSupplier) {
       }
     }
 
-    logp(level, sourceClass, sourceMethod, msgSupplier);
-  }
-
-  private String formatStackTrace(Throwable thrown) {
-    StringWriter sw = new StringWriter();
-    thrown.printStackTrace(new PrintWriter(sw));
-    return sw.toString();
+    if (thrown == null) {
+      logp(level, sourceClass, sourceMethod, msgSupplier);
+    } else {
+      LogRecord record = new LogRecord(level, msgSupplier.get());
+      record.setSourceClassName(sourceClass);
+      record.setSourceMethodName(sourceMethod);
+      record.setThrown(thrown);
+      log(record);
+    }
   }
 
   void finest(String format, Object... args) {
@@ -86,26 +91,22 @@ void warning(String format, Object... args) {
   }
 
   void warning(Throwable thrown, String msg) {
-    logWithCaller(Level.WARNING, () -> msg + System.lineSeparator() + formatStackTrace(thrown));
+    logWithCaller(Level.WARNING, thrown, () -> msg);
   }
 
   void warning(Throwable thrown, String format, Object... args) {
-    logWithCaller(
-        Level.WARNING,
-        () -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
+    logWithCaller(Level.WARNING, thrown, () -> String.format(format, args));
   }
 
   void severe(String format, Object... args) {
     logWithCaller(Level.SEVERE, () -> String.format(format, args));
   }
 
   void severe(Throwable thrown, String msg) {
-    logWithCaller(Level.SEVERE, () -> msg + System.lineSeparator() + formatStackTrace(thrown));
+    logWithCaller(Level.SEVERE, thrown, () -> msg);
   }
 
   void severe(Throwable thrown, String format, Object... args) {
-    logWithCaller(
-        Level.SEVERE,
-        () -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
+    logWithCaller(Level.SEVERE, thrown, () -> String.format(format, args));
   }
 }

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java

@@ -124,6 +124,12 @@ public String format(LogRecord record) {
             .append(record.getMessage())
             .append(System.lineSeparator());
 
+        if (record.getThrown() != null) {
+          java.io.StringWriter sw = new java.io.StringWriter();
+          record.getThrown().printStackTrace(new java.io.PrintWriter(sw));
+          sb.append(sw.toString()).append(System.lineSeparator());
+        }
+
         return sb.toString();
       }
     };

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcCustomLoggerTest.java

@@ -91,6 +91,6 @@ public void testLogWithException() {
     assertEquals("testLogWithException", record.getSourceMethodName());
     assertEquals(BigQueryJdbcCustomLoggerTest.class.getName(), record.getSourceClassName());
     assertTrue(record.getMessage().contains("Error occurred: detail"));
-    assertTrue(record.getMessage().contains("java.lang.Exception: Test exception"));
+    assertEquals(ex, record.getThrown());
   }
 }