Add process stat

Author: NikolayPianikov

CSharpInteractive.Tests/BuildMessageLogWriterTests.cs

@@ -5,10 +5,12 @@ namespace CSharpInteractive.Tests;
 
 public class BuildMessageLogWriterTests
 {
+    private static readonly ProcessInfo ProcessInfo = new(Mock.Of<IStartInfo>(), Mock.Of<IProcessMonitor>());
     private static readonly Output Output = new(Mock.Of<IStartInfo>(), false, "", 99);
     private readonly Mock<ILog<BuildMessageLogWriter>> _log = new();
     private readonly Mock<IStdOut> _stdOut = new();
     private readonly Mock<IStdErr> _stdErr = new();
+    private readonly Mock<ICommandLineStatisticsRegistry> _statisticsRegistry = new();
 
     [Fact]
     public void ShouldWriteInfo()
@@ -17,7 +19,7 @@ public void ShouldWriteInfo()
         var writer = CreateInstance();
 
         // When
-        writer.Write(new BuildMessage(Output, BuildMessageState.StdOut, default, "Abc"));
+        writer.Write(ProcessInfo, new BuildMessage(Output, BuildMessageState.StdOut, default, "Abc"));
 
         // Then
         _stdOut.Verify(i => i.WriteLine(It.Is<Text[]>(text => text.SequenceEqual(new[] {new Text("Abc")}))));
@@ -30,7 +32,7 @@ public void ShouldWriteStdErr()
         var writer = CreateInstance();
 
         // When
-        writer.Write(new BuildMessage(Output, BuildMessageState.StdError, default, "Abc"));
+        writer.Write(ProcessInfo, new BuildMessage(Output, BuildMessageState.StdError, default, "Abc"));
 
         // Then
         _stdErr.Verify(i => i.WriteLine(It.Is<Text[]>(text => text.SequenceEqual(new[] {new Text("Abc")}))));
@@ -43,9 +45,10 @@ public void ShouldWriteWarning()
         var writer = CreateInstance();
 
         // When
-        writer.Write(new BuildMessage(Output, BuildMessageState.Warning, default, "Abc"));
+        writer.Write(ProcessInfo, new BuildMessage(Output, BuildMessageState.Warning, default, "Abc"));
 
         // Then
+        _statisticsRegistry.Verify(i => i.RegisterWarning(ProcessInfo, It.IsAny<Text[]>()));
         _log.Verify(i => i.Warning(It.IsAny<Text[]>()));
     }
 
@@ -58,12 +61,16 @@ public void ShouldWriteError(BuildMessageState state)
         var writer = CreateInstance();
 
         // When
-        writer.Write(new BuildMessage(Output, state, default, "Abc"));
+        writer.Write(ProcessInfo, new BuildMessage(Output, state, default, "Abc"));
 
         // Then
+        _statisticsRegistry.Verify(i => i.RegisterError(ProcessInfo, It.IsAny<Text[]>()));
         _log.Verify(i => i.Error(ErrorId.Build, It.IsAny<Text[]>()));
     }
 
     private BuildMessageLogWriter CreateInstance() =>
-        new(_log.Object, _stdOut.Object, _stdErr.Object);
+        new(_log.Object,
+            _stdOut.Object,
+            _stdErr.Object,
+            _statisticsRegistry.Object);
 }

CSharpInteractive.Tests/BuildRunnerTests.cs

@@ -57,16 +57,16 @@ public void ShouldRunBuildWhenHasHandler(bool handled)
             .Returns(_processResult);
 
         var customHandler = Mock.Of<Action<BuildMessage>>();
-        _customBuildMessagesProcessor.Setup(i => i.ProcessMessages(output, buildMessages, customHandler))
-            .Callback<Output, IReadOnlyCollection<BuildMessage>, Action<BuildMessage>>((o, _, _) => { o.Handled = handled; });
+        _customBuildMessagesProcessor.Setup(i => i.ProcessMessages(It.IsAny<ProcessInfo>(), output, buildMessages, customHandler))
+            .Callback<ProcessInfo, Output, IReadOnlyCollection<BuildMessage>, Action<BuildMessage>>((_, o, _, _) => { o.Handled = handled; });
 
         // When
         var result = buildService.Run(_process.Object, customHandler, TimeSpan.FromSeconds(1));
 
         // Then
         output.Handled.ShouldBeTrue();
