Some changes but not ready yet

Eventuous · Nov 11, 2021 · 5b20f90 · 5b20f90
1 parent 101a078
commit 5b20f90
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 73 deletions.
diff --git a/Bookings.Domain/Bookings.Domain.csproj b/Bookings.Domain/Bookings.Domain.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eventuous" Version="0.5.16-alpha.0.9" />
+        <PackageReference Include="Eventuous" Version="0.5.16-alpha.0.15" />
     </ItemGroup>
 
 </Project>
diff --git a/Bookings.Payments/Bookings.Payments.csproj b/Bookings.Payments/Bookings.Payments.csproj
@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eventuous.Shovel" Version="0.5.16-alpha.0.9" />
-        <PackageReference Include="Eventuous.EventStore" Version="0.5.16-alpha.0.9" />
-        <PackageReference Include="Eventuous.Diagnostics.OpenTelemetry" Version="0.5.16-alpha.0.9" />
-        <PackageReference Include="Eventuous.Projections.MongoDB" Version="0.5.16-alpha.0.9" />
+        <PackageReference Include="Eventuous.Shovel" Version="0.5.16-alpha.0.15" />
+        <PackageReference Include="Eventuous.EventStore" Version="0.5.16-alpha.0.15" />
+        <PackageReference Include="Eventuous.Diagnostics.OpenTelemetry" Version="0.5.16-alpha.0.15" />
+        <PackageReference Include="Eventuous.Projections.MongoDB" Version="0.5.16-alpha.0.15" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5" />
         <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.2.0-beta1" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc8" />

diff --git a/Bookings.Payments/Infrastructure/ActivityListener.cs b/Bookings.Payments/Infrastructure/ActivityListener.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics;
+using Eventuous.Diagnostics;
+using Serilog;
+
+namespace Bookings.Payments.Infrastructure; 
+
+public sealed class TestActivityListener : IDisposable{
+    readonly ActivityListener _listener;
+
+    public TestActivityListener() {
+        _listener = new ActivityListener {
+            ShouldListenTo = _ => true,
+            Sample = (ref ActivityCreationOptions<ActivityContext> _)
+                => ActivitySamplingResult.AllData,
+            ActivityStarted = activity => Log.Information(
+                "Started {Activity} with {Id}, parent {ParentId}",
+                activity.DisplayName,
+                activity.Id,
+                activity.ParentId
+            ),
+            ActivityStopped = activity
+                => Log.Information("Stopped {Activity}", activity.DisplayName)
+        };
+    }
+
+    public void Dispose() => _listener.Dispose();
+}
diff --git a/Bookings.Payments/Infrastructure/SerilogExtensions.cs b/Bookings.Payments/Infrastructure/SerilogExtensions.cs
@@ -1,10 +1,11 @@
 using Serilog;
+using Serilog.Events;
 using Serilog.Extensions.Hosting;
 using Serilog.Extensions.Logging;
 
 namespace Bookings.Payments.Infrastructure;
 
-public static class SerilogExtensions {
+public static class Logging {
     public static IServiceCollection AddSerilog(this IServiceCollection services) {
         var diagnosticContext = new DiagnosticContext(null);
 
@@ -13,4 +14,16 @@ public static IServiceCollection AddSerilog(this IServiceCollection services) {
             .AddSingleton(diagnosticContext)
             .AddSingleton<IDiagnosticContext>(diagnosticContext);
     }
+
+    public static void ConfigureLog() {
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Debug()
+            .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+            .MinimumLevel.Override("Grpc", LogEventLevel.Information)
+            .Enrich.FromLogContext()
+            .WriteTo.Console(
+                outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}"
+            )
+            .CreateLogger();
+    }
 }
diff --git a/Bookings.Payments/Infrastructure/TestEventListener.cs b/Bookings.Payments/Infrastructure/TestEventListener.cs
diff --git a/Bookings.Payments/Program.cs b/Bookings.Payments/Program.cs
@@ -1,19 +1,8 @@
 using Bookings.Payments;
 using Bookings.Payments.Infrastructure;
 using Eventuous;
-using Serilog;
-using Serilog.Events;
-
-using var listener = new TestEventListener();
-
 TypeMap.RegisterKnownEventTypes();
-Log.Logger = new LoggerConfiguration()
-    .MinimumLevel.Debug()
-    .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-    .MinimumLevel.Override("Grpc", LogEventLevel.Information)
-    .Enrich.FromLogContext()
-    .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}")
-    .CreateLogger();
+Logging.ConfigureLog();
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -22,9 +11,11 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
-builder.Services.AddServices();
+// OpenTelemetry instrumentation must be added before adding Eventuous services
 builder.Services.AddOpenTelemetry();
 
+builder.Services.AddServices();
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment()) {

diff --git a/Bookings/Bookings.csproj b/Bookings/Bookings.csproj
@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eventuous.Diagnostics.OpenTelemetry" Version="0.5.16-alpha.0.9" />
-        <PackageReference Include="Eventuous.EventStore" Version="0.5.16-alpha.0.9" />
-        <PackageReference Include="Eventuous.Projections.MongoDB" Version="0.5.16-alpha.0.9" />
+        <PackageReference Include="Eventuous.Diagnostics.OpenTelemetry" Version="0.5.16-alpha.0.15" />
+        <PackageReference Include="Eventuous.EventStore" Version="0.5.16-alpha.0.15" />
+        <PackageReference Include="Eventuous.Projections.MongoDB" Version="0.5.16-alpha.0.15" />
         <PackageReference Include="MongoDB.Driver.Core.Extensions.OpenTelemetry" Version="1.0.0" />
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus" Version="1.2.0-beta1" />
         <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.2.0-beta1" />

diff --git a/Bookings/Infrastructure/ActivityListener.cs b/Bookings/Infrastructure/ActivityListener.cs
@@ -0,0 +1,27 @@
+using System.Diagnostics;
+using Serilog;
+
+namespace Bookings.Infrastructure;
+
+public sealed class TestActivityListener : IDisposable {
+    readonly ActivityListener _listener;
+
+    public TestActivityListener() {
+        _listener = new ActivityListener {
+            ShouldListenTo = _ => true,
+            Sample = (ref ActivityCreationOptions<ActivityContext> _)
+                => ActivitySamplingResult.AllData,
+            ActivityStarted = activity => Log.Information(
+                "Started {Activity} with {Id}, parent {ParentId}",
+                activity.DisplayName,
+                activity.Id,
+                activity.ParentId
+            ),
+            ActivityStopped = activity
+                => Log.Information("Stopped {Activity}", activity.DisplayName)
+        };
+        ActivitySource.AddActivityListener(_listener);
+    }
+
+    public void Dispose() => _listener.Dispose();
+}
diff --git a/Bookings/Program.cs b/Bookings/Program.cs
@@ -6,6 +6,7 @@
 using Serilog.Events;
 
 // using var listener = new TestEventListener();
+// using var activityListener = new TestActivityListener();
 
 TypeMap.RegisterKnownEventTypes(typeof(BookingEvents.V1.RoomBooked).Assembly);
 
@@ -24,10 +25,10 @@
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
 
-builder.Services.AddEventuous();
-
 builder.Services.AddOpenTelemetry();
 
+builder.Services.AddEventuous();
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment()) {