Added logging (#52)

* Added logging * added more logs
mvSapphire · Feb 8, 2024 · d6c9086 · d6c9086
1 parent 423e0e0
commit d6c9086
Show file tree

Hide file tree

Showing 28 changed files with 88 additions and 74 deletions.
diff --git a/samples/PowerPipe.Sample/PowerPipe.Sample.csproj b/samples/PowerPipe.Sample/PowerPipe.Sample.csproj
@@ -15,6 +15,8 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/PowerPipe.Sample/Program.cs b/samples/PowerPipe.Sample/Program.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using PowerPipe.Sample.Steps;
 
 namespace PowerPipe.Sample;
@@ -30,6 +31,13 @@ private static IServiceProvider ConfigureServices()
                 .AddScoped(typeof(SampleGenericStep<>));
         });
 
+        services.AddLogging(options =>
+        {
+            options
+                .AddConsole()
+                .SetMinimumLevel(LogLevel.Debug);
+        });
+
         services.AddSingleton<SamplePipeline>();
         var serviceProvider = services.BuildServiceProvider();
 

diff --git a/samples/PowerPipe.Sample/Steps/SampleGenericStep.cs b/samples/PowerPipe.Sample/Steps/SampleGenericStep.cs
@@ -11,7 +11,6 @@ public class SampleGenericStep<T>: IPipelineStep<SamplePipelineContext>
 
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleGenericStep<T>)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep1.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep1.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep1 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep1)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep2.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep2.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep2 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep2)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep3.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep3.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep3 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep3)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep4.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep4.cs
@@ -9,8 +9,6 @@ public class SampleParallelStep4 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep4)} Executed");
-
         throw new InvalidOperationException();
 
         // return ValueTask.CompletedTask;

diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep5.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep5.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,8 +8,6 @@ public class SampleParallelStep5 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep5)} Executed");
-
         // throw new InvalidOperationException();
 
         return ValueTask.CompletedTask;

diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep5Compensation.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep5Compensation.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep5Compensation : IPipelineCompensationStep<SampleP
 {
     public ValueTask CompensateAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep5Compensation)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep6.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep6.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep6 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep6)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleParallelStep7.cs b/samples/PowerPipe.Sample/Steps/SampleParallelStep7.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleParallelStep7 : IPipelineParallelStep<SamplePipelineContext>
 {
     public ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleParallelStep7)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep1.cs b/samples/PowerPipe.Sample/Steps/SampleStep1.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep1 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep1)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep1Compensation.cs b/samples/PowerPipe.Sample/Steps/SampleStep1Compensation.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleStep1Compensation : IPipelineCompensationStep<SamplePipelineC
 {
     public ValueTask CompensateAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep1Compensation)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep2.cs b/samples/PowerPipe.Sample/Steps/SampleStep2.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep2 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep2)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep2Compensation.cs b/samples/PowerPipe.Sample/Steps/SampleStep2Compensation.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleStep2Compensation : IPipelineCompensationStep<SamplePipelineC
 {
     public ValueTask CompensateAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep2Compensation)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep3.cs b/samples/PowerPipe.Sample/Steps/SampleStep3.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep3 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep3)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep4.cs b/samples/PowerPipe.Sample/Steps/SampleStep4.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep4 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep4)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep5.cs b/samples/PowerPipe.Sample/Steps/SampleStep5.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep5 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep5)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep6.cs b/samples/PowerPipe.Sample/Steps/SampleStep6.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,7 +9,6 @@ public class SampleStep6 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep6)} Executed");
         await NextStep.ExecuteAsync(context, cancellationToken);
     }
 }
diff --git a/samples/PowerPipe.Sample/Steps/SampleStep7.cs b/samples/PowerPipe.Sample/Steps/SampleStep7.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -10,8 +9,6 @@ public class SampleStep7 : IPipelineStep<SamplePipelineContext>
     public IPipelineStep<SamplePipelineContext> NextStep { get; set; }
     public async ValueTask ExecuteAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep7)} Executed");
