Skip to content

Commit 11483bb

Browse files
committed
fix(bqjdbc): optimize formatter in BigQueryJdbcRootLogger
1 parent 53e2353 commit 11483bb

2 files changed

Lines changed: 19 additions & 23 deletions

File tree

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

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@
1919
import com.google.common.base.Strings;
2020
import java.io.IOException;
2121
import java.lang.management.ManagementFactory;
22-
import java.time.Instant;
23-
import java.time.ZoneId;
24-
import java.time.format.DateTimeFormatter;
2522
import java.nio.file.Files;
2623
import java.nio.file.Path;
2724
import java.nio.file.Paths;
2825
import java.nio.file.StandardCopyOption;
2926
import java.text.SimpleDateFormat;
3027
import java.util.Date;
31-
import java.util.Optional;
3228
import java.util.logging.ConsoleHandler;
3329
import java.util.logging.FileHandler;
3430
import java.util.logging.Formatter;
@@ -92,33 +88,33 @@ public static Formatter getFormatter() {
9288
@Override
9389
public String format(LogRecord record) {
9490
String date = dateFormatter.get().format(new Date(record.getMillis()));
95-
91+
9692
long threadId = record.getThreadID();
9793
String threadName = getThreadName(threadId);
9894

9995
if (threadName.length() > MAX_THREAD_NAME_LENGTH) {
10096
threadName = threadName.substring(threadName.length() - MAX_THREAD_NAME_LENGTH);
10197
}
102-
98+
10399
String sourceClassName = record.getLoggerName();
104100
String sourceMethodName = record.getSourceMethodName();
105-
101+
106102
StringBuilder sb = new StringBuilder(256);
107103
sb.append(date)
108-
.append(" ")
109-
.append(Strings.padStart(record.getLevel().getName(), 5, ' '))
110-
.append(" ")
111-
.append(PROCESS_ID)
112-
.append(" --- [")
113-
.append(Strings.padEnd(threadName, 7, ' '))
114-
.append("] ")
115-
.append(Strings.padEnd(sourceClassName != null ? sourceClassName : "", 50, ' '))
116-
.append(" ")
117-
.append(Strings.padEnd(sourceMethodName != null ? sourceMethodName : "", 20, ' '))
118-
.append(": ")
119-
.append(record.getMessage())
120-
.append(System.lineSeparator());
121-
104+
.append(" ")
105+
.append(Strings.padStart(record.getLevel().getName(), 5, ' '))
106+
.append(" ")
107+
.append(PROCESS_ID)
108+
.append(" --- [")
109+
.append(Strings.padEnd(threadName, 7, ' '))
110+
.append("] ")
111+
.append(Strings.padEnd(sourceClassName != null ? sourceClassName : "", 50, ' '))
112+
.append(" ")
113+
.append(Strings.padEnd(sourceMethodName != null ? sourceMethodName : "", 20, ' '))
114+
.append(": ")
115+
.append(record.getMessage())
116+
.append(System.lineSeparator());
117+
122118
return sb.toString();
123119
}
124120
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public void testGetFormatterFormat() {
5050
public void testThreadNameTruncation() {
5151
Formatter formatter = BigQueryJdbcRootLogger.getFormatter();
5252
LogRecord record = new LogRecord(Level.INFO, "Test message");
53-
53+
5454
String formatted = formatter.format(record);
5555
int startIndex = formatted.indexOf("--- [") + 5;
5656
int endIndex = formatted.indexOf("]", startIndex);
5757
String threadPart = formatted.substring(startIndex, endIndex).trim();
58-
58+
5959
assertTrue(threadPart.length() <= 15);
6060
}
6161

0 commit comments

Comments
 (0)