Obtain rates in bytes/sec as well as msg/sec (not counting AMQP overhead)

Author: Simon MacMullen

test/src/com/rabbitmq/examples/perf/ScenarioStats.java

@@ -16,6 +16,8 @@
 
 package com.rabbitmq.examples.perf;
 
+import java.util.Map;
+
 public interface ScenarioStats {
-    public Object results();
+    public Map<String, Object> results();
 }

test/src/com/rabbitmq/examples/perf/SimpleScenario.java

@@ -43,6 +43,7 @@ public void run() throws IOException, InterruptedException {
         this.stats = new SimpleScenarioStats(interval);
         for (MulticastParams p : params) {
             MulticastSet set = new MulticastSet(stats, factory, p);
+            stats.setMinMsgSize(p.minMsgSize);
             set.run();
         }
     }

test/src/com/rabbitmq/examples/perf/SimpleScenarioStats.java

@@ -26,6 +26,7 @@ class SimpleScenarioStats extends Stats implements ScenarioStats {
 
     private List<Map<String, Object>> samples = new ArrayList<Map<String, Object>>();
     private long elapsedTotalToIgnore;
+    private long minMsgSize;
 
     public SimpleScenarioStats(long interval) {
         super(interval);
@@ -42,8 +43,10 @@ protected void report(long now) {
         }
 
         Map<String, Object> sample = new HashMap<String, Object>();
-        sample.put("send-rate", rate(sendCountInterval, elapsedInterval));
-        sample.put("recv-rate", rate(recvCountInterval, elapsedInterval));
+        sample.put("send-msg-rate", rate(sendCountInterval, elapsedInterval));
+        sample.put("send-bytes-rate", rate(sendCountInterval, elapsedInterval) * minMsgSize);
+        sample.put("recv-msg-rate", rate(recvCountInterval, elapsedInterval));
+        sample.put("recv-bytes-rate", rate(recvCountInterval, elapsedInterval) * minMsgSize);
         sample.put("elapsed",   elapsedTotal);
         if (latencyCountInterval > 0) {
             sample.put("avg-latency", intervalAverageLatency());
@@ -56,15 +59,21 @@ protected void report(long now) {
     @Override
     public Map<String, Object> results() {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("send-rate", getSendRate());
-        map.put("recv-rate", getRecvRate());
+        map.put("send-msg-rate", getSendRate());
+        map.put("send-bytes-rate", getSendRate() * minMsgSize);
+        map.put("recv-msg-rate", getRecvRate());
+        map.put("recv-bytes-rate", getRecvRate() * minMsgSize);
         if (latencyCountTotal > 0) {
             map.put("avg-latency", overallAverageLatency());
         }
         map.put("samples", samples);
         return map;
     }
 
+    public void setMinMsgSize(long minMsgSize) {
+        this.minMsgSize = minMsgSize;
+    }
+
     public double getSendRate() {
         return rate(sendCountTotal, elapsedTotal - elapsedTotalToIgnore);
     }

test/src/com/rabbitmq/examples/perf/VaryingScenario.java

@@ -18,7 +18,6 @@
 
 import com.rabbitmq.client.ConnectionFactory;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -65,6 +64,7 @@ private void run(Variable[] variables, List<VariableValue> values) throws Except
                     value.setup(p);
                 }
                 MulticastSet set = new MulticastSet(stats0, factory, p);
+                stats0.setMinMsgSize(p.minMsgSize);
                 set.run();
                 for (VariableValue value : values) {
                     value.teardown(p);

test/src/com/rabbitmq/examples/perf/VaryingScenarioStats.java

@@ -35,7 +35,7 @@ public SimpleScenarioStats next(List<VariableValue> value) {
     }
 
     @Override
-    public Object results() {
+    public Map<String, Object> results() {
         Map<String, Object> map = new HashMap<String, Object>();
 
         List<String> dimensions = new ArrayList<String>();