Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redirect procdump process output to diag files #2181

Merged
merged 4 commits into from
Sep 19, 2019
+77 −44
Merged

Redirect procdump process output to diag files #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a17cf44
Redirect procdump output to diag log files
vagisha-nidhi Sep 19, 2019
baeff22
Update LaunchProcess in ProcessDumpUtility
vagisha-nidhi Sep 19, 2019
ef282ca
Fixed failed UTs
vagisha-nidhi Sep 19, 2019
2c321cc
Fixed test
vagisha-nidhi Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DefaultDataCollectionLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public override int LaunchDataCollector(IDictionary<string, string> environmentV
}

var argumentsString = string.Join(" ", commandLineArguments);
var dataCollectorProcess = this.processHelper.LaunchProcess(dataCollectorProcessPath, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack);
var dataCollectorProcess = this.processHelper.LaunchProcess(dataCollectorProcessPath, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null) ;
this.DataCollectorProcessId = this.processHelper.GetProcessId(dataCollectorProcess);
return this.DataCollectorProcessId;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DotnetDataCollectionLauncher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public override int LaunchDataCollector(IDictionary<string, string> environmentV

var cliArgs = string.Join(" ", commandLineArguments);
var argumentsString = string.Format("{0} \"{1}\" {2} ", args, dataCollectorAssemblyPath, cliArgs);
var dataCollectorProcess = this.processHelper.LaunchProcess(currentProcessFileName, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack);
var dataCollectorProcess = this.processHelper.LaunchProcess(currentProcessFileName, argumentsString, Directory.GetCurrentDirectory(), environmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null);
this.DataCollectorProcessId = this.processHelper.GetProcessId(dataCollectorProcess);
return this.DataCollectorProcessId;
}
Expand Down
20 changes: 16 additions & 4 deletions src/Microsoft.TestPlatform.Extensions.BlameDataCollector/ProcessDumpUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ public ProcessDumpUtility(IProcessHelper processHelper, IFileHelper fileHelper,
this.nativeMethodsHelper = nativeMethodsHelper;
}

protected Action<object, string> OutputReceivedCallback => (process, data) =>
{
// Log all standard output message of procdump in diag files.
// Otherwise they end up coming on console in pipleine.
if (EqtTrace.IsInfoEnabled)
{
EqtTrace.Info("ProcessDumpUtility.OutputReceivedCallback: Output received from procdump process: " + data);
}
};

/// <inheritdoc/>
public string GetDumpFile()
{
Expand Down Expand Up @@ -101,7 +111,8 @@ public void StartTriggerBasedProcessDump(int processId, string dumpFileGuid, str
testResultsDirectory,
null,
null,
null) as Process;
null,
this.OutputReceivedCallback) as Process;
}

/// <inheritdoc/>
Expand All @@ -126,7 +137,8 @@ public void StartHangBasedProcessDump(int processId, string dumpFileGuid, string
testResultsDirectory,
null,
null,
null) as Process;
null,
this.OutputReceivedCallback) as Process;
}

/// <inheritdoc/>
Expand Down Expand Up @@ -171,8 +183,8 @@ private string GetProcDumpExecutable(int processId)
}
else
{
filename = this.nativeMethodsHelper.Is64Bit(this.processHelper.GetProcessHandle(processId)) ?
Constants.Procdump64Process : Constants.ProcdumpProcess;
filename = this.nativeMethodsHelper.Is64Bit(this.processHelper.GetProcessHandle(processId)) ?
Constants.Procdump64Process : Constants.ProcdumpProcess;
}

var procDumpExe = Path.Combine(procdumpPath, filename);
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/IProcessHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ public interface IProcessHelper
/// <param name="environmentVariables">Environment variables to set while bootstrapping the process.</param>
/// <param name="errorCallback">Call back for to read error stream data</param>
/// <param name="exitCallBack">Call back for on process exit</param>
/// <param name="outputCallback">Call back for on process output</param>
/// <returns>The process created.</returns>
object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> environmentVariables, Action<object, string> errorCallback, Action<object> exitCallBack);
object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> environmentVariables, Action<object, string> errorCallback, Action<object> exitCallBack, Action<object, string> outputCallback);

/// <summary>
/// Gets the current process file path.
Expand Down
15 changes: 13 additions & 2 deletions src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
using System.Diagnostics;
using System.IO;
using System.Reflection;

using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;

/// <summary>
Expand All @@ -19,7 +18,7 @@ public partial class ProcessHelper : IProcessHelper
private static readonly string ARM = "arm";