-
         // throw new InvalidOperationException();
 
         await NextStep.ExecuteAsync(context, cancellationToken);

diff --git a/samples/PowerPipe.Sample/Steps/SampleStep7Compensation.cs b/samples/PowerPipe.Sample/Steps/SampleStep7Compensation.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 using PowerPipe.Interfaces;
@@ -9,7 +8,6 @@ public class SampleStep7Compensation : IPipelineCompensationStep<SamplePipelineC
 {
     public ValueTask CompensateAsync(SamplePipelineContext context, CancellationToken cancellationToken)
     {
-        Console.WriteLine($"{nameof(SampleStep7Compensation)} Executed");
         return ValueTask.CompletedTask;
     }
 }
diff --git a/...ons.MicrosoftDependencyInjection/PowerPipe.Extensions.MicrosoftDependencyInjection.csproj b/...ons.MicrosoftDependencyInjection/PowerPipe.Extensions.MicrosoftDependencyInjection.csproj
@@ -12,12 +12,12 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
-  </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    </ItemGroup>
+  
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/PowerPipe/Builder/PipelineBuilder.cs b/src/PowerPipe/Builder/PipelineBuilder.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using PowerPipe.Builder.Steps;
 using PowerPipe.Interfaces;
 
@@ -15,6 +16,7 @@ public sealed class PipelineBuilder<TContext, TResult>
     where TResult : class
 {
     private readonly IPipelineStepFactory _pipelineStepFactory;
+    private readonly ILoggerFactory _loggerFactory;
     private volatile TContext _context;
 
     internal List<InternalStep<TContext>> Steps { get; } = new();
@@ -32,6 +34,7 @@ public PipelineBuilder(IPipelineStepFactory pipelineStepFactory, TContext contex
 
         _pipelineStepFactory = pipelineStepFactory;
         _context = context;
+        _loggerFactory = pipelineStepFactory.ServiceProvider.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
     }
 
     /// <summary>
@@ -42,7 +45,7 @@ public PipelineBuilder(IPipelineStepFactory pipelineStepFactory, TContext contex
     public PipelineBuilder<TContext, TResult> Add<T>()
         where T : IStepBase<TContext>
     {
-        Steps.Add(new LazyStep<TContext>(_pipelineStepFactory.Create<T, TContext>));
+        Steps.Add(new LazyStep<TContext>(_pipelineStepFactory.Create<T, TContext>, _loggerFactory));
 
         return this;
     }
@@ -56,7 +59,9 @@ public PipelineBuilder<TContext, TResult> Add<T>()
     public PipelineBuilder<TContext, TResult> AddIf<T>(Predicate<TContext> predicate)
         where T : IStepBase<TContext>
     {
-        Steps.Add(new AddIfStep<TContext>(predicate, new LazyStep<TContext>(_pipelineStepFactory.Create<T, TContext>)));
+        Steps.Add(new AddIfStep<TContext>(
+            predicate,
+            new LazyStep<TContext>(_pipelineStepFactory.Create<T, TContext>, _loggerFactory)));
 
         return this;
     }
@@ -74,8 +79,8 @@ public PipelineBuilder<TContext, TResult> AddIfElse<TIf, TElse>(Predicate<TConte
     {
         Steps.Add(new AddIfElseStep<TContext>(
             predicate,
-            new LazyStep<TContext>(_pipelineStepFactory.Create<TIf, TContext>),
-            new LazyStep<TContext>(_pipelineStepFactory.Create<TElse, TContext>)));
+            new LazyStep<TContext>(_pipelineStepFactory.Create<TIf, TContext>, _loggerFactory),
+            new LazyStep<TContext>(_pipelineStepFactory.Create<TElse, TContext>, _loggerFactory)));
 
         return this;
     }
@@ -151,4 +156,4 @@ public IPipeline<TResult> Build()
 
         return new Pipeline<TContext, TResult>(_context, Steps);
     }
-}
+}