More logging details in AMQP management

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/impl/AmqpManagement.java

@@ -174,14 +174,14 @@ public void close() {
   }
 
   void init() {
-    LOGGER.debug("Trying to initialize management.");
     if (!this.initialized.get()) {
+      LOGGER.debug("Initializing management ({}).", this);
       try {
-        LOGGER.debug("Creating management session.");
+        LOGGER.debug("Creating management session ({}).", this);
         this.session = this.connection.nativeConnection().openSession();
         String linkPairName = "management-link-pair";
         Map<String, Object> properties = Collections.singletonMap("paired", Boolean.TRUE);
-        LOGGER.debug("Creating management sender.");
+        LOGGER.debug("Creating management sender ({}).", this);
         this.sender =
             session.openSender(
                 MANAGEMENT_NODE_ADDRESS,
@@ -190,7 +190,7 @@ void init() {
                     .linkName(linkPairName)
                     .properties(properties));
 
-        LOGGER.debug("Creating management receiver.");
+        LOGGER.debug("Creating management receiver ({}).", this);
         this.receiver =
             session.openReceiver(
                 MANAGEMENT_NODE_ADDRESS,
@@ -201,9 +201,9 @@ void init() {
                     .creditWindow(100));
 
         this.sender.openFuture().get(this.rpcTimeout.toMillis(), MILLISECONDS);
-        LOGGER.debug("Management sender created.");
+        LOGGER.debug("Management sender created ({}).", this);
         this.receiver.openFuture().get(this.rpcTimeout.toMillis(), MILLISECONDS);
-        LOGGER.debug("Management receiver created.");
+        LOGGER.debug("Management receiver created ({}).", this);
         Runnable receiveTask =
             () -> {
               try {
@@ -219,21 +219,23 @@ void init() {
                         LOGGER.info("Could not find outstanding request {}", correlationId);
                       }
                     } else {
-                      LOGGER.info("Could not correlate inbound message with managemement request");
+                      LOGGER.info("Could not correlate inbound message with management request");
                     }
                   }
                 }
               } catch (ClientConnectionRemotelyClosedException
                   | ClientLinkRemotelyClosedException e) {
                 // receiver is closed
               } catch (ClientSessionRemotelyClosedException e) {
-                LOGGER.info("Management session closed in receive loop: {}", e.getMessage());
+                LOGGER.info(
+                    "Management session closed in receive loop: {} ({})", e.getMessage(), this);
                 AmqpException exception = ExceptionUtils.convert(e);
                 this.releaseResources();
                 this.failRequests(exception);
                 if (exception instanceof AmqpException.AmqpSecurityException) {
                   LOGGER.debug(
-                      "Recovering AMQP management because the failure was a security exception");
+                      "Recovering AMQP management because the failure was a security exception ({}).",
+                      this);
                   this.init();
                 }
               } catch (ClientException e) {
@@ -242,9 +244,9 @@ void init() {
                 log.accept("Error while polling AMQP receiver");
               }
             };
-        LOGGER.debug("Starting management receive loop.");
+        LOGGER.debug("Starting management receive loop ({}).", this);
         this.receiveLoop = this.connection.executorService().submit(receiveTask);
-        LOGGER.debug("Management initialized.");
+        LOGGER.debug("Management initialized ({}).", this);
         this.initialized.set(true);
       } catch (Exception e) {
         throw new AmqpException(e);

src/main/java/com/rabbitmq/client/amqp/impl/UriUtils.java

@@ -24,7 +24,7 @@
 
 abstract class UriUtils {
 
-  // based Apache HttpComponents PercentCodec
+  // based on Apache HttpComponents PercentCodec
 
   private UriUtils() {}