Perf improvements (#1517)

* Skip default adapters for translation layer clients (#1488) * Skip default extensions * Review comments * Unit tests * review comments * Perf tests for Skip default adapters (#1504) * Perf tests for Skip default adapters * review comments * review comments * Don't initialize trace if specifically asked not to (#1490) * Donot initialize trace if specifically asked not to * For Testhost only Initialize Tracing if --diag is passed * test fix * Tracing for datacollector also to be initialized via --diag switch * Telemetry name correction (#1512)
microsoft · Mar 28, 2018 · e48fde2 · e48fde2
1 parent b34fe13
commit e48fde2
Show file tree

Hide file tree

Showing 38 changed files with 626 additions and 238 deletions.
diff --git a/src/Microsoft.TestPlatform.Client/TestPlatform.cs b/src/Microsoft.TestPlatform.Client/TestPlatform.cs
@@ -31,7 +31,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client
     /// <summary>
     /// Implementation for TestPlatform
     /// </summary>
-    public class TestPlatform : ITestPlatform
+    internal class TestPlatform : ITestPlatform
     {
         private readonly TestRuntimeProviderManager testHostProviderManager;
 
@@ -79,11 +79,12 @@ protected TestPlatform(ITestEngine testEngine, IFileHelper filehelper, TestRunti
         /// <summary>
         /// The create discovery request.
         /// </summary>
-        /// <param name="requestData"></param>
+        /// <param name="requestData">Request data.</param>
         /// <param name="discoveryCriteria"> The discovery criteria. </param>
+        /// <param name="options">Test platform options.</param>
         /// <returns> The <see cref="IDiscoveryRequest"/>. </returns>
         /// <exception cref="ArgumentNullException"> Throws if parameter is null. </exception>
-        public IDiscoveryRequest CreateDiscoveryRequest(IRequestData requestData, DiscoveryCriteria discoveryCriteria)
+        public IDiscoveryRequest CreateDiscoveryRequest(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options)
         {
             if (discoveryCriteria == null)
             {
@@ -110,19 +111,20 @@ public IDiscoveryRequest CreateDiscoveryRequest(IRequestData requestData, Discov
             testHostManager.Initialize(TestSessionMessageLogger.Instance, discoveryCriteria.RunSettings);
 
             var discoveryManager = this.TestEngine.GetDiscoveryManager(requestData, testHostManager, discoveryCriteria);
-            discoveryManager.Initialize();
+            discoveryManager.Initialize(options?.SkipDefaultAdapters ?? false);
 
             return new DiscoveryRequest(requestData, discoveryCriteria, discoveryManager, loggerManager);
         }
 
         /// <summary>
         /// The create test run request.
         /// </summary>
+        /// <param name="requestData">Request data.</param>
         /// <param name="testRunCriteria"> The test run criteria.  </param>
-        /// <param name="protocolConfig"> Protocol related information.  </param>
+        /// <param name="options">Test platform options.</param>
         /// <returns> The <see cref="ITestRunRequest"/>. </returns>
         /// <exception cref="ArgumentNullException"> Throws if parameter is null. </exception>
-        public ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria)
+        public ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, TestPlatformOptions options)
         {
             if (testRunCriteria == null)
             {
@@ -154,7 +156,7 @@ public ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCri
             }
 
             var executionManager = this.TestEngine.GetExecutionManager(requestData, testHostManager, testRunCriteria);
-            executionManager.Initialize();
+            executionManager.Initialize(options?.SkipDefaultAdapters ?? false);
 
             return new TestRunRequest(requestData, testRunCriteria, executionManager, loggerManager);
         }

diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
@@ -93,12 +93,16 @@ internal set
         /// Gets a list of all extension paths filtered by input string.
         /// </summary>
         /// <param name="endsWithPattern">Pattern to filter extension paths.</param>
-        public List<string> GetExtensionPaths(string endsWithPattern)
+        public List<string> GetExtensionPaths(string endsWithPattern, bool skipDefaultExtensions = false)
         {
-            return this.GetFilteredExtensions(this.filterableExtensionPaths, endsWithPattern)
-                       .Concat(this.defaultExtensionPaths)
-                       .Concat(this.unfilterableExtensionPaths)
-                       .ToList();
+            var extensions = this.GetFilteredExtensions(this.filterableExtensionPaths, endsWithPattern);
+
+            if (!skipDefaultExtensions)
+            {
+                extensions = extensions.Concat(this.defaultExtensionPaths);
+            }
+
+            return extensions.Concat(this.unfilterableExtensionPaths).ToList();
         }
 
         /// <summary>
@@ -390,14 +394,14 @@ internal IList<string> GetDefaultResolutionPaths()
         /// <returns>
         /// The list of files which match the regex pattern
         /// </returns>
-        protected virtual List<string> GetFilteredExtensions(List<string> extensions, string endsWithPattern)
+        protected virtual IEnumerable<string> GetFilteredExtensions(List<string> extensions, string endsWithPattern)
         {
             if (string.IsNullOrEmpty(endsWithPattern))
             {
                 return extensions;
             }
 
-            return extensions.Where(ext => ext.EndsWith(endsWithPattern, StringComparison.OrdinalIgnoreCase)).ToList();
+            return extensions.Where(ext => ext.EndsWith(endsWithPattern, StringComparison.OrdinalIgnoreCase));
         }
 
         private static bool TryMergeExtensionPaths(List<string> extensionsList, List<string> additionalExtensions, out List<string> mergedExtensionsList)

diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs
@@ -12,8 +12,9 @@ public interface IProxyDiscoveryManager
     {
         /// <summary>
         /// Initializes test discovery. Create the test host, setup channel and initialize extensions.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        void Initialize();
+        void Initialize(bool skipDefaultAdapters);
 
         /// <summary>
         /// Discovers tests

diff --git a/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs b/src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyExecutionManager.cs
@@ -17,8 +17,9 @@ public interface IProxyExecutionManager
 
         /// <summary>
         /// Initializes test execution. Create the test host, setup channel and initialize extensions.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        void Initialize();
+        void Initialize(bool skipDefaultAdapters);
 
         /// <summary>
         /// Starts the test run.

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
@@ -72,6 +72,18 @@ public static string LogFile
             }
         }
 
+        public static bool DoNotInitailize
+        {
+            get
+            {
+                return traceImpl.DoNotInitialize;
+            }
+            set
+            {
+                traceImpl.DoNotInitialize = value;
+            }
+        }
+
         public static string ErrorOnInitialization
         {
             get;

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs
@@ -42,8 +42,9 @@ public InProcessProxyDiscoveryManager(ITestRuntimeProvider testHostManager, ITes
 
         /// <summary>
         /// Initializes test discovery.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        public void Initialize()
+        public void Initialize(bool skipDefaultAdapters)
         {
         }
 

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyexecutionManager.cs
@@ -45,8 +45,9 @@ public InProcessProxyExecutionManager(ITestRuntimeProvider testHostManager, ITes
 
         /// <summary>
         /// Initialize adapters.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        public void Initialize()
+        public void Initialize(bool skipDefaultAdapters)
         {
         }
 

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
@@ -64,9 +64,9 @@ internal ParallelProxyDiscoveryManager(IRequestData requestData, Func<IProxyDisc
         #region IProxyDiscoveryManager
 
         /// <inheritdoc/>
-        public void Initialize()
+        public void Initialize(bool skipDefaultAdapters)
         {
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(), doActionsInParallel: true);
+            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(skipDefaultAdapters), doActionsInParallel: true);
         }
 
         /// <inheritdoc/>

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyExecutionManager.cs
@@ -49,6 +49,7 @@ internal class ParallelProxyExecutionManager : ParallelOperationManager<IProxyEx
         private ParallelRunDataAggregator currentRunDataAggregator;
 
         private IRequestData requestData;
+        private bool skipDefaultAdapters;
 
         /// <inheritdoc/>
         public bool IsInitialized { get; private set; } = false;
@@ -84,9 +85,10 @@ internal ParallelProxyExecutionManager(IRequestData requestData, Func<IProxyExec
 
         #region IProxyExecutionManager
 
-        public void Initialize()
+        public void Initialize(bool skipDefaultAdapters)
         {
-            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(), doActionsInParallel: true);
+            this.skipDefaultAdapters = skipDefaultAdapters;
+            this.DoActionOnAllManagers((proxyManager) => proxyManager.Initialize(skipDefaultAdapters), doActionsInParallel: true);
             this.IsInitialized = true;
         }
 
@@ -318,7 +320,7 @@ private void StartTestRunOnConcurrentManager(IProxyExecutionManager proxyExecuti
             {
                 if (!proxyExecutionManager.IsInitialized)
                 {
-                    proxyExecutionManager.Initialize();
+                    proxyExecutionManager.Initialize(this.skipDefaultAdapters);
                 }
 
                 Task.Run(() =>

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs
@@ -31,6 +31,7 @@ public class ProxyDiscoveryManager : ProxyOperationManager, IProxyDiscoveryManag
         private bool isCommunicationEstablished;
         private IRequestData requestData;
         private ITestDiscoveryEventsHandler2 baseTestDiscoveryEventsHandler;
+        private bool skipDefaultAdapters;
 
         #region Constructors
 
@@ -81,9 +82,11 @@ internal ProxyDiscoveryManager(
 
         /// <summary>
         /// Ensure that the discovery component of engine is ready for discovery usually by loading extensions.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        public void Initialize()
+        public void Initialize(bool skipDefaultAdapters)
         {
+            this.skipDefaultAdapters = skipDefaultAdapters;
         }
 
         /// <summary>
@@ -175,7 +178,7 @@ public void HandleLogMessage(TestMessageLevel level, string message)
 
         private void InitializeExtensions(IEnumerable<string> sources)
         {
-            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern);
+            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, this.skipDefaultAdapters);
             var sourceList = sources.ToList();
             var platformExtensions = this.testHostManager.GetTestPlatformExtensions(sourceList, extensions).ToList();
 

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs
@@ -35,6 +35,7 @@ internal class ProxyExecutionManager : ProxyOperationManager, IProxyExecutionMan
         private bool isCommunicationEstablished;
         private IRequestData requestData;
         private ITestRunEventsHandler baseTestRunEventsHandler;
+        private bool skipDefaultAdapters;
 
         /// <inheritdoc/>
         public bool IsInitialized { get; private set; } = false;
@@ -77,9 +78,11 @@ internal ProxyExecutionManager(IRequestData requestData, ITestRequestSender requ
 
         /// <summary>
         /// Ensure that the Execution component of engine is ready for execution usually by loading extensions.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        public virtual void Initialize()
+        public virtual void Initialize(bool skipDefaultAdapters)
         {
+            this.skipDefaultAdapters = skipDefaultAdapters;
             this.IsInitialized = true;
         }
 
@@ -257,7 +260,7 @@ private void LogMessage(TestMessageLevel testMessageLevel, string message)
 
         private void InitializeExtensions(IEnumerable<string> sources)
         {
-            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern);
+            var extensions = TestPluginCache.Instance.GetExtensionPaths(TestPlatformConstants.TestAdapterEndsWithPattern, this.skipDefaultAdapters);
             var sourceList = sources.ToList();
             var platformExtensions = this.testHostManager.GetTestPlatformExtensions(sourceList, extensions).ToList();
 

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManagerWithDataCollection.cs
@@ -72,8 +72,9 @@ internal IProxyDataCollectionManager ProxyDataCollectionManager
 
         /// <summary>
         /// Ensure that the Execution component of engine is ready for execution usually by loading extensions.
+        /// <param name="skipDefaultAdapters">Skip default adapters flag.</param>
         /// </summary>
-        public override void Initialize()
+        public override void Initialize(bool skipDefaultAdapters)
         {
             this.ProxyDataCollectionManager.Initialize();
 
@@ -97,7 +98,7 @@ public override void Initialize()
                 throw;
             }
 
-            base.Initialize();
+            base.Initialize(skipDefaultAdapters);
         }
 
         /// <summary>

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/ITestPlatform.cs
@@ -28,15 +28,17 @@ public interface ITestPlatform : IDisposable
         /// </summary>
         /// <param name="requestData">Providing common services and data for Discovery</param>
         /// <param name="discoveryCriteria">Specifies the discovery parameters</param>
+        /// <param name="options">Test platform options.</param>
         /// <returns>DiscoveryRequest object</returns>
-        IDiscoveryRequest CreateDiscoveryRequest(IRequestData requestData, DiscoveryCriteria discoveryCriteria);
+        IDiscoveryRequest CreateDiscoveryRequest(IRequestData requestData, DiscoveryCriteria discoveryCriteria, TestPlatformOptions options);
 
         /// <summary>
         /// Creates a test run request.
         /// </summary>
         /// <param name="requestData">Providing common services and data for Execution</param>
         /// <param name="testRunCriteria">Specifies the test run criteria</param>
+        /// <param name="options">Test platform options.</param>
         /// <returns>RunRequest object</returns>
-        ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria);
+        ITestRunRequest CreateTestRunRequest(IRequestData requestData, TestRunCriteria testRunCriteria, TestPlatformOptions options);
     }
 }
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs b/src/Microsoft.TestPlatform.ObjectModel/Client/TestPlatformOptions.cs
@@ -34,5 +34,11 @@ public class TestPlatformOptions
         /// </summary>
         [DataMember]
         public bool CollectMetrics { get; set; }
+
+        /// <summary>
+        ///  Gets or sets whether default adapters should be skipped or not.
+        /// </summary>
+        [DataMember]
+        public bool SkipDefaultAdapters { get; set; }
     }
 }
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs
@@ -9,6 +9,13 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// </summary>
     public partial interface IPlatformEqtTrace
     {
+        // This is added to ensure that tracing for testhost/datacollector should not be instantiated if not enabled via --diag switch.
+        bool DoNotInitialize
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Adds the message to the trace log.
         /// The line becomes:

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs
@@ -131,7 +131,7 @@ public static string ErrorOnInitialization
         }
 
         // This is added to ensure that traceSource should not be instantiated in when creating appdomains if EqtTrace is not enabled.
-        internal static bool DoNotInitialize
+        public bool DoNotInitialize
         {
             get;
             set;
@@ -175,7 +175,7 @@ public bool InitializeVerboseTrace(string customLogFile)
         /// <inheritdoc/>
         public bool ShouldTrace(PlatformTraceLevel traceLevel)
         {
-            if (DoNotInitialize)
+            if (this.DoNotInitialize)
             {
                 return false;
             }

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs
@@ -53,7 +53,7 @@ public void SetupRemoteEqtTraceListeners(AppDomain childDomain)
                 }
                 else
                 {
-                    remoteEqtTrace.DoNotInitialize = true;
+                    this.DoNotInitialize = true;
                 }
             }
         }

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs
@@ -28,17 +28,6 @@ public TraceLevel TraceLevel
             }
         }
 
-        /// <summary>
-        /// This is added to ensure that traceSource should not be instantiated in when creating appdomains if EqtTrace is not enabled.
-        /// </summary>
-        internal bool DoNotInitialize
-        {
-            set
-            {
-                PlatformEqtTrace.DoNotInitialize = value;
-            }
-        }
-
         /// <summary>
         /// Register listeners from parent domain in current domain.
         /// </summary>

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard1.0/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard1.0/Tracing/PlatformEqtTrace.cs
@@ -23,6 +23,12 @@ public class PlatformEqtTrace : IPlatformEqtTrace
     {
         public static string ErrorOnInitialization { get; set; }
 
+        public bool DoNotInitialize
+        {
+            get => throw new NotImplementedException();
+            set => throw new NotImplementedException();
+        }
+
         public void WriteLine(PlatformTraceLevel level, string message)
         {
             throw new NotImplementedException();

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs
@@ -30,6 +30,12 @@ public class PlatformEqtTrace : IPlatformEqtTrace
 
         public static string LogFile { get; set; }
 
+        public bool DoNotInitialize
+        {
+            get;
+            set;
+        }
+
         private static PlatformTraceLevel TraceLevel { get; set; }
 
         /// <inheritdoc/>