wip improvements

BenjaminMichaelis · BenjaminMichaelis · commit 9f9b3db6604d · 2026-04-16T08:44:34.000-07:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -39,6 +39,7 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.5" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="$(SemanticKernelVersion)" />
     <PackageVersion Include="Microsoft.SemanticKernel.Connectors.PgVector" Version="$(SemanticKernelVersion)-preview" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
@@ -51,6 +52,12 @@
     <PackageVersion Include="System.CommandLine" Version="2.0.5" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Octokit" Version="14.0.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.15.0" />
     <PackageVersion Include="DotnetSitemapGenerator" Version="2.0.0" />
   </ItemGroup>
 </Project>
diff --git a/EssentialCSharp.Chat.Shared/Extensions/ServiceCollectionExtensions.cs b/EssentialCSharp.Chat.Shared/Extensions/ServiceCollectionExtensions.cs
@@ -101,8 +101,7 @@ public static IServiceCollection AddAzureOpenAIServices(
 
     /// <summary>
     /// Adds PostgreSQL vector store with managed identity authentication support.
-    /// NOTE: Token is obtained once at startup and will expire after ~1 hour. 
-    /// For long-running applications, consider implementing token refresh logic.
+    /// Uses periodic token refresh to ensure tokens are renewed before expiry.
     /// </summary>
     /// <param name="services">The service collection to add services to</param>
     /// <param name="connectionString">The PostgreSQL connection string (without password)</param>
@@ -115,36 +114,39 @@ private static IServiceCollection AddPostgresVectorStoreWithManagedIdentity(
     {
         credential ??= new DefaultAzureCredential();
 
-        // Parse the connection string to extract host, database, and username
-        var builder = new NpgsqlConnectionStringBuilder(connectionString);
-
-        // Check if this is an Azure PostgreSQL connection (contains .postgres.database.azure.com)
-        bool isAzurePostgres = builder.Host?.Contains(".postgres.database.azure.com", StringComparison.OrdinalIgnoreCase) ?? false;
-
-        if (isAzurePostgres && string.IsNullOrEmpty(builder.Password))
-        {
-            // Get access token for Azure PostgreSQL using managed identity
-            var tokenRequestContext = new TokenRequestContext(_PostgresScopes);
-            var accessToken = credential.GetToken(tokenRequestContext, default);
-
-            // Set the password to the access token
-            builder.Password = accessToken.Token;
-
-            // Ensure SSL is enabled for Azure
-            if (builder.SslMode == SslMode.Disable)
-            {
-                builder.SslMode = SslMode.Require;
-            }
-
-            connectionString = builder.ToString();
-        }
-
         // Register NpgsqlDataSource with UseVector() enabled - this is critical for pgvector support
         services.AddSingleton<NpgsqlDataSource>(sp =>
         {
+            var connBuilder = new NpgsqlConnectionStringBuilder(connectionString);
+            bool isAzurePostgres = connBuilder.Host?.Contains(".postgres.database.azure.com",
+                StringComparison.OrdinalIgnoreCase) ?? false;
+
             var dataSourceBuilder = new NpgsqlDataSourceBuilder(connectionString);
             // IMPORTANT: UseVector() must be called to enable pgvector support
             dataSourceBuilder.UseVector();
+
+            if (isAzurePostgres && string.IsNullOrEmpty(connBuilder.Password))
+            {
+                // Ensure SSL is enabled for Azure PostgreSQL
+                if (dataSourceBuilder.ConnectionStringBuilder.SslMode < SslMode.Require)
+                {
+                    dataSourceBuilder.ConnectionStringBuilder.SslMode = SslMode.Require;
+                }
+
+                // Use periodic token refresh instead of a one-shot token at startup.
+                // Azure AD tokens expire after ~1 hour; refreshing every 50 minutes
+                // ensures uninterrupted connectivity for long-running applications.
+                dataSourceBuilder.UsePeriodicPasswordProvider(
+                    async (_, ct) =>
+                    {
+                        var tokenRequestContext = new TokenRequestContext(_PostgresScopes);
+                        var accessToken = await credential.GetTokenAsync(tokenRequestContext, ct);
+                        return accessToken.Token;
+                    },
+                    TimeSpan.FromMinutes(50),
+                    TimeSpan.FromSeconds(10));
+            }
+
             return dataSourceBuilder.Build();
         });
 
diff --git a/EssentialCSharp.Web.Tests/WebApplicationFactory.cs b/EssentialCSharp.Web.Tests/WebApplicationFactory.cs
@@ -51,6 +51,15 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
                 services.Remove(dbConnectionDescriptor);
             }
 
+            // Remove DatabaseMigrationService: it calls MigrateAsync which conflicts
+            // with EnsureCreated() used below for the in-memory SQLite test database.
+            ServiceDescriptor? migrationServiceDescriptor = services.SingleOrDefault(
+                d => d.ImplementationType == typeof(DatabaseMigrationService));
+            if (migrationServiceDescriptor != null)
+            {
+                services.Remove(migrationServiceDescriptor);
+            }
+
             _Connection = new SqliteConnection(SqlConnectionString);
             _Connection.Open();
 
diff --git a/EssentialCSharp.Web/DatabaseMigrationService.cs b/EssentialCSharp.Web/DatabaseMigrationService.cs
@@ -10,15 +10,7 @@ public class DatabaseMigrationService(IServiceScopeFactory services) : Backgroun
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
         using IServiceScope scope = Services.CreateScope();
-        EssentialCSharpWebContext? context = scope.ServiceProvider.GetRequiredService<EssentialCSharpWebContext>()
-            ?? throw new InvalidOperationException($"EssentialCSharpWebContext not found for {nameof(DatabaseMigrationService)}");
-        if (!context.Database.GetPendingMigrations().Contains("20231021170008_CreateIdentitySchema"))
-        {
-            await context.Database.MigrateAsync(stoppingToken);
-        }
-        else
-        {
-            await context.Database.EnsureCreatedAsync(cancellationToken: stoppingToken);
-        }
+        EssentialCSharpWebContext context = scope.ServiceProvider.GetRequiredService<EssentialCSharpWebContext>();
+        await context.Database.MigrateAsync(stoppingToken);
     }
 }
diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <!--
@@ -27,27 +27,33 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" />
     <PackageReference Include="AspNet.Security.OAuth.GitHub" />
+    <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" />
     <PackageReference Include="EssentialCSharp.Shared.Models" />
     <PackageReference Include="HtmlAgilityPack" />
     <PackageReference Include="IntelliTect.Multitool" />
     <PackageReference Include="Mailjet.Api" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
-    <PackageReference Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" />
     <PackageReference Include="Octokit" />
     <PackageReference Include="DotnetSitemapGenerator" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
   </ItemGroup>
   <ItemGroup>
     <Content Update="wwwroot\images\00mindmap.svg">
diff --git a/EssentialCSharp.Web/Program.cs b/EssentialCSharp.Web/Program.cs
@@ -1,5 +1,4 @@
 using System.Threading.RateLimiting;
-using Azure.Monitor.OpenTelemetry.AspNetCore;
 using EssentialCSharp.Chat.Common.Extensions;
 using EssentialCSharp.Web.Areas.Identity.Data;
 using EssentialCSharp.Web.Areas.Identity.Services.PasswordValidators;
@@ -14,7 +13,13 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.RateLimiting;
+using Azure.Monitor.OpenTelemetry.AspNetCore;
+using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using OpenTelemetry;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Trace;
 
 namespace EssentialCSharp.Web;
 
