♻️ Remove etcd, replace with asprie. Move infra to aspire. Disable gateway for now

DysonNetwork.Sphere/DysonNetwork.Sphere.csproj

@@ -55,7 +55,6 @@
         <PackageReference Include="Quartz" Version="3.14.0"/>
         <PackageReference Include="Quartz.AspNetCore" Version="3.14.0"/>
         <PackageReference Include="Quartz.Extensions.Hosting" Version="3.14.0"/>
-        <PackageReference Include="StackExchange.Redis" Version="2.8.41"/>
         <PackageReference Include="StackExchange.Redis.Extensions.AspNetCore" Version="11.0.0"/>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3"/>
         <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.3" />
@@ -160,6 +159,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\DysonNetwork.ServiceDefaults\DysonNetwork.ServiceDefaults.csproj" />
         <ProjectReference Include="..\DysonNetwork.Shared\DysonNetwork.Shared.csproj"/>
         <ProjectReference Include="..\DysonNetwork.Pass\DysonNetwork.Pass.csproj"/>
     </ItemGroup>

DysonNetwork.Sphere/Poll/PollController.cs

@@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Text.Json;
 using DysonNetwork.Shared.Proto;
 using DysonNetwork.Shared.Registry;
-using DysonNetwork.Sphere.Publisher;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;

DysonNetwork.Sphere/Program.cs

@@ -2,7 +2,6 @@ using DysonNetwork.Shared.Auth;
 using DysonNetwork.Shared.Http;
 using DysonNetwork.Shared.PageData;
 using DysonNetwork.Shared.Registry;
-using DysonNetwork.Shared.Stream;
 using DysonNetwork.Sphere;
 using DysonNetwork.Sphere.PageData;
 using DysonNetwork.Sphere.Startup;
@@ -11,15 +10,13 @@ using Microsoft.Extensions.FileProviders;
 
 var builder = WebApplication.CreateBuilder(args);
 
+builder.AddServiceDefaults();
+
 // Configure Kestrel and server options
 builder.ConfigureAppKestrel(builder.Configuration);
 
-// Add metrics and telemetry
-builder.Services.AddAppMetrics();
-
 // Add application services
-builder.Services.AddRegistryService(builder.Configuration);
-builder.Services.AddStreamConnection(builder.Configuration);
+
 builder.Services.AddAppServices(builder.Configuration);
 builder.Services.AddAppRateLimiting();
 builder.Services.AddAppAuthentication();
@@ -42,6 +39,8 @@ builder.Services.AddTransient<IPageDataProvider, PostPageData>();
 
 var app = builder.Build();
 
+app.MapDefaultEndpoints();
+
 // Run database migrations
 using (var scope = app.Services.CreateScope())
 {
@@ -52,8 +51,6 @@ using (var scope = app.Services.CreateScope())
 // Configure application middleware pipeline
 app.ConfigureAppMiddleware(builder.Configuration);
 
-app.MapGatewayProxy();
-
 app.UseDefaultFiles();
 app.UseStaticFiles(new StaticFileOptions
 {

DysonNetwork.Sphere/Realm/RealmController.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
 using Google.Protobuf.WellKnownTypes;
-using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace DysonNetwork.Sphere.Realm;
 

DysonNetwork.Sphere/Startup/MetricsConfiguration.cs

@@ -1,40 +0,0 @@
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
-using Prometheus;
-using Prometheus.SystemMetrics;
-
-namespace DysonNetwork.Sphere.Startup;
-
-public static class MetricsConfiguration
-{
-    public static IServiceCollection AddAppMetrics(this IServiceCollection services)
-    {
-        // Prometheus
-        services.UseHttpClientMetrics();
-        services.AddHealthChecks();
-        services.AddSystemMetrics();
-        services.AddPrometheusEntityFrameworkMetrics();
-        services.AddPrometheusAspNetCoreMetrics();
-        services.AddPrometheusHttpClientMetrics();
-
-        // OpenTelemetry
-        services.AddOpenTelemetry()
-            .WithTracing(tracing =>
-            {
-                tracing
-                    .AddAspNetCoreInstrumentation()
-                    .AddHttpClientInstrumentation()
-                    .AddOtlpExporter();
-            })
-            .WithMetrics(metrics =>
-            {
-                metrics
-                    .AddAspNetCoreInstrumentation()
-                    .AddHttpClientInstrumentation()
-                    .AddRuntimeInstrumentation()
-                    .AddOtlpExporter();
-            });
-
-        return services;
-    }
-}

DysonNetwork.Sphere/appsettings.json

@@ -39,8 +39,6 @@
   },
   "Service": {
     "Name": "DysonNetwork.Sphere",
-    "Url": "https://localhost:7099",
-    "ClientCert": "../Certificates/client.crt",
-    "ClientKey": "../Certificates/client.key"
+    "Url": "https://localhost:7099"
   }
 }