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 use Propulsion 2.12.1 Prometheus wiring #114

Merged
merged 3 commits into from
Feb 25, 2022
Merged

Update to use Propulsion 2.12.1 Prometheus wiring #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64da4a4
Target Propulsion 2.12.1, Equinox 3.0.6
bartelink Feb 22, 2022
4590d2e
Target Propulsion.Streams.Prometheus 2.12.1
bartelink Feb 22, 2022
2eff698
Remove consumer group from appName
bartelink Feb 22, 2022
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The `Unreleased` section name is replaced by the expected version of next releas

### Changed

- Target `Propulsion` v `2.12.0-rc.3` [#111](https://github.com/jet/dotnet-templates/pull/111)
- Target `Propulsion` v `2.12.1`, `Equinox` v `3.0.6` [#111](https://github.com/jet/dotnet-templates/pull/111) [#114](https://github.com/jet/dotnet-templates/pull/114)
- `eqxPatterns`: Extract `ExactlyOnceIngester` [#110](https://github.com/jet/dotnet-templates/pull/110)
- Target `FsCodec.SystemTextJson`.* v `2.3.0` [#112](https://github.com/jet/dotnet-templates/pull/112)

Expand Down
4 changes: 2 additions & 2 deletions equinox-patterns/Domain/Domain.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion equinox-shipping/Domain.Tests/Domain.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />

<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="FsCheck.Xunit" Version="3.0.0-beta1" />
<PackageReference Include="unquote" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
Expand Down
4 changes: 2 additions & 2 deletions equinox-shipping/Domain/Domain.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
</ItemGroup>

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.3" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions equinox-testbed/Testbed.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<ItemGroup>
<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="Equinox.EventStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.Tools.TestHarness" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.EventStore" Version="3.0.6" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="Equinox.Tools.TestHarness" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion equinox-web-csharp/Domain/Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Equinox" Version="3.0.5" />
<PackageReference Include="Equinox" Version="3.0.6" />
<PackageReference Include="FsCodec" Version="2.0.1" />
<PackageReference Include="FSharp.Core" Version="4.5.4" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
Expand Down
8 changes: 4 additions & 4 deletions equinox-web-csharp/Web/Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="Equinox.EventStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="Equinox.EventStore" Version="3.0.6" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
6 changes: 3 additions & 3 deletions equinox-web/Domain/Domain.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.EventStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.EventStore" Version="3.0.6" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion equinox-web/Web/Web.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions feed-consumer/FeedConsumer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<ItemGroup>
<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="Equinox.CosmosStore.Prometheus" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<PackageReference Include="Propulsion.Feed" Version="2.12.1" />
<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 feed-source/Domain/Domain.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<PackageReference Include="Equinox.MemoryStore" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion feed-source/FeedApi/FeedApi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ItemGroup>
<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="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
Expand Down
6 changes: 3 additions & 3 deletions periodic-ingester/PeriodicIngester.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<ItemGroup>
<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="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Feed" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<PackageReference Include="Propulsion.Feed" Version="2.12.1" />
<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 propulsion-archiver/Archiver.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<ItemGroup>
<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.3" />
<PackageReference Include="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<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
16 changes: 9 additions & 7 deletions propulsion-archiver/Infrastructure.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open System

module Config =

let log = Serilog.Log.ForContext("isMetric", true)
let log = Log.ForContext("isMetric", true)

module EnvVar =

Expand All @@ -16,6 +16,8 @@ module Log =

/// Allow logging to filter out emission of log messages whose information is also surfaced as metrics
let isStoreMetrics e = Filters.Matching.WithProperty("isMetric").Invoke e
/// The Propulsion.Streams.Prometheus LogSink uses this well-known property to identify consumer group associated with the Scheduler
let forGroup group = Log.ForContext("group", group)

/// Equinox and Propulsion provide metrics as properties in log emissions
/// These helpers wire those to pass through virtual Log Sinks that expose them as Prometheus metrics.
Expand All @@ -27,12 +29,12 @@ module Sinks =
l.WriteTo.Sink(Equinox.CosmosStore.Core.Log.InternalMetrics.Stats.LogSink())
.WriteTo.Sink(Equinox.CosmosStore.Prometheus.LogSink(tags))

let equinoxAndPropulsionConsumerMetrics tags group (l : LoggerConfiguration) =
let equinoxAndPropulsionConsumerMetrics tags (l : LoggerConfiguration) =
l |> equinoxMetricsOnly tags
|> fun l -> l.WriteTo.Sink(Propulsion.Prometheus.LogSink(tags, group))
|> fun l -> l.WriteTo.Sink(Propulsion.Prometheus.LogSink(tags))

let equinoxAndPropulsionCosmosConsumerMetrics tags group (l : LoggerConfiguration) =
l |> equinoxAndPropulsionConsumerMetrics tags group
let equinoxAndPropulsionCosmosConsumerMetrics tags (l : LoggerConfiguration) =
l |> equinoxAndPropulsionConsumerMetrics tags
|> fun l -> l.WriteTo.Sink(Propulsion.CosmosStore.Prometheus.LogSink(tags))

let console verbose (configuration : LoggerConfiguration) =
Expand Down Expand Up @@ -61,7 +63,7 @@ type Logging() =
configuration.WriteTo.Async(bufferSize=65536, blockWhenFull=true, configure=Action<_> configure)

[<System.Runtime.CompilerServices.Extension>]
static member Configure(configuration : LoggerConfiguration, appName, group, verbose, (logSyncToConsole, minRu)) =
static member Configure(configuration : LoggerConfiguration, appName, verbose, (logSyncToConsole, minRu)) =
configuration.Configure(verbose)
|> fun c -> let ingesterLevel = if logSyncToConsole then Events.LogEventLevel.Debug else Events.LogEventLevel.Information
c.MinimumLevel.Override(typeof<Propulsion.Streams.Scheduling.StreamSchedulingEngine>.FullName, ingesterLevel)
Expand All @@ -77,7 +79,7 @@ type Logging() =
| _ -> false
let isTooCheapToShow = match minRu with Some mru -> isCheaperThan mru | None -> fun _ -> false
let metricFilter = if logSyncToConsole then None else Some (fun x -> Log.isStoreMetrics x || isWriterB x || isTooCheapToShow x)
c.Sinks(Sinks.equinoxAndPropulsionCosmosConsumerMetrics (Sinks.tags appName) group, Sinks.console verbose, ?isMetric = metricFilter)
c.Sinks(Sinks.equinoxAndPropulsionCosmosConsumerMetrics (Sinks.tags appName), Sinks.console verbose, ?isMetric = metricFilter)

type Equinox.CosmosStore.CosmosStoreConnector with

Expand Down
13 changes: 8 additions & 5 deletions propulsion-archiver/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,21 @@ let startMetricsServer port : IDisposable =

open Propulsion.CosmosStore.Infrastructure // AwaitKeyboardInterruptAsTaskCancelledException

let run args = async {
let log = Log.ForContext<Propulsion.Streams.Scheduling.StreamSchedulingEngine>()
let run (args : Args.Arguments) = async {
let log = (Log.forGroup args.ProcessorName).ForContext<Propulsion.Streams.Scheduling.StreamSchedulingEngine>()
let sink, source = build (args, log)
use _metricsServer : IDisposable = args.PrometheusPort |> Option.map startMetricsServer |> Option.toObj
return! Async.Parallel [ Async.AwaitKeyboardInterruptAsTaskCancelledException(); source.AwaitWithStopOnCancellation(); sink.AwaitWithStopOnCancellation() ] |> Async.Ignore<unit[]>
return! Async.Parallel [
Async.AwaitKeyboardInterruptAsTaskCancelledException()
source.AwaitWithStopOnCancellation()
sink.AwaitWithStopOnCancellation() ]
|> Async.Ignore<unit[]>
}

[<EntryPoint>]
let main argv =
try let args = Args.parse EnvVar.tryGet argv
let appName = sprintf "archiver:%s" args.ProcessorName
try Log.Logger <- LoggerConfiguration().Configure(appName, args.ProcessorName, args.Verbose, args.SyncLogging).CreateLogger()
try Log.Logger <- LoggerConfiguration().Configure(AppName, args.Verbose, args.SyncLogging).CreateLogger()
try run args |> Async.RunSynchronously; 0
with e when not (e :? MissingArg) -> Log.Fatal(e, "Exiting"); 2
finally Log.CloseAndFlush()
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 @@ -17,7 +17,7 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions propulsion-cosmos-reactor/Reactor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<ItemGroup>
<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="Equinox.CosmosStore.Prometheus" Version="3.0.6" />
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="3.6.0" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions propulsion-projector/Projector.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
<PackageReference Include="Argu" Version="6.1.1" />
<PackageReference Include="Destructurama.FSharp" Version="1.2.0" />
<!--#if (esdb)-->
<PackageReference Include="Equinox.CosmosStore" Version="3.0.5" />
<PackageReference Include="Equinox.CosmosStore" Version="3.0.6" />
<!--#endif-->
<PackageReference Include="FsCodec.SystemTextJson" Version="2.3.0" />
<!--#if cosmos-->
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.CosmosStore" Version="2.12.1" />
<!--#endif-->
<!--#if (esdb)-->
<PackageReference Include="Propulsion.EventStore" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.EventStore" Version="2.12.1" />
<!--#endif-->
<!--#if (sss)-->
<PackageReference Include="Equinox.SqlStreamStore.MsSql" Version="3.0.5" />
<PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.0-rc.3" />
<PackageReference Include="Equinox.SqlStreamStore.MsSql" Version="3.0.6" />
<PackageReference Include="Propulsion.SqlStreamStore" Version="2.12.1" />
<!--#endif-->
<!--#if kafka-->
<PackageReference Include="Propulsion.Kafka" Version="2.12.0-rc.3" />
<PackageReference Include="Propulsion.Kafka" Version="2.12.1" />
<!--#endif-->
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
</ItemGroup>
Expand Down
16 changes: 9 additions & 7 deletions propulsion-pruner/Infrastructure.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open System

module Config =

let log = Serilog.Log.ForContext("isMetric", true)
let log = Log.ForContext("isMetric", true)

module EnvVar =

Expand All @@ -16,6 +16,8 @@ module Log =

/// Allow logging to filter out emission of log messages whose information is also surfaced as metrics
let isStoreMetrics e = Filters.Matching.WithProperty("isMetric").Invoke e
/// The Propulsion.Streams.Prometheus LogSink uses this well-known property to identify consumer group associated with the Scheduler
let forGroup group = Log.ForContext("group", group)

type Equinox.CosmosStore.CosmosStoreConnector with

Expand Down Expand Up @@ -58,12 +60,12 @@ module Sinks =
l.WriteTo.Sink(Equinox.CosmosStore.Core.Log.InternalMetrics.Stats.LogSink())
.WriteTo.Sink(Equinox.CosmosStore.Prometheus.LogSink(tags))

let equinoxAndPropulsionConsumerMetrics tags group (l : LoggerConfiguration) =
let equinoxAndPropulsionConsumerMetrics tags (l : LoggerConfiguration) =
l |> equinoxMetricsOnly tags
|> fun l -> l.WriteTo.Sink(Propulsion.Prometheus.LogSink(tags, group))
|> fun l -> l.WriteTo.Sink(Propulsion.Prometheus.LogSink(tags))

let equinoxAndPropulsionCosmosConsumerMetrics tags group (l : LoggerConfiguration) =
l |> equinoxAndPropulsionConsumerMetrics tags group
let equinoxAndPropulsionCosmosConsumerMetrics tags (l : LoggerConfiguration) =
l |> equinoxAndPropulsionConsumerMetrics tags
|> fun l -> l.WriteTo.Sink(Propulsion.CosmosStore.Prometheus.LogSink(tags))

let console verbose (configuration : LoggerConfiguration) =
Expand Down Expand Up @@ -92,12 +94,12 @@ type Logging() =
configuration.WriteTo.Async(bufferSize=65536, blockWhenFull=true, configure=System.Action<_> configure)

[<System.Runtime.CompilerServices.Extension>]
static member Configure(configuration : LoggerConfiguration, appName, group, verbose, cfpVerbose) =
static member Configure(configuration : LoggerConfiguration, appName, verbose, cfpVerbose) =
configuration.Configure(verbose)
|> fun c -> let ingesterLevel = if cfpVerbose then Events.LogEventLevel.Debug else Events.LogEventLevel.Information
c.MinimumLevel.Override(typeof<Propulsion.Streams.Scheduling.StreamSchedulingEngine>.FullName, ingesterLevel)
|> fun c -> let generalLevel = if verbose then Events.LogEventLevel.Information else Events.LogEventLevel.Warning
c.MinimumLevel.Override(typeof<Propulsion.CosmosStore.Internal.Writer.Result>.FullName, generalLevel)
|> fun c -> let isWriterB = Filters.Matching.FromSource<Propulsion.CosmosStore.Internal.Writer.Result>().Invoke
let metricFilter = if cfpVerbose then None else Some (fun x -> Log.isStoreMetrics x || isWriterB x)
c.Sinks(Sinks.equinoxAndPropulsionCosmosConsumerMetrics (Sinks.tags appName) group, Sinks.console verbose, ?isMetric = metricFilter)
c.Sinks(Sinks.equinoxAndPropulsionCosmosConsumerMetrics (Sinks.tags appName), Sinks.console verbose, ?isMetric = metricFilter)
Loading