DynamoDS
diff --git a/‎extern/Analytics.NET/AdpSDKCSharpWrapper.dll
Copy file name to clipboard
288 Bytes b/‎extern/Analytics.NET/AdpSDKCSharpWrapper.dll
Copy file name to clipboard
288 Bytes
diff --git a/‎extern/Analytics.NET/Analytics.Net.ADP.dll
Copy file name to clipboard
0 Bytes b/‎extern/Analytics.NET/Analytics.Net.ADP.dll
Copy file name to clipboard
0 Bytes
diff --git a/‎src/DynamoCore/Logging/AnalyticsService.cs
Copy file name to clipboard
+31-3Lines changed: 31 additions & 3 deletions b/‎src/DynamoCore/Logging/AnalyticsService.cs
Copy file name to clipboard
+31-3Lines changed: 31 additions & 3 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+19-7Lines changed: 19 additions & 7 deletions b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+19-7Lines changed: 19 additions & 7 deletions
@@ -10,15 +10,43 @@ namespace Dynamo.Logging
     /// </summary>
     class AnalyticsService
     {
-        private static IAnalyticsUI adpAnalyticsUI = new ADPAnalyticsUI();
+        private static ADPAnalyticsUI adpAnalyticsUI = new ADPAnalyticsUI();
 
         /// <summary>
         /// Starts the client when DynamoModel is created. This method initializes
         /// the Analytics service and application life cycle start is tracked.
         /// </summary>
         /// <param name="model">DynamoModel</param>
-        internal static void Start(DynamoModel model)
+        /// <param name="disableADP">Pass true to disable ADP for the lifetime of the Dynamo or host process</param>
+        /// <param name="isHeadless">Analytics won't be started if IsHeadless, but ADP may be loaded to be disabled.</param>
+        /// <param name="isTestMode">Analytics won't be started if isTestMode, ADP will not be loaded.</param>
+        internal static void Start(DynamoModel model, bool disableADP, bool isHeadless, bool isTestMode)
         {
+            if (isTestMode)
+            {
+                if (disableADP)
+                {
+                    model.Logger.Log("Incompatible configuration: [IsTestMode] and [ADP disabled] ");
+                }
+                return;
+            }
+            if (disableADP)
+            {
+                //if this returns false something has gone wrong.
+                //the client requested ADP be disabled, but we cannot disable it.
+                if (!adpAnalyticsUI.DisableADPForProcessLifetime())
+                {
+                    model.Logger.LogNotification("Dynamo",
+                        "Dynamo Startup Error",
+                        "Analytics could not be disabled",
+                        "Dynamo was started with configuration requesting ADP be disabled - but ADP could not be disabled.");
+                }
+            }
+
+            if (isHeadless)
+            {
+                return;
+            }
             var client = new DynamoAnalyticsClient(model);
             Analytics.Start(client);
             model.WorkspaceAdded += OnWorkspaceAdded;
@@ -35,7 +63,7 @@ static void OnWorkspaceAdded(WorkspaceModel obj)
         /// <summary>
         /// Indicates whether the user has opted-in to ADP analytics.
         /// </summary>
-        internal static bool IsADPOptedIn 
+        internal static bool IsADPOptedIn
         {
             get
             {
 
@@ -451,7 +451,7 @@ public IEnumerable<WorkspaceModel> Workspaces
         public AuthenticationManager AuthenticationManager { get; set; }
 
         internal static string DefaultPythonEngine { get; private set; }
-
+        private bool disableADP;
         #endregion
 
         #region initialization and disposal
@@ -555,6 +555,10 @@ public struct DefaultStartConfiguration : IStartConfiguration
             /// Default Python script engine
             /// </summary>
             public string DefaultPythonEngine { get; set; }
+            /// <summary>
+            /// Disables ADP for the entire process for the lifetime of the process.
+            /// </summary>
+            public bool DisableADP { get; set; }
         }
 
         /// <summary>
@@ -586,11 +590,13 @@ public static DynamoModel Start(IStartConfiguration configuration)
         /// <param name="config">Start configuration</param>
         protected DynamoModel(IStartConfiguration config)
         {
-            if (config is DefaultStartConfiguration)
+            if (config is DefaultStartConfiguration defaultStartConfig)
             {
                 // This is not exposed in IStartConfiguration to avoid a breaking change.
                 // TODO: This fact should probably be revisited in 3.0.
-                DefaultPythonEngine = ((DefaultStartConfiguration)config).DefaultPythonEngine;
+                DefaultPythonEngine = defaultStartConfig.DefaultPythonEngine;
+                disableADP = defaultStartConfig.DisableADP;
+
             }
 
             ClipBoard = new ObservableCollection<ModelBase>();
@@ -668,6 +674,15 @@ protected DynamoModel(IStartConfiguration config)
             {
                 // Do nothing for now
             }
+
+            // these configuration options are incompatible, one requires loading ADP binaries
+            // the other depends on not loading those same binaries.
+
+            if (areAnalyticsDisabledFromConfig && disableADP)
+            {
+                throw new ConfigurationErrorsException("Incompatible configuration: could not start Dynamo with both [Analytics disabled] and [ADP disabled] config options enabled");
+            }
+
             // If user skipped analytics from assembly config, do not try to launch the analytics client
             if (!areAnalyticsDisabledFromConfig)
             {
@@ -1426,10 +1441,7 @@ private void LoadNodeModels(List<TypeLoadData> nodes, bool isPackageMember)
 
         private void InitializeAnalyticsService()
         {
-            if (!IsTestMode && !IsHeadless)
-            {
-                AnalyticsService.Start(this);
-            }
+           AnalyticsService.Start(this,disableADP, IsHeadless, IsTestMode);
         }
 
         private IPreferences CreateOrLoadPreferences(IPreferences preferences)