-        _customBuildMessagesProcessor.Verify(i => i.ProcessMessages(output, buildMessages, customHandler));
-        _defaultBuildMessagesProcessor.Verify(i => i.ProcessMessages(output, buildMessages, It.IsAny<Action<BuildMessage>>()), Times.Exactly(handled ? 0 : 1));
+        _customBuildMessagesProcessor.Verify(i => i.ProcessMessages(It.IsAny<ProcessInfo>(), output, buildMessages, customHandler));
+        _defaultBuildMessagesProcessor.Verify(i => i.ProcessMessages(It.IsAny<ProcessInfo>(), output, buildMessages, It.IsAny<Action<BuildMessage>>()), Times.Exactly(handled ? 0 : 1));
         _teamCityContext.VerifySet(i => i.TeamCityIntegration = true);
         _teamCityContext.VerifySet(i => i.TeamCityIntegration = false);
         _processResultHandler.Verify(i => i.Handle(_processResult, customHandler));
@@ -96,7 +96,7 @@ public void ShouldRunBuildWhenHasNoHandler()
 
         // Then
         output.Handled.ShouldBeTrue();
-        _defaultBuildMessagesProcessor.Verify(i => i.ProcessMessages(output, buildMessages, It.IsAny<Action<BuildMessage>>()));
+        _defaultBuildMessagesProcessor.Verify(i => i.ProcessMessages(It.IsAny<ProcessInfo>(), output, buildMessages, It.IsAny<Action<BuildMessage>>()));
         _teamCityContext.VerifySet(i => i.TeamCityIntegration = true);
         _teamCityContext.VerifySet(i => i.TeamCityIntegration = false);
         _processResultHandler.Verify(i => i.Handle(_processResult, default(Action<BuildMessage>)));

CSharpInteractive.Tests/CustomMessagesProcessorTests.cs

@@ -5,6 +5,7 @@ namespace CSharpInteractive.Tests;
 
 public class CustomMessagesProcessorTests
 {
+    private static readonly ProcessInfo ProcessInfo = new(Mock.Of<IStartInfo>(), Mock.Of<IProcessMonitor>());
     private static readonly Output Output = new(Mock.Of<IStartInfo>(), false, "", 99);
     private readonly Mock<IStartInfo> _startInfo = new();
 
@@ -20,7 +21,7 @@ public void ShouldProcessMessages()
         var processor = CreateInstance();
 
         // When
-        processor.ProcessMessages(output, messages, nextHandler.Object);
+        processor.ProcessMessages(ProcessInfo, output, messages, nextHandler.Object);
 
         // Then
         nextHandler.Verify(i => i(msg1));

CSharpInteractive.Tests/DefaultBuildMessagesProcessorTests.cs

@@ -6,6 +6,7 @@ namespace CSharpInteractive.Tests;
 
 public class DefaultBuildMessagesProcessorTests
 {
+    private static readonly ProcessInfo ProcessInfo = new(Mock.Of<IStartInfo>(), Mock.Of<IProcessMonitor>());
     private static readonly Output Output = new(Mock.Of<IStartInfo>(), false, "", 99);
     private readonly Mock<ICISettings> _teamCitySettings = new();
     private readonly Mock<IProcessOutputWriter> _processOutputWriter = new();
@@ -35,7 +36,7 @@ public void ShouldSendServiceMessagesToTeamCityViaProcessOutputWhenIsUnderTeamCi
         var processor = CreateInstance();
 
         // When
-        processor.ProcessMessages(output, messages, nextHandler.Object);
+        processor.ProcessMessages(ProcessInfo, output, messages, nextHandler.Object);
 
         // Then
         _processOutputWriter.Verify(i => i.Write(output), Times.Exactly(write ? 1 : 0));
@@ -55,11 +56,11 @@ public void ShouldProcessBuildMessageWhenIsNotUnderTeamCity()
         var processor = CreateInstance();
 
         // When
-        processor.ProcessMessages(output, new[] {msg1, msg2}, nextHandler.Object);
+        processor.ProcessMessages(ProcessInfo, output, new[] {msg1, msg2}, nextHandler.Object);
 
         // Then
-        _buildMessageLogWriter.Verify(i => i.Write(msg1));
-        _buildMessageLogWriter.Verify(i => i.Write(msg2));
+        _buildMessageLogWriter.Verify(i => i.Write(ProcessInfo, msg1));
+        _buildMessageLogWriter.Verify(i => i.Write(ProcessInfo, msg2));
         _processOutputWriter.Verify(i => i.Write(It.IsAny<Output>()), Times.Never);
         nextHandler.Verify(i => i(It.IsAny<BuildMessage>()), Times.Never);
     }
@@ -77,11 +78,11 @@ public void ShouldProcessBuildMessageWhenHasNotTeamCityServiceMessages()
         var processor = CreateInstance();
 
         // When
-        processor.ProcessMessages(output, new[] {msg1, msg2}, nextHandler.Object);
+        processor.ProcessMessages(ProcessInfo, output, new[] {msg1, msg2}, nextHandler.Object);
 
         // Then
-        _buildMessageLogWriter.Verify(i => i.Write(msg1));
-        _buildMessageLogWriter.Verify(i => i.Write(msg2));
+        _buildMessageLogWriter.Verify(i => i.Write(ProcessInfo, msg1));
+        _buildMessageLogWriter.Verify(i => i.Write(ProcessInfo, msg2));
         _processOutputWriter.Verify(i => i.Write(It.IsAny<Output>()), Times.Never);
         nextHandler.Verify(i => i(It.IsAny<BuildMessage>()), Times.Never);
     }

