update

Adjusting to final first pass analytics data being gathered.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs

@@ -7,66 +7,41 @@
 namespace Unity.Netcode.Editor
 {
     [Serializable]
-    internal struct NetworkManagerAnalytics : IAnalytic.IData
+    internal struct NetworkManagerAnalytics : IAnalytic.IData, IEquatable<NetworkManagerAnalytics>
     {
-        public bool IsUsingMultiplayerSDK;
+        public bool IsDistributedAuthority;
+        public bool WasServer;
+        public bool WasClient;
         public bool UsedCMBService;
-        public string NetworkTopology;
+        public bool IsUsingMultiplayerSDK;
         public string NetworkTransport;
-        public bool PlayerPrefabSet;
-        public bool ConnectionApproval;
-        public int ClientConnectionBufferTimeout;
-        public bool EnsureNetworkVariableLengthSafety;
         public bool EnableSceneManagement;
-        public int LoadSceneTimeOut;
-        public float SpawnTimeout;
-        public bool ForceSamePrefabs;
-        public bool RecycleNetworkIds;
-        public float NetworkIdRecycleDelay;
-        public int RpcHashSize;
-        public bool EnableTimeResync;
-        public int TimeResyncInterval;
         public int TickRate;
-        public bool IsUsingMultiplayerTools;
-        public bool NetworkMessageMetrics;
-        public bool NetworkProfilingMetrics;
-        public bool WasServer;
-        public bool WasClient;
-        public float SessionDuration;
-
         public override string ToString()
         {
             var message = new StringBuilder();
+            message.AppendLine($"{nameof(IsDistributedAuthority)}: {IsDistributedAuthority}");
             message.AppendLine($"{nameof(WasServer)}: {WasServer}");
-            message.AppendLine($"{nameof(WasClient)}: {WasClient}");
-            message.AppendLine($"{nameof(SessionDuration)}: {SessionDuration}");
-            message.AppendLine($"{nameof(IsUsingMultiplayerSDK)}: {IsUsingMultiplayerSDK}");
+            message.AppendLine($"{nameof(WasClient)}: {WasClient}");            
             message.AppendLine($"{nameof(UsedCMBService)}: {UsedCMBService}");
-            message.AppendLine($"{nameof(NetworkTopology)}: {NetworkTopology}");
+            message.AppendLine($"{nameof(IsUsingMultiplayerSDK)}: {IsUsingMultiplayerSDK}");
             message.AppendLine($"{nameof(NetworkTransport)}: {NetworkTransport}");
-            message.AppendLine($"{nameof(PlayerPrefabSet)}: {PlayerPrefabSet}");
-            message.AppendLine($"{nameof(ConnectionApproval)}: {ConnectionApproval}");
-            message.AppendLine($"{nameof(ClientConnectionBufferTimeout)}: {ClientConnectionBufferTimeout}");
-            message.AppendLine($"{nameof(EnsureNetworkVariableLengthSafety)}: {EnsureNetworkVariableLengthSafety}");
             message.AppendLine($"{nameof(EnableSceneManagement)}: {EnableSceneManagement}");
-            message.AppendLine($"{nameof(LoadSceneTimeOut)}: {LoadSceneTimeOut}");
-            message.AppendLine($"{nameof(SpawnTimeout)}: {SpawnTimeout}");
-            message.AppendLine($"{nameof(ForceSamePrefabs)}: {ForceSamePrefabs}");
-            message.AppendLine($"{nameof(RecycleNetworkIds)}: {RecycleNetworkIds}");
-            message.AppendLine($"{nameof(NetworkIdRecycleDelay)}: {NetworkIdRecycleDelay}");
-            message.AppendLine($"{nameof(RpcHashSize)}: {RpcHashSize}");
-            message.AppendLine($"{nameof(EnableTimeResync)}: {EnableTimeResync}");
-            message.AppendLine($"{nameof(TimeResyncInterval)}: {TimeResyncInterval}");
             message.AppendLine($"{nameof(TickRate)}: {TickRate}");
-            message.AppendLine($"{nameof(IsUsingMultiplayerTools)}: {IsUsingMultiplayerTools}");
-            message.AppendLine($"{nameof(NetworkMessageMetrics)}: {NetworkMessageMetrics}");
-            message.AppendLine($"{nameof(NetworkProfilingMetrics)}: {NetworkProfilingMetrics}");
             return message.ToString();
         }
         internal void LogAnalytics(int sessionNumber)
         {
             Debug.Log($"{ToString()}");
         }
+
+        public bool Equals(NetworkManagerAnalytics other)
+        {
+            return IsDistributedAuthority == other.IsDistributedAuthority && WasServer == other.WasServer && WasClient == other.WasClient
+                && UsedCMBService == other.UsedCMBService && IsUsingMultiplayerSDK == other.IsUsingMultiplayerSDK
+                && EnableSceneManagement == other.EnableSceneManagement && TickRate == other.TickRate
+                && NetworkTransport.Equals(other.NetworkTransport);
+        }
     }
 }
 #endif

