update

Finalizing the first round pass of gathering analytics.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Editor/Analytics.meta

@@ -0,0 +1,23 @@
+#if UNITY_EDITOR
+using System;
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    internal class AnalyticsHandler<T> : IAnalytic where T : IAnalytic.IData
+    {
+        private T m_Data;
+
+        public AnalyticsHandler(T data)
+        {
+            m_Data = data;
+        }
+        public bool TryGatherData(out IAnalytic.IData data, out Exception error)
+        {
+            data = m_Data;
+            error = null;
+            return data != null;
+        }
+    }
+}
+#endif

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

@@ -1,39 +1,45 @@
 #if UNITY_EDITOR
+using System;
 using System.Text;
 using UnityEngine;
+using UnityEngine.Analytics;
 
-namespace Unity.Netcode
+namespace Unity.Netcode.Editor
 {
-    internal struct NetworkManagerAnalytics
+    [Serializable]
+    internal struct NetworkManagerAnalytics : IAnalytic.IData
     {
         public bool IsUsingMultiplayerSDK;
         public bool UsedCMBService;
         public string NetworkTopology;
         public string NetworkTransport;
         public bool PlayerPrefabSet;
         public bool ConnectionApproval;
-        public float ClientConnectionBufferTimeout;
+        public int ClientConnectionBufferTimeout;
         public bool EnsureNetworkVariableLengthSafety;
         public bool EnableSceneManagement;
-        public float LoadSceneTimeOut;
+        public int LoadSceneTimeOut;
         public float SpawnTimeout;
         public bool ForceSamePrefabs;
         public bool RecycleNetworkIds;
         public float NetworkIdRecycleDelay;
         public int RpcHashSize;
         public bool EnableTimeResync;
-        public float TimeResyncInterval;
+        public int TimeResyncInterval;
         public int TickRate;
         public bool IsUsingMultiplayerTools;
         public bool NetworkMessageMetrics;
         public bool NetworkProfilingMetrics;
         public bool WasServer;
         public bool WasClient;
         public float SessionDuration;
-        internal void LogAnalytics(int sessionNumber)
+
+        public override string ToString()
         {
             var message = new StringBuilder();
-            message.AppendLine($"{nameof(NetworkManagerAnalytics)}-{sessionNumber} Session Duration: {SessionDuration} Sever: {WasServer} Client: {WasClient}");
+            message.AppendLine($"{nameof(WasServer)}: {WasServer}");
+            message.AppendLine($"{nameof(WasClient)}: {WasClient}");
+            message.AppendLine($"{nameof(SessionDuration)}: {SessionDuration}");
             message.AppendLine($"{nameof(IsUsingMultiplayerSDK)}: {IsUsingMultiplayerSDK}");
             message.AppendLine($"{nameof(UsedCMBService)}: {UsedCMBService}");
             message.AppendLine($"{nameof(NetworkTopology)}: {NetworkTopology}");
@@ -55,7 +61,11 @@ internal void LogAnalytics(int sessionNumber)
             message.AppendLine($"{nameof(IsUsingMultiplayerTools)}: {IsUsingMultiplayerTools}");
             message.AppendLine($"{nameof(NetworkMessageMetrics)}: {NetworkMessageMetrics}");
             message.AppendLine($"{nameof(NetworkProfilingMetrics)}: {NetworkProfilingMetrics}");
-            Debug.Log($"{message}");
+            return message.ToString();
+        }
+        internal void LogAnalytics(int sessionNumber)
+        {
+            Debug.Log($"{ToString()}");
         }
     }
 }

com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs.meta

@@ -0,0 +1,12 @@
+#if UNITY_EDITOR
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    [AnalyticInfo("NGO_NetworkManager", "unity.netcode", 3, 100, 1000)]
+    internal class NetworkManagerAnalyticsHandler : AnalyticsHandler<NetworkManagerAnalytics>
+    {
+        public NetworkManagerAnalyticsHandler(NetworkManagerAnalytics networkManagerAnalytics) : base(networkManagerAnalytics) { }
+    }
+}
+#endif

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

@@ -227,24 +227,40 @@ public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool
         }
 
         private const bool k_EnableAnalyticsLogging = true;
-
+        /// <summary>
+        /// Invoked from within <see cref="NetworkManager.ModeChanged"/> when exiting play mode.
+        /// </summary>
         public void UpdateAnalytics()
         {
+            // Exit early if analytics is disabled
             if (!EditorAnalytics.enabled)
             {
                 return;
             }
+
+            // 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 (k_EnableAnalyticsLogging)
                 {
                     networkManagerAnalytics.LogAnalytics(NetworkManager.RecentSessions[i].SessionIndex);
                 }
+
+                var result = EditorAnalytics.SendAnalytic(new NetworkManagerAnalyticsHandler(networkManagerAnalytics));
+
+                if (result != AnalyticsResult.Ok)
+                {
+                    Debug.LogWarning($"[Analytics] Problem sending analytics: {result}");
+                }
             }
         }
 
-
+        /// <summary>
+        /// Generates a <see cref="NetworkManagerAnalytics"/> based on the <see cref="NetworkManager.NetworkSessionInfo"/> passed in
+        /// </summary>
+        /// <param name="networkSession">Represents a network session with the used NetworkManager configuration</param>
+        /// <returns></returns>
         private NetworkManagerAnalytics GetNetworkManagerAnalytics(NetworkManager.NetworkSessionInfo networkSession)
         {
             var multiplayerSDKInstalled = false;

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

@@ -1061,6 +1061,12 @@ private void ModeChanged(PlayModeStateChange change)
             }
         }
 
+        /// <summary>
+        /// If analytics is enabled, this will create a new <see cref="NetworkSessionInfo"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// Invoked when NetworkManager is started.
+        /// </remarks>
         private void BeginNetworkSession()
         {
             if (!EditorAnalytics.enabled)
@@ -1080,6 +1086,12 @@ private void BeginNetworkSession()
             RecentSessions.Add(newSession);
         }
 
+        /// <summary>
+        /// If analytics is enabled, this will finalize the current <see cref="NetworkSessionInfo"/> struct.
+        /// </summary>
+        /// <remarks>
+        /// Invoked when NetworkManager is stopped or upon exiting play mode.
+        /// </remarks>
         private void EndNetworkSession()
         {
             // If analytics is disabled, then exit early
@@ -1091,6 +1103,7 @@ private void EndNetworkSession()
             {
                 var lastIndex = RecentSessions.Count - 1;
                 var recentSession = RecentSessions[lastIndex];
+                // If the session has already been finalized, then exit early.
                 if (recentSession.SessionStopped)
                 {
                     return;