Adding trace level in diag argument

src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs

@@ -146,7 +146,19 @@ public static bool IsWarningEnabled
         /// </returns>
         public static bool InitializeVerboseTrace(string customLogFile)
         {
-            if (!traceImpl.InitializeVerboseTrace(customLogFile))
+            return InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+        }
+
+        /// <summary>
+        /// Initializes the tracing with custom log file and trace level.
+        /// Overrides if any trace is set before.
+        /// </summary>
+        /// <param name="customLogFile">Custom log file for trace messages.</param>
+        /// <param name="traceLevel">Trace level.</param>
+        /// <returns>Trace initialized flag.</returns>
+        public static bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
+        {
+            if (!traceImpl.InitializeTrace(customLogFile, traceLevel))
             {
                 ErrorOnInitialization = PlatformEqtTrace.ErrorOnInitialization;
                 return false;

src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyOperationManager.cs

@@ -116,7 +116,7 @@ public virtual bool SetupChannel(IEnumerable<string> sources)
                 }
 
                 var processId = this.processHelper.GetCurrentProcessId();
-                var connectionInfo = new TestRunnerConnectionInfo { Port = portNumber, ConnectionInfo = testHostConnectionInfo, RunnerProcessId = processId, LogFile = this.GetTimestampedLogFile(EqtTrace.LogFile) };
+                var connectionInfo = new TestRunnerConnectionInfo { Port = portNumber, ConnectionInfo = testHostConnectionInfo, RunnerProcessId = processId, LogFile = this.GetTimestampedLogFile(EqtTrace.LogFile), TraceLevel = (int)EqtTrace.TraceLevel };
 
                 // Subscribe to TestHost Event
                 this.testHostManager.HostLaunched += this.TestHostManagerHostLaunched;

src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ProxyDataCollectionManager.cs

@@ -38,6 +38,7 @@ internal class ProxyDataCollectionManager : IProxyDataCollectionManager
         private const string PortOption = "--port";
         private const string DiagOption = "--diag";
         private const string ParentProcessIdOption = "--parentprocessid";
+        private const string TraceLevelOption = "--tracelevel";
         public const string DebugEnvironmentVaribleName = "VSTEST_DATACOLLECTOR_DEBUG";
 
         private IDataCollectionRequestSender dataCollectionRequestSender;
@@ -299,6 +300,9 @@ private IList<string> GetCommandLineArguments(int portNumber)
             {
                 commandlineArguments.Add(DiagOption);
                 commandlineArguments.Add(this.GetTimestampedLogFile(EqtTrace.LogFile));
+
+                commandlineArguments.Add(TraceLevelOption);
+                commandlineArguments.Add(((int)EqtTrace.TraceLevel).ToString());
             }
 
             return commandlineArguments;

src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfo.cs

@@ -98,6 +98,15 @@ public string LogFile
             set;
         }
 
+        /// <summary>
+        /// Gets or sets the trace level of logs.
+        /// </summary>
+        public int TraceLevel
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Gets or sets the runner process id.
         /// </summary>

src/Microsoft.TestPlatform.ObjectModel/ConnectionInfo/TestRunnerConnectionInfoExtensions.cs

@@ -19,6 +19,7 @@ public static string ToCommandLineOptions(this TestRunnerConnectionInfo connecti
             if (!string.IsNullOrEmpty(connectionInfo.LogFile))
             {
                 options += " --diag " + connectionInfo.LogFile;
+                options += " --tracelevel " + connectionInfo.TraceLevel;
             }
 
             return options;

src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/Tracing/IPlatformEqtTrace.cs

@@ -37,6 +37,15 @@ bool DoNotInitialize
         /// </returns>
         bool InitializeVerboseTrace(string customLogFile);
 
+        /// <summary>
+        /// Initializes the tracing with custom log file and trace level.
+        /// Overrides if any trace is set before.
+        /// </summary>
+        /// <param name="customLogFile">Customr log file for trace messages.</param>
+        /// <param name="traceLevel">Trace level.</param>
+        /// <returns>Trace initialized flag.</returns>
+        bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel);
+
         /// <summary>
         /// Gets a value indicating if tracing is enabled for a trace level.
         /// </summary>

src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs

@@ -161,12 +161,18 @@ private static TraceSource Source
 
         /// <inheritdoc/>
         public bool InitializeVerboseTrace(string customLogFile)