com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs

@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.Editor
 {
-    [AnalyticInfo("NGO_NetworkManager", "unity.netcode", 3, 100, 1000)]
+    [AnalyticInfo("NGO_NetworkManager", "unity.netcode", 5, 100, 1000)]
     internal class NetworkManagerAnalyticsHandler : AnalyticsHandler<NetworkManagerAnalytics>
     {
         public NetworkManagerAnalyticsHandler(NetworkManagerAnalytics networkManagerAnalytics) : base(networkManagerAnalytics) { }

com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs

@@ -231,25 +231,33 @@ public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool
         public void UpdateAnalytics()
         {
             // Exit early if analytics is disabled
-            if (!EditorAnalytics.enabled)
+            if (!EditorAnalytics.enabled || NetworkManager.RecentSessions.Count == 0)
             {
                 return;
             }
 
+            var previousAnalytics = new NetworkManagerAnalytics();
             // Parse through all of the recent network sessions to generate and send NetworkManager analytics
             for (int i = 0; i < NetworkManager.RecentSessions.Count; i++)
             {
                 var networkManagerAnalytics = GetNetworkManagerAnalytics(NetworkManager.RecentSessions[i]);
+
 #if ENABLE_NGO_ANALYTICS_LOGGING
                 networkManagerAnalytics.LogAnalytics(NetworkManager.RecentSessions[i].SessionIndex);
 #endif
+                // If the previous session has no changes to the configuration then skip it (only unique configurations)
+                if (previousAnalytics.Equals(networkManagerAnalytics))
+                {
+                    continue;
+                }
                 var result = EditorAnalytics.SendAnalytic(new NetworkManagerAnalyticsHandler(networkManagerAnalytics));
 #if ENABLE_NGO_ANALYTICS_LOGGING
                 if (result != AnalyticsResult.Ok)
                 {
                     Debug.LogWarning($"[Analytics] Problem sending analytics: {result}");
                 }
 #endif
+                previousAnalytics = networkManagerAnalytics;
             }
         }
 
@@ -261,45 +269,26 @@ public void UpdateAnalytics()
         private NetworkManagerAnalytics GetNetworkManagerAnalytics(NetworkManager.NetworkSessionInfo networkSession)
         {
             var multiplayerSDKInstalled = false;
-            var multiplayerToolsInstalled = false;
-            var networkMessageMetrics = false;
 #if MULTIPLAYER_SERVICES_SDK_INSTALLED
             multiplayerSDKInstalled = true;
 #endif
-#if MULTIPLAYER_TOOLS
-            multiplayerToolsInstalled = true;
-            networkMessageMetrics = networkSession.NetworkConfig.NetworkMessageMetrics;
-#endif
+#if ENABLE_NGO_ANALYTICS_LOGGING
             if (!networkSession.SessionStopped)
             {
                 Debug.LogWarning($"Session-{networkSession.SessionIndex} was not considered stopped!");
             }
+#endif
+
             var networkManagerAnalytics = new NetworkManagerAnalytics()
             {
-                NetworkTopology = networkSession.NetworkConfig.NetworkTopology.ToString(),
+                IsDistributedAuthority = networkSession.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority,
+                WasServer = networkSession.WasServer,
+                WasClient = networkSession.WasClient,
                 UsedCMBService = networkSession.UsedCMBService,
-                NetworkTransport = networkSession.Transport,
                 IsUsingMultiplayerSDK = multiplayerSDKInstalled,
-                IsUsingMultiplayerTools = multiplayerToolsInstalled,
-                PlayerPrefabSet = networkSession.PlayerPrefab,
-                ConnectionApproval = networkSession.NetworkConfig.ConnectionApproval,
-                ClientConnectionBufferTimeout = networkSession.NetworkConfig.ClientConnectionBufferTimeout,
-                EnsureNetworkVariableLengthSafety = networkSession.NetworkConfig.EnsureNetworkVariableLengthSafety,
+                NetworkTransport = networkSession.Transport,
                 EnableSceneManagement = networkSession.NetworkConfig.EnableSceneManagement,
-                LoadSceneTimeOut = networkSession.NetworkConfig.LoadSceneTimeOut,
-                SpawnTimeout = networkSession.NetworkConfig.SpawnTimeout,
-                ForceSamePrefabs = networkSession.NetworkConfig.ForceSamePrefabs,
-                RecycleNetworkIds = networkSession.NetworkConfig.RecycleNetworkIds,
-                NetworkIdRecycleDelay = networkSession.NetworkConfig.NetworkIdRecycleDelay,
-                RpcHashSize = networkSession.NetworkConfig.RpcHashSize == HashSize.VarIntFourBytes ? 4 : 8,
-                EnableTimeResync = networkSession.NetworkConfig.EnableTimeResync,
-                TimeResyncInterval = networkSession.NetworkConfig.TimeResyncInterval,
                 TickRate = (int)networkSession.NetworkConfig.TickRate,
-                NetworkMessageMetrics = networkMessageMetrics,
-                NetworkProfilingMetrics = networkSession.NetworkConfig.NetworkProfilingMetrics,
-                WasClient = networkSession.WasClient,
-                WasServer = networkSession.WasServer,
-                SessionDuration = networkSession.SessionEnd - networkSession.SessionStart,
             };
             return networkManagerAnalytics;
         }

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -918,11 +918,8 @@ internal struct NetworkSessionInfo
         {
             public int SessionIndex;
             public bool SessionStopped;
-            public bool PlayerPrefab;
             public bool WasServer;
             public bool WasClient;
-            public float SessionStart;
-            public float SessionEnd;
             public bool UsedCMBService;
             public string Transport;
             public NetworkConfig NetworkConfig;
@@ -1078,9 +1075,7 @@ private void BeginNetworkSession()
                 SessionIndex = RecentSessions.Count,
                 WasClient = IsClient,
                 WasServer = IsServer,
-                SessionStart = Time.realtimeSinceStartup,
                 NetworkConfig = NetworkConfig.Copy(),
-                PlayerPrefab = NetworkConfig.PlayerPrefab != null,
                 Transport = NetworkConfig.NetworkTransport != null ? NetworkConfig.NetworkTransport.GetType().Name : "None",
             };
             RecentSessions.Add(newSession);
@@ -1108,7 +1103,6 @@ private void EndNetworkSession()
                 {
                     return;
                 }
-                recentSession.SessionEnd = Time.realtimeSinceStartup;
                 recentSession.UsedCMBService = CMBServiceConnection;
                 recentSession.SessionStopped = true;
                 RecentSessions[lastIndex] = recentSession;