CSharpInteractive/Core/BuildMessageLogWriter.cs

@@ -7,9 +7,11 @@ namespace CSharpInteractive.Core;
 internal class BuildMessageLogWriter(
     ILog<BuildMessageLogWriter> log,
     [Tag("Default")] IStdOut stdOut,
-    [Tag("Default")] IStdErr stdErr) : IBuildMessageLogWriter
+    [Tag("Default")] IStdErr stdErr,
+    ICommandLineStatisticsRegistry statisticsRegistry)
+    : IBuildMessageLogWriter
 {
-    public void Write(BuildMessage message)
+    public void Write(ProcessInfo processInfo, BuildMessage message)
     {
         // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault
         switch (message.State)
@@ -23,12 +25,16 @@ public void Write(BuildMessage message)
                 break;
 
             case BuildMessageState.Warning:
-                log.Warning(message.Text);
+                var warning = new Text(message.Text, Color.Warning);
+                statisticsRegistry.RegisterWarning(processInfo, warning);
+                log.Warning(warning);
                 break;
 
             case BuildMessageState.Failure:
             case BuildMessageState.BuildProblem:
-                log.Error(ErrorId.Build, message.Text);
+                var error = new Text(message.Text, Color.Error);
+                statisticsRegistry.RegisterError(processInfo, error);
+                log.Error(ErrorId.Build, error);
                 break;
         }
     }

CSharpInteractive/Core/BuildRunner.cs

