Add more debug/trace logging

- add delivery tag to inbound delivery logs
- add trace logging to channel method calls

**cherry-pick to 2.0.x, 1.7.x**

(cherry picked from commit 4fdb1e4)

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java

@@ -911,6 +911,16 @@ private final class CachedChannelInvocationHandler implements InvocationHandler
 
 		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+			if (logger.isTraceEnabled() && !method.getName().equals("toString")
+					&& !method.getName().equals("hashCode") && !method.getName().equals("equals")) {
+				try {
+					logger.trace(this.target + " channel." + method.getName() + "("
+							+ (args != null ? Arrays.toString(args) : "") + ")");
+				}
+				catch (Exception e) {
+					// empty - some mocks fail here
+				}
+			}
 			String methodName = method.getName();
 			if (methodName.equals("txSelect") && !this.transactional) {
 				throw new UnsupportedOperationException("Cannot start transaction on non-transactional channel");

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java

@@ -920,7 +920,9 @@ public void handleCancelOk(String consumerTag) {
 		public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body)
 				throws IOException {
 			if (logger.isDebugEnabled()) {
-				logger.debug("Storing delivery for " + BlockingQueueConsumer.this);
+				logger.debug("Storing delivery for consumerTag: '"
+						+ consumerTag + "' with deliveryTag: '" + envelope.getDeliveryTag() + "' in "
+						+ BlockingQueueConsumer.this);
 			}
 			try {
 				if (BlockingQueueConsumer.this.abortStarted > 0) {