+        {
+            return this.InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+        }
+
+        /// <inheritdoc/>
+        public bool InitializeTrace(string customLogFile, PlatformTraceLevel platformTraceLevel)
         {
             isInitialized = false;
 
             LogFile = customLogFile;
-            TraceLevel = TraceLevel.Verbose;
-            Source.Switch.Level = SourceLevels.All;
+            TraceLevel = this.MapPlatformTraceToTrace(platformTraceLevel);
+            Source.Switch.Level = TraceSourceLevelsMap[TraceLevel];
 
             // Ensure trace is initlized
             return EnsureTraceIsInitialized();
@@ -351,7 +357,7 @@ private static bool EnsureTraceIsInitialized()
                 }
                 catch (Exception e)
                 {
-                    UnInitializeVerboseTrace();
+                    UnInitializeTrace();
                     ErrorOnInitialization = e.ToString();
                     return false;
                 }
@@ -419,7 +425,7 @@ private static int GetProcessId()
             }
         }
 
-        private static void UnInitializeVerboseTrace()
+        private static void UnInitializeTrace()
         {
             isInitialized = false;
 

src/Microsoft.TestPlatform.PlatformAbstractions/netstandard1.0/Tracing/PlatformEqtTrace.cs

@@ -39,6 +39,11 @@ public bool InitializeVerboseTrace(string customLogFile)
             throw new NotImplementedException();
         }
 
+        public bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
+        {
+            throw new NotImplementedException();
+        }
+
         public bool ShouldTrace(PlatformTraceLevel traceLevel)
         {
             throw new NotImplementedException();

src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/Tracing/PlatformEqtTrace.cs

@@ -69,6 +69,12 @@ public void WriteLine(PlatformTraceLevel level, string message)
 
         /// <inheritdoc/>
         public bool InitializeVerboseTrace(string customLogFile)
+        {
+            return this.InitializeTrace(customLogFile, PlatformTraceLevel.Verbose);
+        }
+
+        /// <inheritdoc/>
+        public bool InitializeTrace(string customLogFile, PlatformTraceLevel traceLevel)
         {
             string logFileName = string.Empty;
             try
@@ -81,7 +87,7 @@ public bool InitializeVerboseTrace(string customLogFile)
             }
 
             LogFile = Path.Combine(Path.GetTempPath(), logFileName + ".TpTrace.log");
-            TraceLevel = PlatformTraceLevel.Verbose;
+            TraceLevel = traceLevel;
 
             return this.TraceInitialized();
         }
@@ -154,7 +160,7 @@ private bool TraceInitialized()
                 }
                 catch (Exception ex)
                 {
-                    this.UnInitializeVerboseTrace();
+                    this.UnInitializeTrace();
                     ErrorOnInitialization = ex.Message;
                     return false;
                 }
@@ -163,7 +169,7 @@ private bool TraceInitialized()
             }
         }
 
