fix: Fix metrics reporting for Ownership Change, Spawn and Destroy bytes (#1233)

bendoyon · becksebenius-unity · web-flow · commit 9c61c51e697f · 2021-10-06T22:10:35.000Z
Co-authored-by: becksebenius-unity &lt;74328025+becksebenius-unity@users.noreply.github.com&gt;
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
@@ -181,15 +181,12 @@ internal unsafe void __sendClientRpc(FastBufferWriter writer, uint rpcMethodId,
             {
                 foreach (var client in NetworkManager.ConnectedClients)
                 {
-                    var bytesReported = NetworkManager.LocalClientId == client.Key
-                        ? 0
-                        : messageSize;
                     NetworkManager.NetworkMetrics.TrackRpcSent(
                         client.Key,
                         NetworkObjectId,
                         rpcMethodName,
                         __getTypeName(),
-                        bytesReported);
+                        messageSize);
                 }
             }
 #endif
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -536,7 +536,7 @@ private void Initialize(bool server)
 #if MULTIPLAYER_TOOLS
             NetworkSolutionInterface.SetInterface(new NetworkSolutionInterfaceParameters
             {
-                NetworkObjectProvider = new NetworkObjectProvider(this)
+                NetworkObjectProvider = new NetworkObjectProvider(this),
             });
 #endif
 
@@ -893,6 +893,7 @@ public SocketTasks StartHost()
             var socketTasks = NetworkConfig.NetworkTransport.StartServer();
             m_MessagingSystem.ClientConnected(ServerClientId);
             LocalClientId = ServerClientId;
+            NetworkMetrics.SetConnectionId(LocalClientId);
 
             IsServer = true;
             IsClient = true;
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -317,10 +317,7 @@ public void NetworkHide(ulong clientId)
                 };
                 // Send destroy call
                 var size = NetworkManager.SendMessage(message, NetworkDelivery.ReliableSequenced, clientId);
-                var bytesReported = NetworkManager.LocalClientId == clientId
-                        ? 0
-                        : size;
-                NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, NetworkObjectId, name, bytesReported);
+                NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, NetworkObjectId, name, size);
             }
         }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs
@@ -40,10 +40,7 @@ internal void InvokeUnnamedMessage(ulong clientId, FastBufferReader reader)
                     ((UnnamedMessageDelegate)handler).Invoke(clientId, reader);
                 }
             }
-            var bytesReported = m_NetworkManager.LocalClientId == clientId
-                ? 0
-                : reader.Length;
-            m_NetworkManager.NetworkMetrics.TrackUnnamedMessageReceived(clientId, bytesReported);
+            m_NetworkManager.NetworkMetrics.TrackUnnamedMessageReceived(clientId, reader.Length);
         }
 
         /// <summary>
@@ -81,9 +78,6 @@ public void SendUnnamedMessage(ulong clientId, FastBufferWriter messageBuffer, N
                 Data = messageBuffer
             };
             var size = m_NetworkManager.SendMessage(message, networkDelivery, clientId);
-            var bytesReported = m_NetworkManager.LocalClientId == clientId
-                    ? 0
-                    : size;
             m_NetworkManager.NetworkMetrics.TrackUnnamedMessageSent(clientId, size);
         }
 
@@ -199,9 +193,6 @@ public void SendNamedMessage(string messageName, ulong clientId, FastBufferWrite
                 Data = messageStream
             };
             var size = m_NetworkManager.SendMessage(message, networkDelivery, clientId);
-            var bytesReported = m_NetworkManager.LocalClientId == clientId
-                ? 0
-                : size;
             m_NetworkManager.NetworkMetrics.TrackNamedMessageSent(clientId, messageName, size);
         }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs
@@ -47,10 +47,7 @@ public void Handle(ulong senderId, NetworkManager networkManager, int messageSiz
                 networkObject.InvokeBehaviourOnGainedOwnership();
             }
 