@@ -24,6 +29,47 @@ private static void Main(string[] args)
     {
         WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
+        // Health checks (liveness/readiness probes for ACA and standalone hosting)
+        builder.Services.AddHealthChecks()
+            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]);
+
+        // OpenTelemetry — Aspire injects OTEL_EXPORTER_OTLP_ENDPOINT when hosted.
+        // Azure Monitor is enabled in production when APPLICATIONINSIGHTS_CONNECTION_STRING is set.
+        bool useAzureMonitor = !string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"]);
+        builder.Logging.AddOpenTelemetry(logging =>
+        {
+            logging.IncludeFormattedMessage = true;
+            logging.IncludeScopes = true;
+        });
+        builder.Services.AddOpenTelemetry()
+            .WithMetrics(metrics => metrics
+                .AddAspNetCoreInstrumentation()
+                .AddHttpClientInstrumentation()
+                .AddRuntimeInstrumentation())
+            .WithTracing(tracing =>
+            {
+                tracing.AddSource(builder.Environment.ApplicationName);
+                if (!useAzureMonitor)
+                {
+                    tracing
+                        .AddAspNetCoreInstrumentation(t =>
+                            t.Filter = ctx =>
+                                !ctx.Request.Path.StartsWithSegments("/health")
+                                && !ctx.Request.Path.StartsWithSegments("/alive"))
+                        .AddHttpClientInstrumentation()
+                        .AddSqlClientInstrumentation();
+                }
+            });
+        if (!string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]))
+            builder.Services.AddOpenTelemetry().UseOtlpExporter();
+        if (useAzureMonitor)
+            builder.Services.AddOpenTelemetry().UseAzureMonitor();
+
+        // HttpClient defaults — standard retry/circuit breaker for all named clients.
+        builder.Services.ConfigureHttpClientDefaults(http => http.AddStandardResilienceHandler());
+
+
+
         builder.Services.Configure<ForwardedHeadersOptions>(options =>
         {
             options.ForwardedHeaders =
@@ -39,37 +85,12 @@ private static void Main(string[] args)
         ConfigurationManager configuration = builder.Configuration;
         string connectionString = builder.Configuration.GetConnectionString("EssentialCSharpWebContextConnection") ?? throw new InvalidOperationException("Connection string 'EssentialCSharpWebContextConnection' not found.");
 
-        builder.Logging.AddConsole();
-        builder.Services.AddHealthChecks();
-
         // Create a logger that's accessible throughout the entire method
         var loggerFactory = LoggerFactory.Create(loggingBuilder =>
             loggingBuilder.AddConsole().SetMinimumLevel(LogLevel.Information));
         var initialLogger = loggerFactory.CreateLogger<Program>();
 
-        if (!builder.Environment.IsDevelopment())
-        {
-            // Configure Azure Application Insights with OpenTelemetry only if connection string is available
-            var appInsightsConnectionString = builder.Configuration.GetConnectionString("ApplicationInsights")
-                ?? builder.Configuration["ApplicationInsights:ConnectionString"];
-
-            if (!string.IsNullOrEmpty(appInsightsConnectionString))
-            {
-                builder.Services.AddOpenTelemetry().UseAzureMonitor(
-                    options =>
-                    {
-                        options.ConnectionString = appInsightsConnectionString;
-                    });
-                builder.Services.AddApplicationInsightsTelemetry();
-                builder.Services.AddServiceProfiler();
-            }
-            else
-            {
-                initialLogger.LogWarning("Application Insights connection string not found. Telemetry collection will be disabled.");
-            }
-        }
-
-        builder.Services.AddDbContext<EssentialCSharpWebContext>(options => options.UseSqlServer(connectionString));
+        builder.Services.AddDbContext<EssentialCSharpWebContext>(options => options.UseSqlServer(connectionString, sql => sql.EnableRetryOnFailure(5)));
         builder.Services.AddDefaultIdentity<EssentialCSharpWebUser>(options =>
         {
             // Password settings
@@ -289,7 +310,11 @@ await context.HttpContext.Response.WriteAsync(
             app.UseForwardedHeaders();
         }
 
-        app.MapHealthChecks("/healthz");
+        app.MapHealthChecks("/health");
+        app.MapHealthChecks("/alive", new HealthCheckOptions
+        {
+            Predicate = r => r.Tags.Contains("live")
+        });
 
         app.UseHttpsRedirection();
         app.UseStaticFiles();
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -5,7 +5,7 @@ This guide will help you set up your local development environment for working o
 ## What You Will Need
 
 - [Visual Studio](https://visualstudio.microsoft.com/) (or your preferred IDE)
-- [.NET 9.0 SDK](https://dotnet.microsoft.com/download)
+- [.NET 10.0 SDK](https://dotnet.microsoft.com/download)
   - If you already have .NET installed you can check the version by typing `dotnet --info` into cmd to make sure you have the right version
 
 ## Startup Steps

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,7 @@ public class DatabaseMigrationService(IServiceScopeFactory services) : Backgroun`
`10`	`10`	`protected override async Task ExecuteAsync(CancellationToken stoppingToken)`
`11`	`11`	`{`
`12`	`12`	`using IServiceScope scope = Services.CreateScope();`
`13`		`- EssentialCSharpWebContext? context = scope.ServiceProvider.GetRequiredService<EssentialCSharpWebContext>()`
`14`		`- ?? throw new InvalidOperationException($"EssentialCSharpWebContext not found for {nameof(DatabaseMigrationService)}");`
`15`		`- if (!context.Database.GetPendingMigrations().Contains("20231021170008_CreateIdentitySchema"))`
`16`		`- {`
`17`		`- await context.Database.MigrateAsync(stoppingToken);`
`18`		`- }`
`19`		`- else`
`20`		`- {`
`21`		`- await context.Database.EnsureCreatedAsync(cancellationToken: stoppingToken);`
`22`		`- }`
	`13`	`+ EssentialCSharpWebContext context = scope.ServiceProvider.GetRequiredService<EssentialCSharpWebContext>();`
	`14`	`+ await context.Database.MigrateAsync(stoppingToken);`
`23`	`15`	`}`
`24`	`16`	`}`