Skip to content

Commit 805c872

Browse files
authored
Merge pull request #822 from rabbitmq/date-time-in-compact-metrics-format
Display local date and time in compact metric format
2 parents bb13708 + 23734f3 commit 805c872

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/main/java/com/rabbitmq/perf/metrics/CompactPrintStreamMetricsFormatter.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,24 @@
1717

1818
import static com.rabbitmq.perf.metrics.MetricsFormatterUtils.MESSAGE_RATE_LABEL;
1919
import static com.rabbitmq.perf.metrics.MetricsFormatterUtils.formatRate;
20-
import static com.rabbitmq.perf.metrics.MetricsFormatterUtils.formatTime;
2120
import static java.lang.String.format;
2221
import static java.util.concurrent.TimeUnit.MILLISECONDS;
2322
import static java.util.concurrent.TimeUnit.NANOSECONDS;
2423

2524
import java.io.PrintStream;
2625
import java.time.Duration;
26+
import java.time.LocalDateTime;
27+
import java.time.format.DateTimeFormatter;
2728
import java.util.concurrent.TimeUnit;
2829

2930
class CompactPrintStreamMetricsFormatter extends BaseMetricsFormatter implements MetricsFormatter {
3031

31-
// e.g. 99999.999s
32-
private static final String TIME_FORMAT = "%-10s";
32+
private static final String DATE_TIME_FORMAT = "yyyy/MM/dd HH:mm:ss";
33+
private static final DateTimeFormatter DATE_TIME_FORMATTER =
34+
DateTimeFormatter.ofPattern(DATE_TIME_FORMAT);
35+
36+
// e.g. 2025/04/08 16:54:19
37+
private static final String TIME_FORMAT = "%-" + DATE_TIME_FORMAT.length() + "s";
3338
// up to 999999 (6), space (1), msg/s (5), leading space to separate (1)
3439
private static final String RATE_FORMAT = "%13s";
3540
// 6 values of 3 digits, 5 separators, 1 space, 2 characters for unit, 1 space to separate
@@ -97,7 +102,7 @@ public void report(
97102
long[] confirmedLatencyStats,
98103
long[] consumerLatencyStats) {
99104
StringBuilder builder =
100-
new StringBuilder().append(format(TIME_FORMAT, formatTime(durationSinceStart) + "s"));
105+
new StringBuilder().append(DATE_TIME_FORMATTER.format(LocalDateTime.now()));
101106
if (this.publishedEnabled) {
102107
builder.append(format(RATE_FORMAT, formatRate(publishedRate) + " " + MESSAGE_RATE_LABEL));
103108
}

0 commit comments

Comments
 (0)