Upgading version of jmeter and rabbit amqp library. Adding the conten…

…ts of the amqp message to the response message as it plays nicely with the summary report listener.

.gitignore

@@ -11,3 +11,5 @@ lib/
 /build/
 /dist/
 /ivy/
+*.iml
+.idea

ivy.xml

@@ -5,7 +5,7 @@
     <conf name="runtime" extends="build" description="Libraries that need to be included with project jar" />
     </configurations>
     <dependencies>
-        <dependency org="commons-lang" name="commons-lang" rev="2.4" conf="build->default"/>
+        <dependency org="org.apache.commons" name="commons-lang3" rev="3.0" conf="build->default"/>
         <dependency org="commons-io" name="commons-io" rev="1.4" conf="build->default"/>
         <dependency org="commons-jexl" name="commons-jexl" rev="1.1" conf="build->default"/>
         <dependency org="commons-codec" name="commons-codec" rev="1.4" conf="build->default"/>
@@ -15,7 +15,7 @@
         <dependency org="commons-net" name="commons-net" rev="1.4.1" conf="build->default"/>
         <dependency org="org.apache.jmeter" name="jorphan" rev="2.6" conf="build->default"/>
         <dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build->default"/>
-        <dependency org="com.rabbitmq" name="amqp-client" rev="3.0.4" conf="build->default"/>
-        <dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.9" conf="build->default"/>       
+        <dependency org="com.rabbitmq" name="amqp-client" rev="3.3.4" conf="build->default"/>
+        <dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.11" conf="build->default"/>
     </dependencies>
 </ivy-module>

src/main/com/zeroclue/jmeter/protocol/amqp/AMQPConsumer.java

@@ -57,9 +57,11 @@ public SampleResult sample(Entry entry) {
 
            // only do this once per thread. Otherwise it slows down the consumption by appx 50%
             if (consumer == null) {
+                log.info("Creating consumer");
                 consumer = new QueueingConsumer(channel);
             }
             if (consumerTag == null) {
+                log.info("Starting basic consumer");
                 consumerTag = channel.basicConsume(getQueue(), autoAck(), consumer);
             }
         } catch (Exception ex) {
@@ -90,7 +92,9 @@ public SampleResult sample(Entry entry) {
                  * Set up the sample result details
                  */
                 if (getReadResponseAsBoolean()) {
-                    result.setSamplerData(new String(delivery.getBody()));
+                    String response = new String(delivery.getBody());
+                    result.setSamplerData(response);
+                    result.setResponseMessage(response);
                 }
                 else {
                     result.setSamplerData("Read response is false.");
@@ -104,24 +108,32 @@ public SampleResult sample(Entry entry) {
             result.setDataType(SampleResult.TEXT);
 
             result.setResponseCodeOK();
-            result.setResponseMessage("OK");
+
             result.setSuccessful(true);
 
         } catch (ShutdownSignalException e) {
+            consumer = null;
+            consumerTag = null;
             log.warn("AMQP consumer failed to consume", e);
             result.setResponseCode("400");
             result.setResponseMessage(e.getMessage());
             interrupt();
         } catch (ConsumerCancelledException e) {
+            consumer = null;
+            consumerTag = null;
             log.warn("AMQP consumer failed to consume", e);
             result.setResponseCode("300");
             result.setResponseMessage(e.getMessage());
             interrupt();
         } catch (InterruptedException e) {
+            consumer = null;
+            consumerTag = null;
             log.info("interuppted while attempting to consume");
             result.setResponseCode("200");
             result.setResponseMessage(e.getMessage());
         } catch (IOException e) {
+            consumer = null;
+            consumerTag = null;
             log.warn("AMQP consumer failed to consume", e);
             result.setResponseCode("100");
             result.setResponseMessage(e.getMessage());

src/main/com/zeroclue/jmeter/protocol/amqp/AMQPPublisher.java

@@ -98,7 +98,7 @@ public SampleResult sample(Entry e) {
              * Set up the sample result details
              */
             result.setSamplerData(data);
-            result.setResponseData("OK", null);
+            result.setResponseData(new String(messageBytes), null);
             result.setDataType(SampleResult.TEXT);
 
             result.setResponseCodeOK();