Remove benchmark and CLI tests projects

The projects Frank.PulseFlow.Tests.Benchmarks and Frank.PulseFlow.Tests.Cli have been removed as they were unnecessary. Some minor refactoring has been done to the logging feature, including added support for logging scopes.
frankhaugen · Dec 31, 2023 · 1898b60 · 1898b60
1 parent b43f6d3
commit 1898b60
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 218 deletions.
diff --git a/Frank.PulseFlow.Logging/LogPulse.cs b/Frank.PulseFlow.Logging/LogPulse.cs
@@ -2,20 +2,12 @@
 
 namespace Frank.PulseFlow.Logging;
 
-public abstract class LogPulse : BasePulse
+public class LogPulse<TState> : BasePulse
 {
-    public abstract LogLevel LogLevel { get; }
-    public abstract EventId EventId { get; }
-    public abstract Exception? Exception { get; }
-    public abstract string CategoryName { get; }
-}
-public class LogPulse<TState> : LogPulse
-{
-    public override LogLevel LogLevel { get; }
-    public override EventId EventId { get; }
-    public override Exception? Exception { get; }
-    public override string CategoryName { get; }
-
+    public LogLevel LogLevel { get; }
+    public EventId EventId { get; }
+    public Exception? Exception { get; }
+    public string CategoryName { get; }
     public TState State { get; }
     public Func<TState, Exception?, string> Formatter { get; }
 

diff --git a/Frank.PulseFlow.Logging/PulseFlowLogger.cs b/Frank.PulseFlow.Logging/PulseFlowLogger.cs
@@ -39,9 +39,5 @@ public bool IsEnabled(LogLevel logLevel)
         return logLevel >= filterOptions.MinLevel;
     }
 
-    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
-    {
-        // no scope support
-        return null;
-    }
+    public IDisposable? BeginScope<TState>(TState state) where TState : notnull => new PulseFlowLoggerScope<TState>(state);
 }