-            var bytesReported = networkManager.LocalClientId == senderId
-                ? 0
-                : messageSize;
-            networkManager.NetworkMetrics.TrackOwnershipChangeReceived(senderId, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+            networkManager.NetworkMetrics.TrackOwnershipChangeReceived(senderId, networkObject.NetworkObjectId, networkObject.name, messageSize);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs
@@ -62,6 +62,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)
         public void Handle(FastBufferReader reader, ulong clientId, NetworkManager networkManager)
         {
             networkManager.LocalClientId = OwnerClientId;
+            networkManager.NetworkMetrics.SetConnectionId(networkManager.LocalClientId);
 
             var time = new NetworkTime(networkManager.NetworkTickSystem.TickRate, NetworkTick);
             networkManager.NetworkTimeSystem.Reset(time.Time, 0.15f); // Start with a constant RTT of 150 until we receive values from the transport.
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs
@@ -24,10 +24,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)
         public void Handle(ulong senderId, FastBufferReader reader, NetworkManager networkManager)
         {
             var networkObject = NetworkObject.AddSceneObject(ObjectInfo, reader, networkManager);
-            var bytesReported = networkManager.LocalClientId == senderId
-                ? 0
-                : reader.Length;
-            networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+            networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject.NetworkObjectId, networkObject.name, reader.Length);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs
@@ -34,10 +34,7 @@ public void Handle(ulong senderId, NetworkManager networkManager, int messageSiz
                 return;
             }
 
-            var bytesReported = networkManager.LocalClientId == senderId
-                ? 0
-                : messageSize;
-            networkManager.NetworkMetrics.TrackObjectDestroyReceived(senderId, NetworkObjectId, networkObject.name, bytesReported);
+            networkManager.NetworkMetrics.TrackObjectDestroyReceived(senderId, NetworkObjectId, networkObject.name, messageSize);
             networkManager.SpawnManager.OnDespawnObject(networkObject, true);
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
@@ -83,16 +83,13 @@ public void Serialize(FastBufferWriter writer)
                         NetworkBehaviour.NetworkVariableIndexesToReset.Add(k);
                     }
 
-                    var bytesReported = NetworkBehaviour.NetworkManager.LocalClientId == ClientId
-                        ? 0
-                        : writer.Length;
                     NetworkBehaviour.NetworkManager.NetworkMetrics.TrackNetworkVariableDeltaSent(
                         ClientId,
                         NetworkBehaviour.NetworkObjectId,
                         NetworkBehaviour.name,
                         NetworkBehaviour.NetworkVariableFields[k].Name,
                         NetworkBehaviour.__getTypeName(),
-                        bytesReported);
+                        writer.Length);
                 }
             }
         }
@@ -183,16 +180,14 @@ public void Handle(ulong senderId, FastBufferReader reader, NetworkManager netwo
                         int readStartPos = reader.Position;
 
                         behaviour.NetworkVariableFields[i].ReadDelta(reader, networkManager.IsServer);
-                        var bytesReported = networkManager.LocalClientId == senderId
-                            ? 0
-                            : reader.Length;
+
                         networkManager.NetworkMetrics.TrackNetworkVariableDeltaReceived(
                             senderId,
                             behaviour.NetworkObjectId,
                             behaviour.name,
                             behaviour.NetworkVariableFields[i].Name,
                             behaviour.__getTypeName(),
-                            bytesReported);
+                            reader.Length);
 
 
                         if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs
@@ -31,10 +31,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)
 
         public void Handle(ulong senderId, NetworkManager networkManager, int messageSize)
         {
-            var bytesReported = networkManager.LocalClientId == senderId
-                ? 0
-                : messageSize;
-            networkManager.NetworkMetrics.TrackServerLogReceived(senderId, (uint)LogType, bytesReported);
+            networkManager.NetworkMetrics.TrackServerLogReceived(senderId, (uint)LogType, messageSize);
 
             switch (LogType)
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/INetworkMetrics.cs
@@ -4,6 +4,8 @@ namespace Unity.Netcode
 {
     internal interface INetworkMetrics
     {
+        void SetConnectionId(ulong connectionId);
+
         void TrackTransportBytesSent(long bytesCount);
 
         void TrackTransportBytesReceived(long bytesCount);
@@ -52,8 +54,6 @@ void TrackNetworkVariableDeltaReceived(
 
         void TrackObjectDestroySent(ulong receiverClientId, ulong networkObjectId, string gameObjectName, long bytesCount);
 
-        void TrackObjectDestroySent(IReadOnlyCollection<ulong> receiverClientIds, ulong networkObjectId, string gameObjectName, long bytesCount);
-
         void TrackObjectDestroyReceived(ulong senderClientId, ulong networkObjectId, string gameObjectName, long bytesCount);
 
         void TrackRpcSent(
diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/MetricHooks.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/MetricHooks.cs
@@ -18,18 +18,12 @@ public void OnBeforeSendMessage(ulong clientId, Type messageType, NetworkDeliver
 
         public void OnAfterSendMessage(ulong clientId, Type messageType, NetworkDelivery delivery, int messageSizeBytes)
         {
-            var bytesReported = m_NetworkManager.LocalClientId == clientId
-                ? 0
-                : messageSizeBytes;
-            m_NetworkManager.NetworkMetrics.TrackNetworkMessageSent(clientId, messageType.Name, bytesReported);
+            m_NetworkManager.NetworkMetrics.TrackNetworkMessageSent(clientId, messageType.Name, messageSizeBytes);
         }
 
         public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes)
         {
-            var bytesReported = m_NetworkManager.LocalClientId == senderId
-                ? 0
-                : messageSizeBytes;
-            m_NetworkManager.NetworkMetrics.TrackNetworkMessageReceived(senderId, messageType.Name, bytesReported);
+            m_NetworkManager.NetworkMetrics.TrackNetworkMessageReceived(senderId, messageType.Name, messageSizeBytes);
         }
 
         public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes)
diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs
@@ -17,7 +17,7 @@ internal class NetworkMetrics : INetworkMetrics
             ShouldResetOnDispatch = true,
         };
 
-    	readonly EventMetric<NetworkMessageEvent> m_NetworkMessageSentEvent = new EventMetric<NetworkMessageEvent>(NetworkMetricTypes.NetworkMessageSent.Id);
+        readonly EventMetric<NetworkMessageEvent> m_NetworkMessageSentEvent = new EventMetric<NetworkMessageEvent>(NetworkMetricTypes.NetworkMessageSent.Id);
         readonly EventMetric<NetworkMessageEvent> m_NetworkMessageReceivedEvent = new EventMetric<NetworkMessageEvent>(NetworkMetricTypes.NetworkMessageReceived.Id);
         readonly EventMetric<NamedMessageEvent> m_NamedMessageSentEvent = new EventMetric<NamedMessageEvent>(NetworkMetricTypes.NamedMessageSent.Id);
         readonly EventMetric<NamedMessageEvent> m_NamedMessageReceivedEvent = new EventMetric<NamedMessageEvent>(NetworkMetricTypes.NamedMessageReceived.Id);
@@ -61,6 +61,11 @@ public NetworkMetrics()
 
         internal IMetricDispatcher Dispatcher { get; }
 
+        public void SetConnectionId(ulong connectionId)
+        {
+            Dispatcher.SetConnectionId(connectionId);
+        }
+
         public void TrackTransportBytesSent(long bytesCount)
         {
             m_TransportBytesSent.Increment(bytesCount);
@@ -185,14 +190,6 @@ public void TrackObjectDestroySent(ulong receiverClientId, ulong networkObjectId
             m_ObjectDestroySentEvent.Mark(new ObjectDestroyedEvent(new ConnectionInfo(receiverClientId), new NetworkObjectIdentifier(gameObjectName, networkObjectId), bytesCount));
         }
 
-        public void TrackObjectDestroySent(IReadOnlyCollection<ulong> receiverClientIds, ulong networkObjectId, string gameObjectName, long bytesCount)
-        {
-            foreach (var receiverClientId in receiverClientIds)
-            {
-                TrackObjectDestroySent(receiverClientId, networkObjectId, gameObjectName, bytesCount);
-            }
-        }
-
         public void TrackObjectDestroyReceived(ulong senderClientId, ulong networkObjectId, string gameObjectName, long bytesCount)
         {
             m_ObjectDestroyReceivedEvent.Mark(new ObjectDestroyedEvent(new ConnectionInfo(senderClientId), new NetworkObjectIdentifier(gameObjectName, networkObjectId), bytesCount));
diff --git a/com.unity.netcode.gameobjects/Runtime/Metrics/NullNetworkMetrics.cs b/com.unity.netcode.gameobjects/Runtime/Metrics/NullNetworkMetrics.cs
@@ -4,6 +4,10 @@ namespace Unity.Netcode
 {
     internal class NullNetworkMetrics : INetworkMetrics
     {
+        public void SetConnectionId(ulong connectionId)
+        {
+        }
+
         public void TrackTransportBytesSent(long bytesCount)
         {
         }
@@ -88,10 +92,6 @@ public void TrackObjectDestroySent(ulong senderClientId, ulong networkObjectId,
         {
         }
 
-        public void TrackObjectDestroySent(IReadOnlyCollection<ulong> receiverClientIds, ulong networkObjectId, string gameObjectName, long bytesCount)
-        {
-        }
-
         public void TrackObjectDestroyReceived(ulong senderClientId, ulong networkObjectId, string gameObjectName, long bytesCount)
         {
         }
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
@@ -1110,10 +1110,7 @@ private void OnServerLoadedScene(uint sceneEventId, Scene scene)
                         EventData = sceneEventData
                     };
                     var size = m_NetworkManager.SendMessage(message, k_DeliveryType, clientId);
-                    var bytesReported = m_NetworkManager.LocalClientId == clientId
-                            ? 0
-                            : size;
-                    m_NetworkManager.NetworkMetrics.TrackSceneEventSent(clientId, (uint)sceneEventData.SceneEventType, scene.name, bytesReported);
+                    m_NetworkManager.NetworkMetrics.TrackSceneEventSent(clientId, (uint)sceneEventData.SceneEventType, scene.name, size);
                 }
             }
 
@@ -1220,11 +1217,8 @@ internal void SynchronizeNetworkObjects(ulong clientId)
                 EventData = sceneEventData
             };
             var size = m_NetworkManager.SendMessage(message, k_DeliveryType, clientId);
-            var bytesReported = m_NetworkManager.LocalClientId == clientId
-                    ? 0
-                    : size;
             m_NetworkManager.NetworkMetrics.TrackSceneEventSent(
-                clientId, (uint)sceneEventData.SceneEventType, "", bytesReported);
+                clientId, (uint)sceneEventData.SceneEventType, "", size);
 
             // Notify the local server that the client has been sent the SceneEventData.SceneEventTypes.S2C_Event_Sync event
             OnSceneEvent?.Invoke(new SceneEvent()
@@ -1575,12 +1569,8 @@ internal void HandleSceneEvent(ulong clientId, FastBufferReader reader)
 
                 sceneEventData.Deserialize(reader);
 
-                var bytesReported = m_NetworkManager.LocalClientId == clientId
-                    ? 0
-                    : reader.Length;
-
                 m_NetworkManager.NetworkMetrics.TrackSceneEventReceived(
-                   clientId, (uint)sceneEventData.SceneEventType, ScenesInBuild[(int)sceneEventData.SceneIndex], bytesReported);
+                   clientId, (uint)sceneEventData.SceneEventType, ScenesInBuild[(int)sceneEventData.SceneIndex], reader.Length);
 
                 if (sceneEventData.IsSceneEventClientSide())
                 {
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -109,10 +109,7 @@ internal void RemoveOwnership(NetworkObject networkObject)
 
             foreach (var client in NetworkManager.ConnectedClients)
             {
-                var bytesReported = NetworkManager.LocalClientId == client.Key
-                      ? 0
-                      : size;
-                NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+                NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject.NetworkObjectId, networkObject.name, size);
             }
         }
 
@@ -178,10 +175,7 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId)
 
             foreach (var client in NetworkManager.ConnectedClients)
             {
-                var bytesReported = NetworkManager.LocalClientId == client.Key
-                    ? 0
-                    : size;
-                NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+                NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject.NetworkObjectId, networkObject.name, size);
             }
         }
 
