Target Propulsion 2.11.0 (#101)

Author: bartelink

CHANGELOG.md

@@ -17,6 +17,8 @@ The `Unreleased` section name is replaced by the expected version of next releas
 
 - Added defaulting of 1 min for lag reporting frequency to all Cosmos consumers [#95](https://github.com/jet/dotnet-templates/pull/95)
 - `eqxPatterns`: replace best effort deduplication pattern with exactly-once ingestion [#94](https://github.com/jet/dotnet-templates/pull/94)
+- Target `Propulsion` v `2.11.0`, `Equinox` v `3.0.4` [#101](https://github.com/jet/dotnet-templates/pull/101)
+- Target `Destructurama.FSharp` v `1.2.0`, `Serilog.Sinks.Async` v `1.5.0`, `Serilog.Sinks.Console` v `4.0.0` [#101](https://github.com/jet/dotnet-templates/pull/101)
 
 ### Removed
 ### Fixed

README.md

@@ -36,7 +36,7 @@ The following templates focus specifically on the usage of `Propulsion` componen
 - [`proConsumer`](propulsion-consumer/README.md) - Boilerplate for an Apache Kafka Consumer using [`Propulsion.Kafka`](https://github.com/jet/propulsion) (typically consuming from an app produced with `dotnet new proProjector -k`).
 
 - [`periodicIngester`](periodic-ingester/) - Boilerplate for a service that regularly walks the content of a source, feeding it into a propulsion projector in order to manage the ingestion process using [`Propulsion.Feed.PeriodicSource`](https://github.com/jet/propulsion)
-- 
+ 
 ## Producer/Reactor Templates combining usage of Equinox and Propulsion
 
 The bulk of the remaining templates have a consumer aspect, and hence involve usage of `Propulsion`.
@@ -326,7 +326,7 @@ The `run` function formalizes the overall pattern. It is responsible for:
 ```
 let run args = async {
     use consumer = start args
-    return! consumer.AwaitCompletion()
+    return! consumer.AwaitWithStopOnCancellation()
 }
 
 [<EntryPoint>]

equinox-patterns/Domain/Domain.fsproj

@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Equinox.MemoryStore" Version="3.0.1" />
-    <PackageReference Include="Equinox.CosmosStore" Version="3.0.1" />
+    <PackageReference Include="Equinox.MemoryStore" Version="3.0.4" />
+    <PackageReference Include="Equinox.CosmosStore" Version="3.0.4" />
     <PackageReference Include="FsCodec.NewtonsoftJson" Version="2.0.1" />
   </ItemGroup>
-    
+
 </Project>

equinox-patterns/Domain/Types.fs

@@ -29,7 +29,6 @@ module ListEpochId =
 
 /// Identifies an Item stored within an Epoch
 /// TODO replace `Item` with a Domain term referencing the specific element being managed
-
 type ItemId = string<itemId>
 and [<Measure>] itemId
 module ItemId =

equinox-shipping/Domain.Tests/Domain.Tests.fsproj

@@ -19,7 +19,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 
-        <PackageReference Include="Equinox.MemoryStore" Version="3.0.1" />
+        <PackageReference Include="Equinox.MemoryStore" Version="3.0.4" />
         <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
         <PackageReference Include="unquote" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

equinox-shipping/Domain/Domain.fsproj

@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Equinox.CosmosStore" Version="3.0.1" />
+      <PackageReference Include="Equinox.CosmosStore" Version="3.0.4" />
     </ItemGroup>
 
 </Project>

equinox-shipping/Watchdog.Integration/PropulsionInfrastructure.fs

@@ -46,7 +46,7 @@ type MemoryStoreProjector<'F, 'B> private (log, inner : Propulsion.ProjectorPipe
         Observable.subscribe this.Submit source
 
     /// Waits until all <c>Submit</c>ted batches have been fed into the <c>inner</c> Projector
-    member _.AwaitCompletion
+    member _.AwaitWithStopOnCancellation
         (   /// sleep time while awaiting completion
             ?delay,
             /// interval at which to log progress of Projector loop
@@ -72,7 +72,7 @@ type MemoryStoreProjector<'F, 'B> private (log, inner : Propulsion.ProjectorPipe
         inner.Stop()
         // trigger termination of GetConsumingEnumerable()-driven pumping loop
         queue.CompleteAdding()
-        return! inner.AwaitCompletion()
+        return! inner.AwaitWithStopOnCancellation()
     }
 
 type TestOutputAdapter(testOutput : Xunit.Abstractions.ITestOutputHelper) =

equinox-shipping/Watchdog.Integration/Watchdog.Integration.fsproj

@@ -17,7 +17,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
 
-        <PackageReference Include="Equinox.MemoryStore" Version="3.0.1" />
+        <PackageReference Include="Equinox.MemoryStore" Version="3.0.4" />
         <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
         <PackageReference Include="unquote" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

equinox-shipping/Watchdog.Integration/WatchdogIntegrationTests.fs

@@ -34,7 +34,7 @@ type WatchdogIntegrationTests(output) =
                 with :? TimeoutException -> timeouts <- timeouts + 1
 
             log.Information("Awaiting batches: {counts} ({timeouts}/{total} timeouts)", counts, timeouts, counts.Count)
-            do! projector.AwaitCompletion()
+            do! projector.AwaitWithStopOnCancellation()
             stats.DumpStats()
         }
 

equinox-shipping/Watchdog/Infrastructure.fs

@@ -40,24 +40,14 @@ module CosmosStoreContext =
         let maxEvents = 256
         Equinox.CosmosStore.CosmosStoreContext(storeClient, tipMaxEvents=maxEvents)
 
-[<System.Runtime.CompilerServices.Extension>]
-type LoggerConfigurationExtensions() =
-
-    [<System.Runtime.CompilerServices.Extension>]
-    static member inline ConfigureChangeFeedProcessorLogging(c : LoggerConfiguration, verbose : bool) =
-        let cfpl = if verbose then Serilog.Events.LogEventLevel.Debug else Serilog.Events.LogEventLevel.Warning
-        // TODO figure out what CFP v3 requires
-        c.MinimumLevel.Override("Microsoft.Azure.Documents.ChangeFeedProcessor", cfpl)
-
 [<System.Runtime.CompilerServices.Extension>]
 type Logging() =
 
     [<System.Runtime.CompilerServices.Extension>]
-    static member Configure(configuration : LoggerConfiguration, ?verbose, ?changeFeedProcessorVerbose) =
+    static member Configure(configuration : LoggerConfiguration, ?verbose) =
         configuration
             .Destructure.FSharpTypes()
             .Enrich.FromLogContext()
         |> fun c -> if verbose = Some true then c.MinimumLevel.Debug() else c
-        |> fun c -> c.ConfigureChangeFeedProcessorLogging(verbose = (changeFeedProcessorVerbose = Some true))
         |> fun c -> let t = "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {NewLine}{Exception}"
                     c.WriteTo.Console(theme=Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code, outputTemplate=t)