Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Propulsion 2.12.0-rc.3 #111

Merged
merged 7 commits into from
Dec 24, 2021
Merged

Update to Propulsion 2.12.0-rc.3 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4eae73
proReactor fixes
bartelink Dec 24, 2021
d0f5e62
Changelog
bartelink Dec 24, 2021
ad92eb6
Propulsion 2.12.0-rc.3
bartelink Dec 24, 2021
5fc1b2a
Reinstate missing line
bartelink Dec 24, 2021
85ef724
Tidy
bartelink Dec 24, 2021
d77e6d1
Fix kafka source
bartelink Dec 24, 2021
34e2e59
Fix kafka source again
bartelink Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ The `Unreleased` section name is replaced by the expected version of next releas

### Added
### Changed

- Target `Propulsion` v `2.12.0-rc.3` [#111](https://github.com/jet/dotnet-templates/pull/111)

### Removed
### Fixed

Expand Down
2 changes: 1 addition & 1 deletion equinox-shipping/Watchdog/Watchdog.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions feed-consumer/FeedConsumer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions periodic-ingester/PeriodicIngester.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion propulsion-archiver/Archiver.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion propulsion-consumer/Consumer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion propulsion-cosmos-reactor/Reactor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions propulsion-projector/Projector.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<!--#endif-->
<!--#if cosmos-->
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<!--#endif-->
<!--#if (esdb)-->
<PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.3" />
<!--#endif-->
<!--#if (sss)-->
<PackageReference Include="Equinox.SqlStreamStore.MsSql" Version="3.0.5" />
<PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.0-rc.3" />
<!--#endif-->
<!--#if kafka-->
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<!--#endif-->
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion propulsion-pruner/Pruner.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions propulsion-reactor/Config.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ module Esdb =

let create codec initial fold (context, cache) =
let cacheStrategy = Equinox.EventStore.CachingStrategy.SlidingWindow (cache, System.TimeSpan.FromMinutes 20.)
Equinox.EventStore.Resolver(context, codec, fold, initial, cacheStrategy)
Equinox.EventStore.EventStoreCategory(context, codec, fold, initial, cacheStrategy)

//#endif
[<NoComparison; NoEquality; RequireQualifiedAccess>]
type Store =
| Cosmos of Equinox.CosmosStore.CosmosStoreContext * Equinox.Core.ICache
//#if multiSource
| Esdb of Equinox.EventStore.Context * Equinox.Core.ICache
| Esdb of Equinox.EventStore.EventStoreContext * Equinox.Core.ICache
//#endif
18 changes: 9 additions & 9 deletions propulsion-reactor/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ module Checkpoints =
module EventStoreContext =

let create connection =
Equinox.EventStore.Context(connection, Equinox.EventStore.BatchingPolicy(maxBatchSize=500))
Equinox.EventStore.EventStoreContext(connection, Equinox.EventStore.BatchingPolicy(maxBatchSize=500))

//#endif

Expand Down Expand Up @@ -575,10 +575,11 @@ let build (args : Args.Arguments) =

#if (!kafka)
#if (!blank) //!kafka && !blank -> wire up a cosmos context to an ingester
let cosmosStore =
let context = source.Cosmos.Connect() |> Async.RunSynchronously |> CosmosStoreContext.create
let cache = Equinox.Cache(AppName, sizeMb = 10)
Config.Store.Cosmos (context, cache)
#if kafkaEventSpans
let context = source.Cosmos.Connect() |> Async.RunSynchronously |> CosmosStoreContext.create
#endif // kafkaEventSpans
let cache = Equinox.Cache(AppName, sizeMb = 10)
let cosmosStore = Config.Store.Cosmos (context, cache)
let srcService = Todo.Config.create cosmosStore
let dstService = TodoSummary.Config.create cosmosStore
let handle = Ingester.handle srcService dstService
Expand Down Expand Up @@ -643,14 +644,13 @@ let build (args : Args.Arguments) =
[ Async.AwaitKeyboardInterruptAsTaskCancelledException(); source.AwaitWithStopOnCancellation(); sink.AwaitWithStopOnCancellation() ]
#endif // !kafkaEventSpans

let run args = async {
let run args =
#if (!kafkaEventSpans)
return! Async.Parallel (build args) |> Async.Ignore<unit array>
Async.Parallel (build args) |> Async.Ignore<unit array>
#else
let sink = build args
return! sink.AwaitWithStopOnCancellation()
sink.AwaitWithStopOnCancellation()
#endif
}

[<EntryPoint>]
let main argv =
Expand Down
6 changes: 3 additions & 3 deletions propulsion-reactor/Reactor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<!--#if (kafkaEventSpans) -->
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<!--#else-->
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<!--#endif-->
<!--#if (multiSource) -->
<PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.3" />
<!--#endif-->
<!--#if (kafka || kafkaEventSpans) -->
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<!--#endif-->
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion propulsion-summary-consumer/SummaryConsumer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion propulsion-sync/Sync.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Propulsion.EventStore" Version="2.10.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<!--#if (kafka)-->
<PackageReference Include="Propulsion.Kafka" Version="2.10.0" />
<!--#endif-->
Expand Down
2 changes: 1 addition & 1 deletion propulsion-tracking-consumer/TrackingConsumer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.2" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down