Remove all old analytics defines. (#5168)

Author: surfnerd

com.unity.ml-agents/Runtime/Analytics/InferenceAnalytics.cs

@@ -44,36 +44,34 @@ internal class InferenceAnalytics
         const int k_MaxNumberOfElements = 1000;
 
 
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
         /// <summary>
         /// Models that we've already sent events for.
         /// </summary>
         private static HashSet<NNModel> s_SentModels;
+#endif
 
         static bool EnableAnalytics()
         {
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (s_EventRegistered)
             {
                 return true;
             }
 
-#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             AnalyticsResult result = EditorAnalytics.RegisterEventWithLimit(k_EventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey, k_EventVersion);
             if (result == AnalyticsResult.Ok)
             {
                 s_EventRegistered = true;
             }
-#elif MLA_UNITY_ANALYTICS_MODULE
-            AnalyticsResult result = AnalyticsResult.UnsupportedPlatform;
-            if (result == AnalyticsResult.Ok)
-            {
-                s_EventRegistered = true;
-            }
-#endif
             if (s_EventRegistered && s_SentModels == null)
             {
                 s_SentModels = new HashSet<NNModel>();
             }
 
+#else  // no editor, no analytics
+            s_EventRegistered = false;
+#endif
             return s_EventRegistered;
         }
 
@@ -108,6 +106,7 @@ public static void InferenceModelSet(
             IList<IActuator> actuators
         )
         {
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             // The event shouldn't be able to report if this is disabled but if we know we're not going to report
             // Lets early out and not waste time gathering all the data
             if (!IsAnalyticsEnabled())
@@ -127,13 +126,10 @@ IList<IActuator> actuators
             var data = GetEventForModel(nnModel, behaviorName, inferenceDevice, sensors, actionSpec, actuators);
             // Note - to debug, use JsonUtility.ToJson on the event.
             // Debug.Log(JsonUtility.ToJson(data, true));
-#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (AnalyticsUtils.s_SendEditorAnalytics)
             {
                 EditorAnalytics.SendEventWithLimit(k_EventName, data, k_EventVersion);
             }
-#else
-            return;
 #endif
         }
 

com.unity.ml-agents/Runtime/Analytics/TrainingAnalytics.cs

@@ -17,7 +17,7 @@
 
 namespace Unity.MLAgents.Analytics
 {
-    internal class TrainingAnalytics
+    internal static class TrainingAnalytics
     {
         const string k_VendorKey = "unity.ml-agents";
         const string k_TrainingEnvironmentInitializedEventName = "ml_agents_training_environment_initialized";
@@ -31,11 +31,6 @@ internal class TrainingAnalytics
             k_RemotePolicyInitializedEventName
         };
 
-        /// <summary>
-        /// Whether or not we've registered this particular event yet
-        /// </summary>
-        static bool s_EventsRegistered = false;
-
         /// <summary>
         /// Hourly limit for this event name
         /// </summary>
@@ -47,36 +42,40 @@ internal class TrainingAnalytics
         const int k_MaxNumberOfElements = 1000;
 
         private static bool s_SentEnvironmentInitialized;
+
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
+        /// <summary>
+        /// Whether or not we've registered this particular event yet
+        /// </summary>
+        static bool s_EventsRegistered = false;
+
         /// <summary>
         /// Behaviors that we've already sent events for.
         /// </summary>
         private static HashSet<string> s_SentRemotePolicyInitialized;
         private static HashSet<string> s_SentTrainingBehaviorInitialized;
+#endif
 
         private static Guid s_TrainingSessionGuid;
 
         // These are set when the RpcCommunicator connects
         private static string s_TrainerPackageVersion = "";
         private static string s_TrainerCommunicationVersion = "";
 
-        static bool EnableAnalytics()
+        internal static bool EnableAnalytics()
         {
-#if MLA_UNITY_ANALYTICS_MODULE
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (s_EventsRegistered)
             {
                 return true;
             }
             foreach (var eventName in s_EventNames)
             {
-#if UNITY_EDITOR
                 AnalyticsResult result = EditorAnalytics.RegisterEventWithLimit(eventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey);
                 if (result != AnalyticsResult.Ok)
                 {
                     return false;
                 }
-#else
-                return false;
-#endif // UNITY_EDITOR
             }
             s_EventsRegistered = true;
 
@@ -152,6 +151,7 @@ public static void RemotePolicyInitialized(
             IList<IActuator> actuators
         )
         {
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (!IsAnalyticsEnabled())
                 return;
 
@@ -173,7 +173,6 @@ IList<IActuator> actuators
             // Debug.Log(
             //     $"Would send event {k_RemotePolicyInitializedEventName} with body {JsonUtility.ToJson(data, true)}"
             // );
-#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (AnalyticsUtils.s_SendEditorAnalytics)
             {
                 EditorAnalytics.SendEventWithLimit(k_RemotePolicyInitializedEventName, data);
@@ -196,6 +195,7 @@ internal static string ParseBehaviorName(string fullyQualifiedBehaviorName)
         [Conditional("MLA_UNITY_ANALYTICS_MODULE")]
         public static void TrainingBehaviorInitialized(TrainingBehaviorInitializedEvent tbiEvent)
         {
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (!IsAnalyticsEnabled())
                 return;
 
@@ -219,13 +219,10 @@ public static void TrainingBehaviorInitialized(TrainingBehaviorInitializedEvent
             // Debug.Log(
             //     $"Would send event {k_TrainingBehaviorInitializedEventName} with body {JsonUtility.ToJson(tbiEvent, true)}"
             // );
-#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
             if (AnalyticsUtils.s_SendEditorAnalytics)
             {
                 EditorAnalytics.SendEventWithLimit(k_TrainingBehaviorInitializedEventName, tbiEvent);
             }
-#else
-            return;
 #endif
         }
 

com.unity.ml-agents/Tests/Editor/Analytics/TrainingAnalyticsTest.cs

@@ -5,6 +5,7 @@
 using Unity.MLAgents.Actuators;
 using Unity.MLAgents.Analytics;
 using Unity.MLAgents.Policies;
+using UnityEditor;
 
 namespace Unity.MLAgents.Tests.Analytics
 {
@@ -48,7 +49,6 @@ public void TestRemotePolicyEvent()
 
             Assert.AreEqual(2, remotePolicyEvent.ActuatorInfos[0].NumContinuousActions);
             Assert.AreEqual(0, remotePolicyEvent.ActuatorInfos[0].NumDiscreteActions);
-
         }
 
         [Test]
@@ -68,5 +68,16 @@ public void TestRemotePolicy()
 
             Academy.Instance.Dispose();
         }
+
+        [Test]
+        public void TestEnableAnalytics()
+        {
+#if UNITY_EDITOR && MLA_UNITY_ANALYTICS_MODULE
+            Assert.IsTrue(EditorAnalytics.enabled == TrainingAnalytics.EnableAnalytics());
+#else
+            Assert.IsFalse(TrainingAnalytics.EnableAnalytics());
+#endif
+
+        }
     }
 }