Add Aspire projects and dependencies

.vscode/launch.json

@@ -89,6 +89,24 @@
                 },
             }
         },
+        {
+            "name": "Aspire: Run All (Debug)",
+            "type": "coreclr",
+            "preLaunchTask": "dotnet: build (Debug)",
+            "request": "launch",
+            "program": "${workspaceFolder}/src/NServiceBusTutorial.AspireHost/bin/Debug/net9.0/NServiceBusTutorial.AspireHost.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/src/NServiceBusTutorial.AspireHost/bin/Debug/net9.0",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart",
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development",
+                "DOTNET_ENVIRONMENT": "Development",
+                "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21007",
+                "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22245",
+                "ASPNETCORE_URLS": "https://localhost:17143"
+            },
+        },
     ],
     "compounds": [
         {

Directory.Packages.props

@@ -37,11 +37,29 @@
     <PackageVersion Include="NServiceBus.Persistence.Sql" Version="8.1.1" />
     <PackageVersion Include="NServiceBus.Testing" Version="9.0.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.11.1" />
     <PackageVersion Include="ReportGenerator" Version="5.4.4" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.1.1" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
   </ItemGroup>
+  <!-- Aspire Packages -->
+  <ItemGroup>
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.0" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.3.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
+    <PackageVersion Include="Aspire.Hosting.Testing" Version="9.2.1" />
+  </ItemGroup>
 </Project>

NServiceBusTutorial.sln

@@ -41,6 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBusTutorial.Worker"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBusTutorial.Saga", "src\NServiceBusTutorial.Saga\NServiceBusTutorial.Saga.csproj", "{B171BFFE-FE6D-4EA1-AB48-334072F89B40}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBusTutorial.AspireHost", "src\NServiceBusTutorial.AspireHost\NServiceBusTutorial.AspireHost.csproj", "{6002A3B9-6FB4-4E0F-89FB-044AB2655434}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBusTutorial.ServiceDefaults", "src\NServiceBusTutorial.ServiceDefaults\NServiceBusTutorial.ServiceDefaults.csproj", "{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -171,6 +175,30 @@ Global
 		{B171BFFE-FE6D-4EA1-AB48-334072F89B40}.Release|x64.Build.0 = Release|Any CPU
 		{B171BFFE-FE6D-4EA1-AB48-334072F89B40}.Release|x86.ActiveCfg = Release|Any CPU
 		{B171BFFE-FE6D-4EA1-AB48-334072F89B40}.Release|x86.Build.0 = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|x64.Build.0 = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Debug|x86.Build.0 = Debug|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|x64.ActiveCfg = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|x64.Build.0 = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|x86.ActiveCfg = Release|Any CPU
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434}.Release|x86.Build.0 = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|x64.ActiveCfg = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|x64.Build.0 = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|x86.ActiveCfg = Release|Any CPU
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -186,6 +214,8 @@ Global
 		{7A8F52CA-113E-4461-8D91-80A1683DDC26} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{558A7852-42FB-4867-B9AB-0D58F69CD7F6} = {106AE906-5075-410A-B941-912F811848EE}
 		{B171BFFE-FE6D-4EA1-AB48-334072F89B40} = {106AE906-5075-410A-B941-912F811848EE}
+		{6002A3B9-6FB4-4E0F-89FB-044AB2655434} = {106AE906-5075-410A-B941-912F811848EE}
+		{6DC1366E-F471-4145-9558-CD1B5EDFEB5D} = {106AE906-5075-410A-B941-912F811848EE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B0F19343-8185-4A9F-9165-0EA8544BC925}

src/NServiceBusTutorial.AspireHost/NServiceBusTutorial.AspireHost.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>c540eeb6-e06b-4456-a539-be58dd8b88c7</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBusTutorial.Saga\NServiceBusTutorial.Saga.csproj" IsAspireProjectResource="true" />
+    <ProjectReference Include="..\NServiceBusTutorial.Web\NServiceBusTutorial.Web.csproj" IsAspireProjectResource="true" />
+    <ProjectReference Include="..\NServiceBusTutorial.Worker\NServiceBusTutorial.Worker.csproj" IsAspireProjectResource="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- The IsAspireProjectResource attribute tells .NET Aspire to treat this 
+        reference as a standard project reference and not attempt to generate
+        a metadata file -->
+    <ProjectReference Include="..\NServiceBusTutorial.ServiceDefaults\NServiceBusTutorial.ServiceDefaults.csproj" IsAspireProjectResource="false" />
+  </ItemGroup>
+
+</Project>

src/NServiceBusTutorial.AspireHost/Program.cs

@@ -0,0 +1,23 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+var username = builder.AddParameter("username", "postgres",secret: false);
+var password = builder.AddParameter("password", "postgres",secret: false);
+
+var postgres = builder.AddPostgres("postgres", username, password, 5432);
+var domainDb = postgres.AddDatabase("NServiceBusTutorial");
+var sagaDb = postgres.AddDatabase("SagaDb");
+
+builder.AddProject<Projects.NServiceBusTutorial_Web>("Web")
+  .WithReference(postgres)
+  .WaitFor(domainDb);
+
+builder.AddProject<Projects.NServiceBusTutorial_Saga>("Saga")
+  .WithReference(postgres)
+  .WaitFor(domainDb)
+  .WaitFor(sagaDb);
+
+builder.AddProject<Projects.NServiceBusTutorial_Worker>("Worker")
+  .WithReference(postgres)
+  .WaitFor(domainDb);
+
+builder.Build().Run();

src/NServiceBusTutorial.AspireHost/Properties/launchSettings.json

@@ -0,0 +1,29 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17143;http://localhost:15258",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21007",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22245"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15258",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19187",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20134"
+      }
+    }
+  }
+}