@@ -28,7 +28,9 @@ public IBuildResult Run(ICommandLine commandLine, Action<BuildMessage>? handler
         ArgumentNullException.ThrowIfNull(commandLine);
         var buildContext = buildContextFactory();
         var startInfo = CreateStartInfo(commandLine);
-        var processInfo = new ProcessInfo(startInfo, monitorFactory(), output => Handle(handler, output, buildContext));
+        var processInfo = new ProcessInfo(startInfo, monitorFactory());
+        var info = processInfo;
+        processInfo = processInfo.WithHandler(output => Handle(info, handler, output, buildContext));
         var processResult = processRunner.Run(processInfo, timeout);
         processResultHandler.Handle(processResult, handler);
         var buildResult = buildContext.Create(
@@ -42,7 +44,9 @@ public async Task<IBuildResult> RunAsync(ICommandLine commandLine, Action<BuildM
         ArgumentNullException.ThrowIfNull(commandLine);
         var buildContext = buildContextFactory();
         var startInfo = CreateStartInfo(commandLine);
-        var processInfo = new ProcessInfo(startInfo, monitorFactory(), output => Handle(handler, output, buildContext));
+        var processInfo = new ProcessInfo(startInfo, monitorFactory());
+        var info = processInfo;
+        processInfo = processInfo.WithHandler(output => Handle(info, handler, output, buildContext));
         var processResult = await processRunner.RunAsync(processInfo, cancellationToken);
         processResultHandler.Handle(processResult, handler);
         var buildResult = buildContext.Create(
@@ -64,17 +68,17 @@ private IStartInfo CreateStartInfo(ICommandLine commandLine)
         }
     }
 
-    private void Handle(Action<BuildMessage>? handler, Output output, IBuildContext buildContext)
+    private void Handle(ProcessInfo processInfo, Action<BuildMessage>? handler, Output output, IBuildContext buildContext)
     {
         var messages = buildOutputProcessor.Convert(output, buildContext).ToList();
         if (handler != default)
         {
-            customBuildMessagesProcessor.ProcessMessages(output, messages, handler);
+            customBuildMessagesProcessor.ProcessMessages(processInfo, output, messages, handler);
         }
 
         if (!output.Handled)
         {
-            defaultBuildMessagesProcessor.ProcessMessages(output, messages, EmptyHandler);
+            defaultBuildMessagesProcessor.ProcessMessages(processInfo, output, messages, EmptyHandler);
         }
 
         output.Handled = true;

CSharpInteractive/Core/CommandLineStatistics.cs

@@ -5,6 +5,8 @@
 internal class CommandLineStatistics : ICommandLineStatisticsRegistry, ICommandLineStatistics
 {
     private readonly List<CommandLineInfo> _info = [];
+    private readonly Dictionary<int, List<Text[]>> _warnings = [];
+    private readonly Dictionary<int, List<Text[]>> _errors = [];
 
     public bool IsEmpty => CommandLines.Count == 0;
 
@@ -26,4 +28,32 @@ public void Register(CommandLineInfo info)
             _info.Add(info);
         }
     }
+
+    public void RegisterWarning(ProcessInfo processInfo, Text[] warning)
+    {
+        lock (_info)
+        {
+            if (!_warnings.TryGetValue(processInfo.RunId, out var warnings))
+            {
+                warnings = new List<Text[]>();
+                _warnings.Add(processInfo.RunId, warnings);
+            }
+            
+            warnings.Add(warning);
+        }
+    }
+
+    public void RegisterError(ProcessInfo processInfo, Text[] error)
+    {
+        lock (_info)
+        {
+            if (!_errors.TryGetValue(processInfo.RunId, out var errors))
+            {
+                errors = new List<Text[]>();
+                _errors.Add(processInfo.RunId, errors);
+            }
+            
+            errors.Add(error);
+        }
+    }
 }

CSharpInteractive/Core/CustomMessagesProcessor.cs

@@ -5,7 +5,11 @@ namespace CSharpInteractive.Core;
 
 internal class CustomMessagesProcessor : IBuildMessagesProcessor
 {
-    public void ProcessMessages(Output output, IReadOnlyCollection<BuildMessage> messages, Action<BuildMessage> nextHandler)
+    public void ProcessMessages(
+        ProcessInfo processInfo,
+        Output output,
+        IReadOnlyCollection<BuildMessage> messages,
+        Action<BuildMessage> nextHandler)
     {
         foreach (var buildMessage in messages)
         {

CSharpInteractive/Core/DefaultBuildMessagesProcessor.cs

@@ -9,7 +9,11 @@ internal class DefaultBuildMessagesProcessor(
     IBuildMessageLogWriter buildMessageLogWriter)
     : IBuildMessagesProcessor
 {
-    public void ProcessMessages(Output output, IReadOnlyCollection<BuildMessage> messages, Action<BuildMessage> nextHandler)
+    public void ProcessMessages(
+        ProcessInfo processInfo,
+        Output output,
+        IReadOnlyCollection<BuildMessage> messages,
+        Action<BuildMessage> nextHandler)
     {
         if (ciSettings.CIType == CIType.TeamCity
             && messages.Any(i => i.State is BuildMessageState.ServiceMessage or BuildMessageState.TestResult))
@@ -20,7 +24,7 @@ public void ProcessMessages(Output output, IReadOnlyCollection<BuildMessage> mes
         {
             foreach (var buildMessage in messages)
             {
-                buildMessageLogWriter.Write(buildMessage);
+                buildMessageLogWriter.Write(processInfo, buildMessage);
             }
         }
     }

CSharpInteractive/Core/IBuildMessageLogWriter.cs

@@ -4,5 +4,5 @@ namespace CSharpInteractive.Core;
 
 internal interface IBuildMessageLogWriter
 {
-    void Write(BuildMessage message);
+    void Write(ProcessInfo processInfo, BuildMessage message);
 }

CSharpInteractive/Core/IBuildMessagesProcessor.cs

@@ -4,5 +4,9 @@ namespace CSharpInteractive.Core;
 
 internal interface IBuildMessagesProcessor
 {
-    void ProcessMessages(Output output, IReadOnlyCollection<BuildMessage> messages, Action<BuildMessage> nextHandler);
+    void ProcessMessages(
+        ProcessInfo processInfo,
+        Output output,
+        IReadOnlyCollection<BuildMessage> messages,
+        Action<BuildMessage> nextHandler);
 }

CSharpInteractive/Core/ICommandLineStatisticsRegistry.cs

@@ -3,4 +3,8 @@
 internal interface ICommandLineStatisticsRegistry
 {
     void Register(CommandLineInfo info);
+
+    void RegisterWarning(ProcessInfo processInfo, Text[] warning);
+
+    void RegisterError(ProcessInfo processInfo, Text[] error);
 }