-        private void UnInitializeVerboseTrace()
+        private void UnInitializeTrace()
         {
             isInitialized = false;
             LogFile = null;

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs

@@ -3,12 +3,14 @@
 
 namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
 {
+    using System;
+    using System.Diagnostics;
+    using System.IO;
+
     using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Extensions;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
-    using System;
-    using System.IO;
 
     /// <summary>
     /// Class which defines additional specifiable parameters for vstest.console.exe
@@ -35,6 +37,11 @@ public ConsoleParameters(IFileHelper fileHelper)
             this.fileHelper = fileHelper;
         }
 
+        /// <summary>
+        /// Trace level for logs.
+        /// </summary>
+        public TraceLevel TraceLevel { get; set; } = TraceLevel.Verbose;
+
         /// <summary>
         /// Full path for the log file
         /// </summary>

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj

@@ -22,7 +22,7 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj" />
     <ProjectReference Include="..\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Runtime.Serialization.Primitives">
       <Version>4.1.1</Version>
     </PackageReference>
@@ -37,6 +37,9 @@
     </PackageReference>
     <PackageReference Include="System.Diagnostics.Process">
       <Version>4.1.0</Version>
+    </PackageReference>
+	  <PackageReference Include="System.Diagnostics.TraceSource">
+      <Version>4.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs

@@ -32,7 +32,7 @@ internal class VsTestConsoleProcessManager : IProcessManager
         /// Diagnostics argument for Vstest CLI
         /// Enables Diagnostic logging for Vstest CLI and TestHost - Optional
         /// </summary>
-        private const string DIAG_ARGUMENT = "/diag:{0}";
+        private const string DIAG_ARGUMENT = "/diag:{0};tracelevel={1}";
 
         private string vstestConsolePath;
         private object syncObject = new object();
@@ -134,8 +134,8 @@ private string[] BuildArguments(ConsoleParameters parameters)
 
             if(!string.IsNullOrEmpty(parameters.LogFilePath))
             {
-                // Extra args: --diag|/diag:<PathToLogFile>
-                args.Add(string.Format(CultureInfo.InvariantCulture, DIAG_ARGUMENT, parameters.LogFilePath));
+                // Extra args: --diag|/diag:<PathToLogFile>;tracelevel=<tracelevel>
+                args.Add(string.Format(CultureInfo.InvariantCulture, DIAG_ARGUMENT, parameters.LogFilePath, parameters.TraceLevel));
             }
 
             return args.ToArray();

src/datacollector/DataCollectorMain.cs

@@ -35,6 +35,11 @@ public class DataCollectorMain
         /// </summary>
         private const string LogFileArgument = "--diag";
 
+        /// <summary>
+        /// Trace level for logs.
+        /// </summary>
+        private const string TraceLevelArgument = "--tracelevel";
+
         private IProcessHelper processHelper;
 
         private IEnvironment environment;
@@ -65,7 +70,20 @@ public void Run(string[] args)
             string logFile;
             if (argsDictionary.TryGetValue(LogFileArgument, out logFile))
             {
-                EqtTrace.InitializeVerboseTrace(logFile);
+                var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
+                var isTraceLevelArgValid = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt);
+
+                // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
+                var traceLevel = isTraceLevelArgValid ? (PlatformTraceLevel)traceLevelInt : PlatformTraceLevel.Verbose;
+
+                // Initialize trace.
+                EqtTrace.InitializeTrace(logFile, traceLevel);
+
+                // Log warning in case tracelevel passed in arg is invalid
+                if (!isTraceLevelArgValid)
+                {
+                    EqtTrace.Warning("DataCollectorMain.Run: Invalid trace level: {0}, defaulting to verbose tracelevel.", traceLevelInt);
+                }
             }
             else
             {
@@ -100,7 +118,7 @@ public void Run(string[] args)
             // Can only do this after InitializeCommunication because datacollector cannot "Send Log" unless communications are initialized
             if (!string.IsNullOrEmpty(EqtTrace.LogFile))
             {
-                ((DataCollectionRequestHandler)this.requestHandler).SendDataCollectionMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Informational, string.Format("Logging DataCollector Diagnostics in file: {0}", EqtTrace.LogFile)));
+                (this.requestHandler as DataCollectionRequestHandler)?.SendDataCollectionMessage(new DataCollectionMessageEventArgs(TestMessageLevel.Informational, string.Format("Logging DataCollector Diagnostics in file: {0}", EqtTrace.LogFile)));
             }
 
             // Start processing async in a different task

src/testhost.x86/DefaultEngineInvoker.cs

@@ -44,6 +44,8 @@ internal class DefaultEngineInvoker :
 
         private const string LogFileArgument = "--diag";
 
+        private const string TraceLevelArgument = "--tracelevel";
+
         private const string DataCollectionPortArgument = "--datacollectionport";
 
         private const string TelemetryOptedIn = "--telemetryoptedin";
@@ -228,7 +230,14 @@ private static void InitializeEqtTrace(IDictionary<string, string> argsDictionar
             // Setup logging if enabled
             if (argsDictionary.TryGetValue(LogFileArgument, out string logFile))
             {
-                EqtTrace.InitializeVerboseTrace(logFile);
+                var traceLevelInt = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, TraceLevelArgument);
+
+                // In case traceLevelInt is not defined in PlatfromTraceLevel, default it to verbose.
+                var traceLevel = Enum.IsDefined(typeof(PlatformTraceLevel), traceLevelInt) ?
+                    (PlatformTraceLevel)traceLevelInt :
+                    PlatformTraceLevel.Verbose;
+
+                EqtTrace.InitializeTrace(logFile, traceLevel);
             }
             else
             {