Improved logging for conditional pipelines. (#204)

DevJasperNL · web-flow · commit 0031fe415a1d · 2026-02-27T17:21:49.000+01:00
* Improved logging for conditional pipelines.

* Updated dependencies.
diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.When.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.When.cs
@@ -125,10 +125,10 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen<TObservable>
         if (instantiationScope == InstantiationScope.Shared)
         {
             // Note: even though InstantiationScope is primarily intended for composite pipelines, we try to stay consistent with the lifetime of the inner pipeline to avoid confusion.
-            var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false));
+            var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext($"{LogName}->Condition", LoggingEnabled ?? false));
             return When<TObservable>(_ => pipeline);
         }
-        return When<TObservable>(c => 
+        return When<TObservable>(c =>
             c.GetRequiredService<LightPipelineFactory>()
                 .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false)));
     }
@@ -139,10 +139,10 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen(IObservable<
         if (instantiationScope == InstantiationScope.Shared)
         {
             // Note: even though InstantiationScope is primarily intended for composite pipelines, we try to stay consistent with the lifetime of the inner pipeline to avoid confusion.
-            var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false));
+            var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext($"{LogName}->Condition", LoggingEnabled ?? false));
             return When(observable, _ => pipeline);
         }
-        return When(observable, c => 
+        return When(observable, c =>
             c.GetRequiredService<LightPipelineFactory>()
                 .CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false)));
     }
diff --git a/src/CodeCasa.AutomationPipelines/CodeCasa.AutomationPipelines.csproj b/src/CodeCasa.AutomationPipelines/CodeCasa.AutomationPipelines.csproj
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
     <PackageReference Include="System.Reactive" Version="6.1.0" />
   </ItemGroup>
   
diff --git a/src/CodeCasa.NetDaemon.RuntimeState/CodeCasa.NetDaemon.RuntimeState.csproj b/src/CodeCasa.NetDaemon.RuntimeState/CodeCasa.NetDaemon.RuntimeState.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
     <PackageReference Include="NetDaemon.Client" Version="26.3.0" />
     <PackageReference Include="NetDaemon.Runtime" Version="26.3.0" />
   </ItemGroup>
diff --git a/src/CodeCasa.Notifications.InputSelect.NetDaemon/CodeCasa.Notifications.InputSelect.NetDaemon.csproj b/src/CodeCasa.Notifications.InputSelect.NetDaemon/CodeCasa.Notifications.InputSelect.NetDaemon.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/tests/CodeCasa.AutomationPipelines.Lights.Tests/CodeCasa.AutomationPipelines.Lights.Tests.csproj b/tests/CodeCasa.AutomationPipelines.Lights.Tests/CodeCasa.AutomationPipelines.Lights.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
   </ItemGroup>
 
diff --git a/tests/CodeCasa.AutomationPipelines.Tests/CodeCasa.AutomationPipelines.Tests.csproj b/tests/CodeCasa.AutomationPipelines.Tests/CodeCasa.AutomationPipelines.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CodeCasa.Lights.Tests/CodeCasa.Lights.Tests.csproj b/tests/CodeCasa.Lights.Tests/CodeCasa.Lights.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/CodeCasa.NetDaemon.Extensions.Observables.Tests/CodeCasa.NetDaemon.Extensions.Observables.Tests.csproj b/tests/CodeCasa.NetDaemon.Extensions.Observables.Tests/CodeCasa.NetDaemon.Extensions.Observables.Tests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Reactive.Testing" Version="6.1.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="MSTest" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
     <PackageReference Include="System.Reactive" Version="6.1.0" />
   </ItemGroup>
 
diff --git a/tests/CodeCasa.Notifications.InputSelect.NetDaemon.Tests/CodeCasa.Notifications.InputSelect.NetDaemon.Tests.csproj b/tests/CodeCasa.Notifications.InputSelect.NetDaemon.Tests/CodeCasa.Notifications.InputSelect.NetDaemon.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="4.0.2" />
+    <PackageReference Include="MSTest" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,10 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen<TObservable>`
`125`	`125`	`if (instantiationScope == InstantiationScope.Shared)`
`126`	`126`	`{`
`127`	`127`	`// Note: even though InstantiationScope is primarily intended for composite pipelines, we try to stay consistent with the lifetime of the inner pipeline to avoid confusion.`
`128`		`- var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false));`
	`128`	`+ var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext($"{LogName}->Condition", LoggingEnabled ?? false));`
`129`	`129`	`return When<TObservable>(_ => pipeline);`
`130`	`130`	`}`
`131`		`- return When<TObservable>(c =>`
	`131`	`+ return When<TObservable>(c =>`
`132`	`132`	`c.GetRequiredService<LightPipelineFactory>()`
`133`	`133`	`.CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false)));`
`134`	`134`	`}`
`@@ -139,10 +139,10 @@ public ILightTransitionPipelineConfigurator<TLight> AddPipelineWhen(IObservable<`
`139`	`139`	`if (instantiationScope == InstantiationScope.Shared)`
`140`	`140`	`{`
`141`	`141`	`// Note: even though InstantiationScope is primarily intended for composite pipelines, we try to stay consistent with the lifetime of the inner pipeline to avoid confusion.`
`142`		`- var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false));`
	`142`	`+ var pipeline = _serviceProvider.GetRequiredService<LightPipelineFactory>().CreateLightPipeline(Light, pipelineConfigurator.SetLoggingContext($"{LogName}->Condition", LoggingEnabled ?? false));`
`143`	`143`	`return When(observable, _ => pipeline);`
`144`	`144`	`}`
`145`		`- return When(observable, c =>`
	`145`	`+ return When(observable, c =>`
`146`	`146`	`c.GetRequiredService<LightPipelineFactory>()`
`147`	`147`	`.CreateLightPipeline(c.GetRequiredService<TLight>(), pipelineConfigurator.SetLoggingContext(LogName, LoggingEnabled ?? false)));`
`148`	`148`	`}`