Skip to content

Commit e0ccb57

Browse files
committed
chore: use formatted logs
1 parent 6f3ac5a commit e0ccb57

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void publishToGcp(LogRecord record, String connectionId, Logging logging
8686
}
8787

8888
LogEntry.Builder builder =
89-
LogEntry.newBuilder(Payload.StringPayload.of(record.getMessage()))
89+
LogEntry.newBuilder(Payload.StringPayload.of(formatMessage(record)))
9090
.setSeverity(mapGcpSeverity(record.getLevel()))
9191
.setTimestamp(record.getMillis());
9292

@@ -129,7 +129,7 @@ private void publishToOTel(LogRecord record, String connectionId, OpenTelemetry
129129
LogRecordBuilder builder =
130130
logger
131131
.logRecordBuilder()
132-
.setBody(record.getMessage())
132+
.setBody(formatMessage(record))
133133
.setSeverity(mapSeverity(record.getLevel()))
134134
.setTimestamp(Instant.ofEpochMilli(record.getMillis()))
135135
.setContext(Context.current());
@@ -152,6 +152,19 @@ private Severity mapSeverity(Level level) {
152152
return Severity.TRACE;
153153
}
154154

155+
private String formatMessage(LogRecord record) {
156+
String message = record.getMessage();
157+
Object[] params = record.getParameters();
158+
if (params != null && params.length > 0) {
159+
try {
160+
return java.text.MessageFormat.format(message, params);
161+
} catch (IllegalArgumentException e) {
162+
return message;
163+
}
164+
}
165+
return message;
166+
}
167+
155168
@Override
156169
public void flush() {
157170
for (BigQueryJdbcOpenTelemetry.TelemetryConfig config :

0 commit comments

Comments
 (0)