Fixed ICE-4933: Added size and replySize fields to dispatch and remote invocation metrics, support for requestId attribute

1 files changed, 12 insertions, 8 deletions

diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index baac75360df..eb2a3c3bfe7 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -312,8 +312,6 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         assert(_state > StateNotValidated);
         assert(_state < StateClosing);
 
-        out.attachRemoteObserver(initConnectionInfo(), _endpoint);
-
         //
         // Ensure the message isn't bigger than what we can send with the
         // transport.
@@ -339,6 +337,9 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
             os.writeInt(requestId);
         }
 
+        out.attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, 
+                                 os.size() - IceInternal.Protocol.headerSize - 4);
+
         //
         // Send the message. If it can't be sent without blocking the message is added
         // to _sendStreams and it will be sent by the selector thread or by this thread
@@ -388,8 +389,6 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         assert(_state > StateNotValidated);
         assert(_state < StateClosing);
 
-        out.__attachRemoteObserver(initConnectionInfo(), _endpoint);
-
         //
         // Ensure the message isn't bigger than what we can send with the
         // transport.
@@ -415,6 +414,9 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
             os.writeInt(requestId);
         }
 
+        out.__attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, 
+                                   os.size() - IceInternal.Protocol.headerSize - 4);
+
         int status;
         try
         {
@@ -707,8 +709,6 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
             throw (Ice.LocalException)_exception.fillInStackTrace();
         }
 
-        out.attachRemoteObserver(initConnectionInfo(), _endpoint);
-
         if(_batchRequestNum == 0)
         {
             out.sent(false);
@@ -721,6 +721,9 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         _batchStream.pos(IceInternal.Protocol.headerSize);
         _batchStream.writeInt(_batchRequestNum);
 
+        out.attachRemoteObserver(initConnectionInfo(), _endpoint,
+                                 _batchStream.size() - IceInternal.Protocol.headerSize - 4);
+
         _batchStream.swap(out.os());
 
         boolean sent = false;
@@ -766,8 +769,6 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
             throw (Ice.LocalException)_exception.fillInStackTrace();
         }
 
-        outAsync.__attachRemoteObserver(initConnectionInfo(), _endpoint);
-
         if(_batchRequestNum == 0)
         {
             int status = IceInternal.AsyncStatus.Sent;
@@ -784,6 +785,9 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         _batchStream.pos(IceInternal.Protocol.headerSize);
         _batchStream.writeInt(_batchRequestNum);
 
+        outAsync.__attachRemoteObserver(initConnectionInfo(), _endpoint, 0,
+                                        _batchStream.size() - IceInternal.Protocol.headerSize - 4);
+
         _batchStream.swap(outAsync.__getOs());
 
         int status;