From 0a49613a4252d55df2ed38a99e44957b4a6e53d8 Mon Sep 17 00:00:00 2001
From: Kirill Logachev <kirl@google.com>
Date: Wed, 4 Mar 2026 21:59:02 +0000
Subject: [PATCH] chore(jdbc): add console logs during tests

---
 google-cloud-bigquery-jdbc/pom.xml             | 12 ++++++++++++
 .../bigquery/jdbc/BigQueryJdbcRootLogger.java  | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/google-cloud-bigquery-jdbc/pom.xml b/google-cloud-bigquery-jdbc/pom.xml
index e833f850a2..6a14de7501 100644
--- a/google-cloud-bigquery-jdbc/pom.xml
+++ b/google-cloud-bigquery-jdbc/pom.xml
@@ -48,6 +48,18 @@
         <version>3.5.2</version>
         <configuration>
           <skip>${skipSurefire}</skip>
+          <systemPropertyVariables>
+            <JDBC_TESTS>true</JDBC_TESTS>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <JDBC_TESTS>true</JDBC_TESTS>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>
diff --git a/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java b/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java
index ef963d87d3..a672344155 100644
--- a/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java
+++ b/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java
@@ -43,6 +43,7 @@ class BigQueryJdbcRootLogger {
   private static final Logger logger = Logger.getLogger("com.google.cloud.bigquery");
 
   private static final Logger storageLogger = Logger.getLogger("com.google.cloud.bigquery.storage");
+  private static final boolean isTest = Boolean.getBoolean("JDBC_TESTS");
 
   private static Handler fileHandler = null;
   private static Path currentLogPath = null;
@@ -51,6 +52,12 @@ class BigQueryJdbcRootLogger {
   static {
     logger.setUseParentHandlers(false);
     storageLogger.setUseParentHandlers(true);
+    if (isTest) {
+      ConsoleHandler consoleHandler = new ConsoleHandler();
+      consoleHandler.setLevel(Level.SEVERE);
+      consoleHandler.setFormatter(getFormatter());
+      logger.addHandler(consoleHandler);
+    }
   }
 
   public static Formatter getFormatter() {
@@ -111,13 +118,12 @@ private static void setHandler() throws IOException {
     // If File handler exists, use it. Else create new one.
     for (Handler h : logger.getHandlers()) {
       if (h instanceof ConsoleHandler) {
-        h.close();
-        logger.removeHandler(h);
-        break;
-      }
-      if (h instanceof FileHandler) {
+        if (!isTest) {
+          h.close();
+          logger.removeHandler(h);
+        }
+      } else if (h instanceof FileHandler) {
         fileHandler = h;
-        break;
       }
     }