/// <inheritdoc/>
public object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> envVariables, Action<object, string> errorCallback, Action<object> exitCallBack)
public object LaunchProcess(string processPath, string arguments, string workingDirectory, IDictionary<string, string> envVariables, Action<object, string> errorCallback, Action<object> exitCallBack, Action<object, string> outputCallBack)
{
var process = new Process();
try
Expand All @@ -31,6 +30,7 @@ public object LaunchProcess(string processPath, string arguments, string working
process.StartInfo.FileName = processPath;
process.StartInfo.Arguments = arguments;
process.StartInfo.RedirectStandardError = true;

process.EnableRaisingEvents = true;

if (envVariables != null)
Expand All @@ -41,6 +41,12 @@ public object LaunchProcess(string processPath, string arguments, string working
}
}

if (outputCallBack != null)
{
process.StartInfo.RedirectStandardOutput = true;
process.OutputDataReceived += (sender, args) => outputCallBack(sender as Process, args.Data);
}

if (errorCallback != null)
{
process.ErrorDataReceived += (sender, args) => errorCallback(sender as Process, args.Data);
Expand Down Expand Up @@ -73,6 +79,11 @@ public object LaunchProcess(string processPath, string arguments, string working
{
process.BeginErrorReadLine();
}

if (outputCallBack != null)
{
process.BeginOutputReadLine();
}
}
catch (Exception)
{
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/System/ProcessHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public object LaunchProcess(
string workingDirectory,
IDictionary<string, string> environmentVariables,
Action<object, string> errorCallback,
Action<object> exitCallBack)
Action<object> exitCallBack,
Action<object, string> ouputCallBack)
{
throw new NotImplementedException();
}
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.TestPlatform.PlatformAbstractions/uap10.0/System/ProcessHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public object LaunchProcess(
string workingDirectory,
IDictionary<string, string> environmentVariables,
Action<object, string> errorCallback,
Action<object> exitCallBack)
Action<object> exitCallBack,
Action<object, string> outputCallback)
{
throw new NotImplementedException();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToke
EqtTrace.Verbose("DefaultTestHostManager: Starting process '{0}' with command line '{1}'", testHostStartInfo.FileName, testHostStartInfo.Arguments);

cancellationToken.ThrowIfCancellationRequested();
this.testHostProcess = this.processHelper.LaunchProcess(testHostStartInfo.FileName, testHostStartInfo.Arguments, testHostStartInfo.WorkingDirectory, testHostStartInfo.EnvironmentVariables, this.ErrorReceivedCallback, this.ExitCallBack) as Process;
this.testHostProcess = this.processHelper.LaunchProcess(testHostStartInfo.FileName, testHostStartInfo.Arguments, testHostStartInfo.WorkingDirectory, testHostStartInfo.EnvironmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null) as Process;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ private bool LaunchHost(TestProcessStartInfo testHostStartInfo, CancellationToke
EqtTrace.Verbose("DotnetTestHostManager: Starting process '{0}' with command line '{1}'", testHostStartInfo.FileName, testHostStartInfo.Arguments);

cancellationToken.ThrowIfCancellationRequested();
this.testHostProcess = this.processHelper.LaunchProcess(testHostStartInfo.FileName, testHostStartInfo.Arguments, testHostStartInfo.WorkingDirectory, testHostStartInfo.EnvironmentVariables, this.ErrorReceivedCallback, this.ExitCallBack) as Process;
this.testHostProcess = this.processHelper.LaunchProcess(testHostStartInfo.FileName, testHostStartInfo.Arguments, testHostStartInfo.WorkingDirectory, testHostStartInfo.EnvironmentVariables, this.ErrorReceivedCallback, this.ExitCallBack, null) as Process;
}
else
{
Expand Down
7 changes: 4 additions & 3 deletions test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyOperationManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,10 @@ private void SetUpMocksForDotNetTestHost()
It.IsAny<string>(),
It.IsAny<IDictionary<string, string>>(),
It.IsAny<Action<object, string>>(),
It.IsAny<Action<object>>()))
.Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>>(
(var1, var2, var3, dictionary, errorCallback, exitCallback) =>
It.IsAny<Action<object>>(),
It.IsAny<Action<object, string>>()))
.Callback<string, string, string, IDictionary<string, string>, Action<object, string>, Action<object>, Action<object, string>>(
(var1, var2, var3, dictionary, errorCallback, exitCallback, outputCallback) =>
{
var process = Process.GetCurrentProcess();

Expand Down
6 changes: 3 additions & 3 deletions ...estPlatform.CrossPlatEngine.UnitTests/DataCollection/DotnetDataCollectionLauncherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void LaunchDataCollectorShouldLaunchDataCollectorProcess()
List<string> arguments = new List<string>();
this.dataCollectionLauncher.LaunchDataCollector(null, arguments);

this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>()), Times.Once());
this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
}

[TestMethod]
Expand All @@ -55,7 +55,7 @@ public void LaunchDataCollectorShouldAppendDoubleQuoteForDataCollectorDllPath()
List<string> arguments = new List<string>();
this.dataCollectionLauncher.LaunchDataCollector(null, arguments);

this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), string.Format("{0} \"{1}\" {2} ", "exec", dataCollectorAssemblyPath, string.Join(" ", arguments)), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>()), Times.Once());
this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), string.Format("{0} \"{1}\" {2} ", "exec", dataCollectorAssemblyPath, string.Join(" ", arguments)), It.IsAny<string>(), It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
}

[TestMethod]
Expand All @@ -66,7 +66,7 @@ public void LaunchDataCollectorShouldLaunchDataCollectorProcessWithCurrecntWorki

string currentWorkingDirectory = Directory.GetCurrentDirectory();

this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), currentWorkingDirectory, It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>()), Times.Once());
this.mockProcessHelper.Verify(x => x.LaunchProcess(It.IsAny<string>(), It.IsAny<string>(), currentWorkingDirectory, It.IsAny<IDictionary<string, string>>(), It.IsAny<Action<object, string>>(), It.IsAny<Action<Object>>(), It.IsAny<Action<object, string>>()), Times.Once());
}
}
}
Loading