From f10064d5a6e71d911b5362b87370f743c2ce9924 Mon Sep 17 00:00:00 2001
From: ayoub <ayoub.bousselmi@orange.com>
Date: Mon, 29 Aug 2016 23:40:30 -0500
Subject: [PATCH] Update MulticastSet to print consumer/producer ID.

---
 .../java/com/rabbitmq/examples/PerfTest.java  | 14 +++++-----
 .../rabbitmq/examples/perf/MulticastSet.java  | 26 ++++++++++++++-----
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/test/java/com/rabbitmq/examples/PerfTest.java b/src/test/java/com/rabbitmq/examples/PerfTest.java
index 8208f0f8c0..8de968bb2c 100644
--- a/src/test/java/com/rabbitmq/examples/PerfTest.java
+++ b/src/test/java/com/rabbitmq/examples/PerfTest.java
@@ -35,8 +35,8 @@
 
 
 public class PerfTest {
-	
-    public static void main(String[] args) {
+
+   public static void main(String[] args) {
         Options options = getOptions();
         CommandLineParser parser = new GnuParser();
         try {
@@ -82,7 +82,7 @@ public static void main(String[] args) {
             		1000L * samplingInterval,
             		producerCount > 0,
             		consumerCount > 0,
-            		(flags.contains("mandatory") || 
+            		(flags.contains("mandatory") ||
             		flags.contains("immediate")),
             		confirm != -1);
 
@@ -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,7 +198,7 @@ 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,
@@ -215,7 +215,7 @@ 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) +
diff --git a/src/test/java/com/rabbitmq/examples/perf/MulticastSet.java b/src/test/java/com/rabbitmq/examples/perf/MulticastSet.java
index 9c46a670ac..4a6032142b 100644
--- a/src/test/java/com/rabbitmq/examples/perf/MulticastSet.java
+++ b/src/test/java/com/rabbitmq/examples/perf/MulticastSet.java
@@ -15,19 +15,19 @@
 
 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) {
@@ -39,6 +39,20 @@ public MulticastSet(Stats stats, ConnectionFactory factory,
         this.stats = stats;
         this.factory = factory;
         this.params = params;
+        this.testID = "perftest";
+    }
+
+    public MulticastSet(Stats stats, ConnectionFactory factory,
+    		MulticastParams params, String testID) {
+    	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 = 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;