diff --git a/Frank.PulseFlow.Logging/PulseFlowLoggerScope.cs b/Frank.PulseFlow.Logging/PulseFlowLoggerScope.cs
@@ -0,0 +1,10 @@
+namespace Frank.PulseFlow.Logging;
+
+public class PulseFlowLoggerScope<TState> : IDisposable
+{
+    public TState? State { get; private set; }
+
+    public PulseFlowLoggerScope(TState state) => State = state;
+
+    public void Dispose() => State = default;
+}
diff --git a/Frank.PulseFlow.Logging/ServiceCollectionExtensions.cs b/Frank.PulseFlow.Logging/ServiceCollectionExtensions.cs
@@ -1,11 +1,15 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Frank.PulseFlow.Logging;
 
 public static class LoggingBuilderExtensions
 {
+    /// <summary>
+    /// Adds PulseFlow logger provider to the logging builder.
+    /// </summary>
+    /// <param name="builder">The logging builder.</param>
+    /// <returns>The updated logging builder.</returns>
     public static ILoggingBuilder AddPulseFlow(this ILoggingBuilder builder)
     {
         builder.Services.AddSingleton<ILoggerProvider, PulseFlowLoggerProvider>();

diff --git a/Frank.PulseFlow.Tests.Benchmarks/Benchmarks.cs b/Frank.PulseFlow.Tests.Benchmarks/Benchmarks.cs
diff --git a/Frank.PulseFlow.Tests.Benchmarks/Frank.PulseFlow.Tests.Benchmarks.csproj b/Frank.PulseFlow.Tests.Benchmarks/Frank.PulseFlow.Tests.Benchmarks.csproj
diff --git a/Frank.PulseFlow.Tests.Benchmarks/Program.cs b/Frank.PulseFlow.Tests.Benchmarks/Program.cs
diff --git a/Frank.PulseFlow.Tests.Benchmarks/Shared/PersistenceService.cs b/Frank.PulseFlow.Tests.Benchmarks/Shared/PersistenceService.cs
diff --git a/Frank.PulseFlow.Tests.Benchmarks/Traditional/MyTraditionalService.cs b/Frank.PulseFlow.Tests.Benchmarks/Traditional/MyTraditionalService.cs
diff --git a/Frank.PulseFlow.Tests.Cli/Frank.PulseFlow.Tests.Cli.csproj b/Frank.PulseFlow.Tests.Cli/Frank.PulseFlow.Tests.Cli.csproj
diff --git a/Frank.PulseFlow.Tests.Cli/NotificationPulse.cs b/Frank.PulseFlow.Tests.Cli/NotificationPulse.cs
diff --git a/Frank.PulseFlow.Tests.Cli/Program.cs b/Frank.PulseFlow.Tests.Cli/Program.cs
diff --git a/Frank.PulseFlow.Tests.Cli/Properties/launchSettings.json b/Frank.PulseFlow.Tests.Cli/Properties/launchSettings.json
diff --git a/Frank.PulseFlow.Tests.Cli/TestingService.cs b/Frank.PulseFlow.Tests.Cli/TestingService.cs
diff --git a/Frank.PulseFlow.Tests.Cli/TextFlow.cs b/Frank.PulseFlow.Tests.Cli/TextFlow.cs
diff --git a/Frank.PulseFlow.Tests.Cli/TextPulse.cs b/Frank.PulseFlow.Tests.Cli/TextPulse.cs
diff --git a/Frank.PulseFlow.Tests.Cli/appsettings.Development.json b/Frank.PulseFlow.Tests.Cli/appsettings.Development.json
diff --git a/Frank.PulseFlow.Tests.Cli/appsettings.json b/Frank.PulseFlow.Tests.Cli/appsettings.json
diff --git a/Frank.PulseFlow.Tests/UnitTest1.cs → Frank.PulseFlow.Tests/PulseFlowTests.cs b/Frank.PulseFlow.Tests/UnitTest1.cs → Frank.PulseFlow.Tests/PulseFlowTests.cs
@@ -52,7 +52,6 @@ private IHostBuilder CreateHostBuilder()
                 services.AddPulseFlow(builder =>
                 {
                     builder.AddFlow<TestOutputFlow>();
-                    // builder.AddFlow<Flow2>();
                 });
 
                 services.AddHostedService<MyService>();

diff --git a/Frank.PulseFlow.sln b/Frank.PulseFlow.sln
@@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.PulseFlow", "Frank.Pu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.PulseFlow.Tests", "Frank.PulseFlow.Tests\Frank.PulseFlow.Tests.csproj", "{CDFBB79A-4D36-4C6C-865A-EC6A48EEA08E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.PulseFlow.Tests.Benchmarks", "Frank.PulseFlow.Tests.Benchmarks\Frank.PulseFlow.Tests.Benchmarks.csproj", "{31BB9094-E736-45DC-9310-386921878506}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frank.PulseFlow.Tests.Cli", "Frank.PulseFlow.Tests.Cli\Frank.PulseFlow.Tests.Cli.csproj", "{A2981338-9563-49BD-BE39-EDFD759C39D7}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0BA9824-F862-4CCF-A326-7E5AB567F9E4}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -43,14 +39,6 @@ Global
 		{CDFBB79A-4D36-4C6C-865A-EC6A48EEA08E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CDFBB79A-4D36-4C6C-865A-EC6A48EEA08E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDFBB79A-4D36-4C6C-865A-EC6A48EEA08E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31BB9094-E736-45DC-9310-386921878506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31BB9094-E736-45DC-9310-386921878506}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31BB9094-E736-45DC-9310-386921878506}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31BB9094-E736-45DC-9310-386921878506}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2981338-9563-49BD-BE39-EDFD759C39D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2981338-9563-49BD-BE39-EDFD759C39D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2981338-9563-49BD-BE39-EDFD759C39D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2981338-9563-49BD-BE39-EDFD759C39D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37DF9EE8-CDF2-430C-B407-D9546088D890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37DF9EE8-CDF2-430C-B407-D9546088D890}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37DF9EE8-CDF2-430C-B407-D9546088D890}.Release|Any CPU.ActiveCfg = Release|Any CPU