Skip to content

Commit d287102

Browse files
committed
log exceptions
1 parent 2e2f462 commit d287102

8 files changed

Lines changed: 22 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public String toString() {
166166
}
167167
return Arrays.deepToString(array);
168168
} catch (SQLException e) {
169+
LOG.severe(e, "Error converting array to string");
169170
return "[Error converting array to string: " + e.getMessage() + "]";
170171
}
171172
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public String toString() {
9191
sb.append("}");
9292
return sb.toString();
9393
} catch (SQLException e) {
94+
LOG.severe(e, "Error converting struct to string");
9495
return "{ \"error\": \"Error converting struct to string: " + e.getMessage() + "\" }";
9596
}
9697
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ BigQueryReadClient getBigQueryReadClient() {
297297
this.bigQueryReadClient = getBigQueryReadClientConnection();
298298
}
299299
} catch (IOException e) {
300+
LOG.severe(e, "Failed to initialize BigQueryReadClient");
300301
throw new BigQueryJdbcRuntimeException(e);
301302
}
302303
return this.bigQueryReadClient;
@@ -308,6 +309,7 @@ BigQueryWriteClient getBigQueryWriteClient() {
308309
this.bigQueryWriteClient = getBigQueryWriteClientConnection();
309310
}
310311
} catch (IOException e) {
312+
LOG.severe(e, "Failed to initialize BigQueryWriteClient");
311313
throw new BigQueryJdbcRuntimeException(e);
312314
}
313315
return this.bigQueryWriteClient;
@@ -536,6 +538,7 @@ private void beginTransaction() {
536538
}
537539
this.transactionStarted = true;
538540
} catch (InterruptedException ex) {
541+
LOG.severe(ex, "Failed to begin transaction");
539542
throw new BigQueryJdbcRuntimeException(ex);
540543
}
541544
}
@@ -773,6 +776,7 @@ public void rollback() throws SQLException {
773776
beginTransaction();
774777
}
775778
} catch (InterruptedException | BigQueryException ex) {
779+
LOG.severe(ex, "Failed to rollback transaction");
776780
throw new BigQueryJdbcException(ex);
777781
}
778782
}
@@ -848,8 +852,10 @@ public void close() throws SQLException {
848852
}
849853
this.openStatements.clear();
850854
} catch (ConcurrentModificationException ex) {
855+
LOG.severe(ex, "Concurrent modification during close");
851856
throw new BigQueryJdbcException(ex);
852857
} catch (InterruptedException e) {
858+
LOG.severe(e, "Interrupted during close");
853859
throw new BigQueryJdbcRuntimeException(e);
854860
}
855861
this.isClosed = true;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ else if (referenceQueueJsonRs != null) {
116116
throw new BigQueryJdbcRuntimeException("Null Reference Queue");
117117
}
118118
} catch (InterruptedException ex) {
119+
LOG.severe(ex, "Interrupted in GC daemon task");
119120
throw new BigQueryJdbcRuntimeException(ex);
120121
}
121122
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ void warning(Throwable thrown, String msg) {
9090
}
9191

9292
void warning(Throwable thrown, String format, Object... args) {
93-
logWithCaller(Level.WARNING, () -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
93+
logWithCaller(
94+
Level.WARNING,
95+
() -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
9496
}
9597

9698
void severe(String format, Object... args) {
@@ -102,9 +104,8 @@ void severe(Throwable thrown, String msg) {
102104
}
103105

104106
void severe(Throwable thrown, String format, Object... args) {
105-
logWithCaller(Level.SEVERE, () -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
107+
logWithCaller(
108+
Level.SEVERE,
109+
() -> String.format(format, args) + System.lineSeparator() + formatStackTrace(thrown));
106110
}
107111
}
108-
109-
110-

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ private static HttpTransportFactory getHttpTransportFactory(
189189
.setSSLSocketFactory(sslSocketFactory)
190190
.build());
191191
} catch (IOException | GeneralSecurityException e) {
192+
LOG.severe(e, "Failed to configure SSL TrustStore for HTTP transport");
192193
throw new BigQueryJdbcRuntimeException(e);
193194
}
194195
}
@@ -278,6 +279,7 @@ public ProxiedSocketAddress proxyFor(SocketAddress socketAddress) {
278279
.sslContext(grpcSslContext);
279280

280281
} catch (IOException | GeneralSecurityException e) {
282+
LOG.severe(e, "Failed to configure SSL TrustStore for GRPC channel");
281283
throw new BigQueryJdbcRuntimeException(e);
282284
}
283285
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ QueryJobConfiguration.Builder configureParameters(
6666
QueryParameterValue.of(parameterValue, sqlType));
6767
}
6868
} catch (NullPointerException e) {
69+
LOG.severe(e, "Null parameter mapping encountered.");
6970
if (e.getMessage().contains("Null type")) {
7071
throw new BigQueryJdbcException("One or more parameters missing in Prepared statement.", e);
7172
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public void tearDown() {
7070
@Test
7171
public void testLogWithCallerInference() {
7272
logger.fine("Test message with format %s", "arg");
73-
73+
7474
List<LogRecord> records = testHandler.getRecords();
7575
assertEquals(1, records.size());
7676
LogRecord record = records.get(0);
77-
77+
7878
assertEquals("testLogWithCallerInference", record.getSourceMethodName());
7979
assertEquals(BigQueryJdbcCustomLoggerTest.class.getName(), record.getSourceClassName());
8080
}
@@ -83,15 +83,14 @@ public void testLogWithCallerInference() {
8383
public void testLogWithException() {
8484
Exception ex = new Exception("Test exception");
8585
logger.severe(ex, "Error occurred: %s", "detail");
86-
86+
8787
List<LogRecord> records = testHandler.getRecords();
8888
assertEquals(1, records.size());
8989
LogRecord record = records.get(0);
90-
90+
9191
assertEquals("testLogWithException", record.getSourceMethodName());
9292
assertEquals(BigQueryJdbcCustomLoggerTest.class.getName(), record.getSourceClassName());
9393
assertTrue(record.getMessage().contains("Error occurred: detail"));
9494
assertTrue(record.getMessage().contains("java.lang.Exception: Test exception"));
9595
}
9696
}
97-

0 commit comments

Comments
 (0)