src/NServiceBusTutorial.AspireHost/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}

src/NServiceBusTutorial.Infrastructure/Data/AppDbContext.cs

@@ -1,5 +1,4 @@
-using System.Reflection;
-using Ardalis.SharedKernel;
+using Ardalis.SharedKernel;
 using NServiceBusTutorial.Core.ContributorAggregate;
 using Microsoft.EntityFrameworkCore;
 
@@ -21,7 +20,7 @@ public AppDbContext(DbContextOptions<AppDbContext> options,
   protected override void OnModelCreating(ModelBuilder modelBuilder)
   {
     base.OnModelCreating(modelBuilder);
-    modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
+    modelBuilder.ApplyConfigurationsFromAssembly(typeof(AppDbContext).Assembly);
   }
 
   public override async Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())

src/NServiceBusTutorial.Infrastructure/Data/Queries/ListContributorsQueryService.cs

@@ -12,8 +12,12 @@ public class ListContributorsQueryService(AppDbContext _db) : IListContributorsQ
   public async Task<IEnumerable<ContributorDTO>> ListAsync()
   {
     // NOTE: This will fail if testing with EF InMemory provider!
-    var result = await _db.Database.SqlQuery<ContributorDTO>(
-      $"SELECT Id, Name, PhoneNumber_Number AS PhoneNumber, Verification FROM Contributors") // don't fetch other big columns
+    // var result = await _db.Database.SqlQuery<ContributorDTO>(
+    //   $"SELECT Id, Name, PhoneNumber_Number AS PhoneNumber, Verification FROM public.Contributors") // don't fetch other big columns
+    //   .ToListAsync();
+    var result = await _db.Contributors
+      .AsNoTracking()
+      .Select(c => new ContributorDTO(c.Id, c.Name, c.PhoneNumber!.Number, c.Verification.Name))
       .ToListAsync();
 
     return result;

src/NServiceBusTutorial.Infrastructure/Data/SeedData.cs

@@ -1,6 +1,4 @@
 using NServiceBusTutorial.Core.ContributorAggregate;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace NServiceBusTutorial.Infrastructure.Data;
 
@@ -9,15 +7,11 @@ public static class SeedData
   public static readonly Contributor Contributor1 = new("Ardalis", new(string.Empty, "123-456-7890", string.Empty), ContributorStatus.CoreTeam, VerificationStatus.Pending);
   public static readonly Contributor Contributor2 = new("Snowfrog", new(string.Empty, "098-765-4321", string.Empty), ContributorStatus.Community, VerificationStatus.Pending);
 
-  public static void Initialize(IServiceProvider serviceProvider)
+  public static void Initialize(IServiceProvider serviceProvider, AppDbContext dbContext)
   {
-    using (var dbContext = new AppDbContext(
-        serviceProvider.GetRequiredService<DbContextOptions<AppDbContext>>(), null))
-    {
-      if (dbContext.Contributors.Any()) return;   // DB has been seeded
+    if (dbContext.Contributors.Any()) return;   // DB has been seeded
 
-      PopulateTestData(dbContext);
-    }
+    PopulateTestData(dbContext);
   }
   public static void PopulateTestData(AppDbContext dbContext)
   {

src/NServiceBusTutorial.Infrastructure/NServiceBusTutorial.Infrastructure.csproj

@@ -11,6 +11,12 @@
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" />
+    <PackageReference Include="Serilog.Extensions.Hosting" />
+    <PackageReference Include="Serilog.Settings.Configuration" />
+    <PackageReference Include="Serilog.Sinks.Console" />
+    <PackageReference Include="Serilog.Sinks.OpenTelemetry" />
   </ItemGroup>
 
   <ItemGroup>

src/NServiceBusTutorial.Saga/ContributorVerificationSaga.cs

@@ -1,5 +1,6 @@
 using NServiceBusTutorial.Core.ContributorAggregate.Commands;
 using NServiceBusTutorial.Core.ContributorAggregate.Events;
+using Serilog;
 
 namespace NServiceBusTutorial.Saga;
 
@@ -17,6 +18,7 @@ protected override void ConfigureHowToFindSaga(SagaPropertyMapper<ContributorVer
 
   public async Task Handle(StartContributorVerificationCommand message, IMessageHandlerContext context)
   {
+    Log.Logger.Information("Starting contributor verification for {ContributorId}", message.ContributorId);
     var command = new VerifyContributorCommand { ContributorId = message.ContributorId };
     await context.Send(command);
     var timeout = new ContributorVerificationSagaTimeout { ContributorId = message.ContributorId };

src/NServiceBusTutorial.Saga/Program.cs

@@ -1,12 +1,33 @@
 using Npgsql;
 using NpgsqlTypes;
 using NServiceBusTutorial.Core.ContributorAggregate.Commands;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using Serilog;
+
+string endpointName = "contributors-saga";
 
 var builder = Host.CreateDefaultBuilder(args);
 
+builder.ConfigureServices((hostContext, services) =>
+{
+  services.AddSerilog((services, loggerConfiguration) => loggerConfiguration
+      .ReadFrom.Configuration(hostContext.Configuration)
+      .ReadFrom.Services(services)
+      .Enrich.FromLogContext());
+
+  services.AddOpenTelemetry()
+    .ConfigureResource(resourceBuilder => resourceBuilder.AddService(endpointName))
+    .WithTracing(builder =>
+    {
+        builder.AddSource("NServiceBus.*");
+        builder.AddConsoleExporter();
+    });
+});
+
 builder.UseNServiceBus(context => 
 {
-  var endpointConfiguration = new EndpointConfiguration("contributors-saga");
+  var endpointConfiguration = new EndpointConfiguration(endpointName);
   endpointConfiguration.UseSerialization<SystemJsonSerializer>();
   endpointConfiguration.EnableInstallers();
 
@@ -37,6 +58,7 @@
           return new NpgsqlConnection(connectionString);
       });
   endpointConfiguration.EnableInstallers();
+  endpointConfiguration.EnableOpenTelemetry();
 
   var recoverability = endpointConfiguration.Recoverability();
   recoverability.Immediate(c => c.NumberOfRetries(0));

src/NServiceBusTutorial.Saga/appsettings.json

@@ -1,11 +1,32 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=NServiceBusTutorial;Pooling=true;MinPoolSize=1;MaxPoolSize=100;Timeout=15"
+    "DefaultConnection": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=SagaDb;Pooling=true;MinPoolSize=1;MaxPoolSize=100;Timeout=15"
   },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.OpenTelemetry" ],
+    "MinimumLevel": {
+      "Default": "Information"
+    },
+    "WriteTo": [
+      {
+        "Name": "Console"
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "logs/log.txt",
+          "rollingInterval": "Day"
+        }
+      },
+      {
+        "Name": "OpenTelemetry"
+      }
+    ]
   }
 }