@@ -422,10 +416,7 @@ internal void SendSpawnCallForObject(ulong clientId, NetworkObject networkObject
                     ObjectInfo = networkObject.GetMessageSceneObject(clientId, false)
                 };
                 var size = NetworkManager.SendMessage(message, NetworkDelivery.ReliableFragmentedSequenced, clientId);
-                var bytesReported = NetworkManager.LocalClientId == clientId
-                    ? 0
-                    : size;
-                NetworkManager.NetworkMetrics.TrackObjectSpawnSent(clientId, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+                NetworkManager.NetworkMetrics.TrackObjectSpawnSent(clientId, networkObject.NetworkObjectId, networkObject.name, size);
 
                 networkObject.MarkVariablesDirty();
             }
@@ -655,10 +646,7 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
                             var size = NetworkManager.SendMessage(message, NetworkDelivery.ReliableSequenced, m_TargetClientIds);
                             foreach (var targetClientId in m_TargetClientIds)
                             {
-                                var bytesReported = NetworkManager.LocalClientId == targetClientId
-                                    ? 0
-                                    : size;
-                                NetworkManager.NetworkMetrics.TrackObjectDestroySent(targetClientId, networkObject.NetworkObjectId, networkObject.name, bytesReported);
+                                NetworkManager.NetworkMetrics.TrackObjectDestroySent(targetClientId, networkObject.NetworkObjectId, networkObject.name, size);
                             }
                         }
                     }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/Utility/MetricTestBase.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/Utility/MetricTestBase.cs
diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json

Original file line number	Diff line number	Diff line change
`@@ -181,15 +181,12 @@ internal unsafe void __sendClientRpc(FastBufferWriter writer, uint rpcMethodId,`
`181`	`181`	`{`
`182`	`182`	`foreach (var client in NetworkManager.ConnectedClients)`
`183`	`183`	`{`
`184`		`- var bytesReported = NetworkManager.LocalClientId == client.Key`
`185`		`- ? 0`
`186`		`- : messageSize;`
`187`	`184`	`NetworkManager.NetworkMetrics.TrackRpcSent(`
`188`	`185`	`client.Key,`
`189`	`186`	`NetworkObjectId,`
`190`	`187`	`rpcMethodName,`
`191`	`188`	`__getTypeName(),`
`192`		`- bytesReported);`
	`189`	`+ messageSize);`
`193`	`190`	`}`
`194`	`191`	`}`
`195`	`192`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,7 @@ public void NetworkHide(ulong clientId)`
`317`	`317`	`};`
`318`	`318`	`// Send destroy call`
`319`	`319`	`var size = NetworkManager.SendMessage(message, NetworkDelivery.ReliableSequenced, clientId);`
`320`		`- var bytesReported = NetworkManager.LocalClientId == clientId`
`321`		`- ? 0`
`322`		`- : size;`
`323`		`- NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, NetworkObjectId, name, bytesReported);`
	`320`	`+ NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, NetworkObjectId, name, size);`
`324`	`321`	`}`
`325`	`322`	`}`
`326`	`323`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ internal void InvokeUnnamedMessage(ulong clientId, FastBufferReader reader)`
`40`	`40`	`((UnnamedMessageDelegate)handler).Invoke(clientId, reader);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`		`- var bytesReported = m_NetworkManager.LocalClientId == clientId`
`44`		`- ? 0`
`45`		`- : reader.Length;`
`46`		`- m_NetworkManager.NetworkMetrics.TrackUnnamedMessageReceived(clientId, bytesReported);`
	`43`	`+ m_NetworkManager.NetworkMetrics.TrackUnnamedMessageReceived(clientId, reader.Length);`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`/// <summary>`
