Merge pull request #818 from rabbitmq/max-latency-console-output

Add max latency to console output

Author: acogoluegnes

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

@@ -32,9 +32,9 @@ class CompactPrintStreamMetricsFormatter extends BaseMetricsFormatter implements
   private static final String TIME_FORMAT = "%-10s";
   // up to 999999 (6), space (1), msg/s (5), leading space to separate (1)
   private static final String RATE_FORMAT = "%13s";
-  // 5 values of 3 digits, 4 separators, 1 space, 2 characters for unit, 1 space to separate
-  private static final String LATENCY_FORMAT = "%23s";
-  private static final int MAX_ALIGNED_LATENCY = 23 - 1; // no space to separate
+  // 6 values of 3 digits, 5 separators, 1 space, 2 characters for unit, 1 space to separate
+  private static final String LATENCY_FORMAT = "%27s";
+  private static final int MAX_ALIGNED_LATENCY = 27 - 1; // no space to separate
 
   private final PrintStream out;
   private final TimeUnit latencyCollectionTimeUnit;

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

@@ -255,7 +255,8 @@ private long[] getStats(Histogram histogram) {
       div(histogram.getSnapshot().getMedian()),
       div(histogram.getSnapshot().get75thPercentile()),
       div(histogram.getSnapshot().get95thPercentile()),
-      div(histogram.getSnapshot().get99thPercentile())
+      div(histogram.getSnapshot().get99thPercentile()),
+      div(histogram.getSnapshot().getMax())
     };
   }
 

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

@@ -24,7 +24,7 @@
 
 abstract class MetricsFormatterUtils {
 
-  static final String LATENCY_HEADER = "min/median/75th/95th/99th";
+  static final String LATENCY_HEADER = "min/median/75th/95th/99th/max";
   static final String MESSAGE_RATE_LABEL = "msg/s";
 
   static final float NANO_TO_SECOND = 1_000_000_000;
@@ -49,8 +49,14 @@ static String formatRate(double rate) {
 
   static String formatLatency(long[] stats, TimeUnit latencyCollectionTimeUnit) {
     return format(
-        "%d/%d/%d/%d/%d %s",
-        stats[0], stats[1], stats[2], stats[3], stats[4], unit(latencyCollectionTimeUnit));
+        "%d/%d/%d/%d/%d/%d %s",
+        stats[0],
+        stats[1],
+        stats[2],
+        stats[3],
+        stats[4],
+        stats[5],
+        unit(latencyCollectionTimeUnit));
   }
 
   private static String unit(TimeUnit latencyCollectionTimeUnit) {

src/test/java/com/rabbitmq/perf/metrics/DefaultPerformanceMetricsTest.java

@@ -36,7 +36,7 @@
 
 public class DefaultPerformanceMetricsTest {
 
-  static final String LATENCY_HEADER = "min/median/75th/95th/99th";
+  static final String LATENCY_HEADER = "min/median/75th/95th/99th/max";
   StringWriter csvOut;
   ByteArrayOutputStream defaultConsoleOut, compactConsoleOut;
   String defaultOutput, compactOutput;
@@ -60,13 +60,13 @@ static TestConfiguration[] testConfigurationsMicroSeconds() {
               "confirmed",
               "nacked",
               "received",
-              "min/median/75th/95th/99th consumer latency",
+              "min/median/75th/95th/99th/max consumer latency",
               "confirm latency"),
           2),
       tc(
           "Sent, received",
           configure().sent(true).received(true).returned(false).confirmed(false),
-          array("sent", "received", "min/median/75th/95th/99th consumer latency"),
+          array("sent", "received", "min/median/75th/95th/99th/max consumer latency"),
           1,
           array("returned", "confirmed", "nacked", "confirm latency")),
       tc(
@@ -77,14 +77,14 @@ static TestConfiguration[] testConfigurationsMicroSeconds() {
               "confirmed",
               "nacked",
               "received",
-              "min/median/75th/95th/99th consumer latency",
+              "min/median/75th/95th/99th/max consumer latency",
               "confirm latency"),
           2,
           array("returned")),
       tc(
           "Sent, received, returned",
           configure().sent(true).received(true).returned(true).confirmed(false),
-          array("sent", "returned", "received", "min/median/75th/95th/99th consumer latency"),
+          array("sent", "returned", "received", "min/median/75th/95th/99th/max consumer latency"),
           1,
           array("confirmed", "nacked", "confirm latency")),
       tc(
@@ -97,7 +97,7 @@ static TestConfiguration[] testConfigurationsMicroSeconds() {
               "confirmed",
               "nacked",
               "received",
-              "min/median/75th/95th/99th consumer latency",
+              "min/median/75th/95th/99th/max consumer latency",
               "consumer latency",
               "confirm latency")),
       tc(
@@ -109,13 +109,13 @@ static TestConfiguration[] testConfigurationsMicroSeconds() {
               "confirmed",
               "nacked",
               "received",
-              "min/median/75th/95th/99th consumer latency",
+              "min/median/75th/95th/99th/max consumer latency",
               "consumer latency",
               "confirm latency")),
       tc(
           "Sent, confirmed",
           configure().sent(true).received(false).returned(false).confirmed(true),
-          array("sent", "confirmed", "nacked", "min/median/75th/95th/99th confirm latency"),
+          array("sent", "confirmed", "nacked", "min/median/75th/95th/99th/max confirm latency"),
           1,
           array("returned", "received", "consumer latency")),
       tc(
@@ -126,19 +126,19 @@ static TestConfiguration[] testConfigurationsMicroSeconds() {
               "returned",
               "confirmed",
               "nacked",
-              "min/median/75th/95th/99th confirm latency"),
+              "min/median/75th/95th/99th/max confirm latency"),
           1,
           array("received", "consumer latency")),
       tc(
           "Sent, received",
           configure().sent(true).received(true).returned(false).confirmed(false),
-          array("sent", "received", "min/median/75th/95th/99th consumer latency"),
+          array("sent", "received", "min/median/75th/95th/99th/max consumer latency"),
           1,
           array("returned", "confirmed", "nacked", "confirm latency")),
       tc(
           "Received",
           configure().sent(false).received(true).returned(false).confirmed(false),
-          array("received", "min/median/75th/95th/99th consumer latency"),
+          array("received", "min/median/75th/95th/99th/max consumer latency"),
           1,
           array("sent", "returned", "confirmed", "nacked", "confirm latency")),
     };