Add test ID to PerfTest

Backport of #184
and #188

Author: acogoluegnes

src/test/java/com/rabbitmq/examples/PerfTest.java

@@ -35,7 +35,7 @@
 
 
 public class PerfTest {
-	
+
     public static void main(String[] args) {
         Options options = getOptions();
         CommandLineParser parser = new GnuParser();
@@ -47,7 +47,7 @@ public static void main(String[] args) {
                 System.exit(0);
             }
             String testID = new SimpleDateFormat("HHmmss-SSS").format(Calendar.
-            		getInstance().getTime());
+                getInstance().getTime());
             testID                   = strArg(cmd, 'd', "test-"+testID);
             String exchangeType      = strArg(cmd, 't', "direct");
             String exchangeName      = strArg(cmd, 'e', exchangeType);
@@ -79,12 +79,12 @@ public static void main(String[] args) {
 
             //setup
             PrintlnStats stats = new PrintlnStats(testID,
-            		1000L * samplingInterval,
-            		producerCount > 0,
-            		consumerCount > 0,
-            		(flags.contains("mandatory") || 
-            				flags.contains("immediate")),
-    				confirm != -1);
+                1000L * samplingInterval,
+                producerCount > 0,
+                consumerCount > 0,
+                (flags.contains("mandatory") ||
+                    flags.contains("immediate")),
+                confirm != -1);
 
             ConnectionFactory factory = new ConnectionFactory();
             factory.setShutdownTimeout(0); // So we still shut down even with slow consumers
@@ -118,7 +118,7 @@ public static void main(String[] args) {
             p.setProducerRateLimit(producerRateLimit);
             p.setTimeLimit(        timeLimit);
 
-            MulticastSet set = new MulticastSet(stats, factory, p);
+            MulticastSet set = new MulticastSet(stats, factory, p, testID);
             set.run(true);
 
             stats.printFinal();
@@ -141,7 +141,7 @@ private static void usage(Options options) {
     private static Options getOptions() {
         Options options = new Options();
         options.addOption(new Option("?", "help",             false,"show usage"));
-        options.addOption(new Option("d", "id",               true, "Test ID"));
+        options.addOption(new Option("d", "id",               true, "test ID"));
         options.addOption(new Option("h", "uri",              true, "connection URI"));
         options.addOption(new Option("t", "type",             true, "exchange type"));
         options.addOption(new Option("e", "exchange",         true, "exchange name"));
@@ -198,12 +198,12 @@ private static class PrintlnStats extends Stats {
         private final boolean recvStatsEnabled;
         private final boolean returnStatsEnabled;
         private final boolean confirmStatsEnabled;
-        
+
         private final String testID;
 
         public PrintlnStats(String testID, long interval,
-                            boolean sendStatsEnabled, boolean recvStatsEnabled,
-                            boolean returnStatsEnabled, boolean confirmStatsEnabled) {
+            boolean sendStatsEnabled, boolean recvStatsEnabled,
+            boolean returnStatsEnabled, boolean confirmStatsEnabled) {
             super(interval);
             this.sendStatsEnabled = sendStatsEnabled;
             this.recvStatsEnabled = recvStatsEnabled;
@@ -215,27 +215,27 @@ public PrintlnStats(String testID, long interval,
         @Override
         protected void report(long now) {
             String output = "id: " + testID + ", ";
-            
+
             output += "time: " + String.format("%.3f", (now - startTime)/1000.0) + "s";
             output +=
-                    getRate("sent",      sendCountInterval,    sendStatsEnabled,                        elapsedInterval) +
+                getRate("sent",      sendCountInterval,    sendStatsEnabled,                        elapsedInterval) +
                     getRate("returned",  returnCountInterval,  sendStatsEnabled && returnStatsEnabled,  elapsedInterval) +
                     getRate("confirmed", confirmCountInterval, sendStatsEnabled && confirmStatsEnabled, elapsedInterval) +
                     getRate("nacked",    nackCountInterval,    sendStatsEnabled && confirmStatsEnabled, elapsedInterval) +
                     getRate("received",  recvCountInterval,    recvStatsEnabled,                        elapsedInterval);
 
             output += (latencyCountInterval > 0 ?
-                              ", min/avg/max latency: " +
-                              minLatency/1000L + "/" +
-                              cumulativeLatencyInterval / (1000L * latencyCountInterval) + "/" +
-                              maxLatency/1000L + " microseconds" :
-                              "");
+                ", min/avg/max latency: " +
+                    minLatency/1000L + "/" +
+                    cumulativeLatencyInterval / (1000L * latencyCountInterval) + "/" +
+                    maxLatency/1000L + " microseconds" :
+                "");
 
             System.out.println(output);
         }
 
         private String getRate(String descr, long count, boolean display,
-                              long elapsed) {
+            long elapsed) {
             if (display)
                 return ", " + descr + ": " + formatRate(1000.0 * count / elapsed) + " msg/s";
             else
@@ -245,15 +245,15 @@ private String getRate(String descr, long count, boolean display,
         public void printFinal() {
             long now = System.currentTimeMillis();
 
-            System.out.println("sending rate avg: " +
-                               formatRate(sendCountTotal * 1000.0 / (now - startTime)) +
-                               " msg/s");
+            System.out.println("id: " + testID + ", sending rate avg: " +
+                formatRate(sendCountTotal * 1000.0 / (now - startTime)) +
+                " msg/s");
 
             long elapsed = now - startTime;
             if (elapsed > 0) {
-                System.out.println("recving rate avg: " +
-                                   formatRate(recvCountTotal * 1000.0 / elapsed) +
-                                   " msg/s");
+                System.out.println("id: " + testID + ", recving rate avg: " +
+                    formatRate(recvCountTotal * 1000.0 / elapsed) +
+                    " msg/s");
             }
         }
 

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

@@ -15,22 +15,35 @@
 
 package com.rabbitmq.examples.perf;
 
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-
 import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.ConnectionFactory;
+
 public class MulticastSet {
     private final String id;
     private final Stats stats;
     private final ConnectionFactory factory;
     private final MulticastParams params;
+    private final String testID;
+
+    public MulticastSet(Stats stats, ConnectionFactory factory,
+        MulticastParams params) {
+        if (params.getRoutingKey() == null) {
+            this.id = UUID.randomUUID().toString();
+        } else {
+            this.id = params.getRoutingKey();
+        }
+        this.stats = stats;
+        this.factory = factory;
+        this.params = params;
+        this.testID = "perftest";
+    }
 
     public MulticastSet(Stats stats, ConnectionFactory factory,
-                        MulticastParams params) {
+        MulticastParams params, String testID) {
         if (params.getRoutingKey() == null) {
             this.id = UUID.randomUUID().toString();
         } else {
@@ -39,6 +52,7 @@ public MulticastSet(Stats stats, ConnectionFactory factory,
         this.stats = stats;
         this.factory = factory;
         this.params = params;
+        this.testID = testID;
     }
 
     public void run() throws IOException, InterruptedException, TimeoutException {
@@ -50,7 +64,7 @@ public void run(boolean announceStartup) throws IOException, InterruptedExceptio
         Connection[] consumerConnections = new Connection[consumerThreads.length];
         for (int i = 0; i < consumerConnections.length; i++) {
             if (announceStartup) {
-                System.out.println("starting consumer #" + i);
+                System.out.println("id: " + testID + ", starting consumer #" + i);
             }
             Connection conn = factory.newConnection();
             consumerConnections[i] = conn;
@@ -68,7 +82,7 @@ public void run(boolean announceStartup) throws IOException, InterruptedExceptio
         Connection[] producerConnections = new Connection[producerThreads.length];
         for (int i = 0; i < producerThreads.length; i++) {
             if (announceStartup) {
-                System.out.println("starting producer #" + i);
+                System.out.println("id: " + testID + ", starting producer #" + i);
             }
             Connection conn = factory.newConnection();
             producerConnections[i] = conn;