`@@ -81,9 +78,6 @@ public void SendUnnamedMessage(ulong clientId, FastBufferWriter messageBuffer, N`
`81`	`78`	`Data = messageBuffer`
`82`	`79`	`};`
`83`	`80`	`var size = m_NetworkManager.SendMessage(message, networkDelivery, clientId);`
`84`		`- var bytesReported = m_NetworkManager.LocalClientId == clientId`
`85`		`- ? 0`
`86`		`- : size;`
`87`	`81`	`m_NetworkManager.NetworkMetrics.TrackUnnamedMessageSent(clientId, size);`
`88`	`82`	`}`
`89`	`83`
`@@ -199,9 +193,6 @@ public void SendNamedMessage(string messageName, ulong clientId, FastBufferWrite`
`199`	`193`	`Data = messageStream`
`200`	`194`	`};`
`201`	`195`	`var size = m_NetworkManager.SendMessage(message, networkDelivery, clientId);`
`202`		`- var bytesReported = m_NetworkManager.LocalClientId == clientId`
`203`		`- ? 0`
`204`		`- : size;`
`205`	`196`	`m_NetworkManager.NetworkMetrics.TrackNamedMessageSent(clientId, messageName, size);`
`206`	`197`	`}`
`207`	`198`
Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,7 @@ public void Handle(ulong senderId, NetworkManager networkManager, int messageSiz`
`47`	`47`	`networkObject.InvokeBehaviourOnGainedOwnership();`
`48`	`48`	`}`
`49`	`49`
`50`		`- var bytesReported = networkManager.LocalClientId == senderId`
`51`		`- ? 0`
`52`		`- : messageSize;`
`53`		`- networkManager.NetworkMetrics.TrackOwnershipChangeReceived(senderId, networkObject.NetworkObjectId, networkObject.name, bytesReported);`
	`50`	`+ networkManager.NetworkMetrics.TrackOwnershipChangeReceived(senderId, networkObject.NetworkObjectId, networkObject.name, messageSize);`
`54`	`51`	`}`
`55`	`52`	`}`
`56`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)`
`62`	`62`	`public void Handle(FastBufferReader reader, ulong clientId, NetworkManager networkManager)`
`63`	`63`	`{`
`64`	`64`	`networkManager.LocalClientId = OwnerClientId;`
	`65`	`+ networkManager.NetworkMetrics.SetConnectionId(networkManager.LocalClientId);`
`65`	`66`
`66`	`67`	`var time = new NetworkTime(networkManager.NetworkTickSystem.TickRate, NetworkTick);`
`67`	`68`	`networkManager.NetworkTimeSystem.Reset(time.Time, 0.15f); // Start with a constant RTT of 150 until we receive values from the transport.`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)`
`24`	`24`	`public void Handle(ulong senderId, FastBufferReader reader, NetworkManager networkManager)`
`25`	`25`	`{`
`26`	`26`	`var networkObject = NetworkObject.AddSceneObject(ObjectInfo, reader, networkManager);`
`27`		`- var bytesReported = networkManager.LocalClientId == senderId`
`28`		`- ? 0`
`29`		`- : reader.Length;`
`30`		`- networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject.NetworkObjectId, networkObject.name, bytesReported);`
	`27`	`+ networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject.NetworkObjectId, networkObject.name, reader.Length);`
`31`	`28`	`}`
`32`	`29`	`}`
`33`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,7 @@ public void Handle(ulong senderId, NetworkManager networkManager, int messageSiz`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- var bytesReported = networkManager.LocalClientId == senderId`
`38`		`- ? 0`
`39`		`- : messageSize;`
`40`		`- networkManager.NetworkMetrics.TrackObjectDestroyReceived(senderId, NetworkObjectId, networkObject.name, bytesReported);`
	`37`	`+ networkManager.NetworkMetrics.TrackObjectDestroyReceived(senderId, NetworkObjectId, networkObject.name, messageSize);`
`41`	`38`	`networkManager.SpawnManager.OnDespawnObject(networkObject, true);`
`42`	`39`	`}`
`43`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,7 @@ public static void Receive(FastBufferReader reader, in NetworkContext context)`
`31`	`31`
`32`	`32`	`public void Handle(ulong senderId, NetworkManager networkManager, int messageSize)`
`33`	`33`	`{`
`34`		`- var bytesReported = networkManager.LocalClientId == senderId`
`35`		`- ? 0`
`36`		`- : messageSize;`
`37`		`- networkManager.NetworkMetrics.TrackServerLogReceived(senderId, (uint)LogType, bytesReported);`
	`34`	`+ networkManager.NetworkMetrics.TrackServerLogReceived(senderId, (uint)LogType, messageSize);`
`38`	`35`
`39`	`36`	`switch (LogType)`
`40`	`37`	`{`