Unify picture configuration and options registration

backend/Core/Musify.Infrastructure/Observability/OpenTelemetryDependencyInjection.cs

@@ -1,35 +1,29 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Musify.Infrastructure.Configuration;
 using OpenTelemetry.Exporter;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
+using Musify.Application.Configuration;
 
 namespace Musify.Infrastructure.Observability;
 
 public static class OpenTelemetryDependencyInjection
 {
-    public static IServiceCollection AddObservability(this IServiceCollection serviceDescriptors, IConfiguration configuration)
+    public static IServiceCollection AddObservability(this IServiceCollection services, IConfiguration configuration)
     {
-        serviceDescriptors
-            .AddOptionsWithValidateOnStart<OpenTelemetryConfiguration>()
-            .Bind(configuration.GetRequiredSection(OpenTelemetryConfiguration.SectionName))
-            .ValidateDataAnnotations();
+        services.AddValidatedOptions<OpenTelemetryConfiguration>(configuration);
 
-        serviceDescriptors.AddSingleton(serviceProvider =>
-            serviceProvider.GetRequiredService<IOptions<OpenTelemetryConfiguration>>().Value);
-
-        serviceDescriptors
+        services
             .AddOptions<OtlpExporterOptions>()
             .Configure<OpenTelemetryConfiguration>((exporterOptions, openTelemetryConfiguration) =>
             {
                 exporterOptions.Endpoint = new Uri(openTelemetryConfiguration.OtlpEndpoint);
             });
 
-        serviceDescriptors
+        services
             .AddOpenTelemetry()
             .ConfigureResource(resource =>
             {
@@ -54,6 +48,6 @@ public static class OpenTelemetryDependencyInjection
                 logging.AddOtlpExporter()
             );
 
-        return serviceDescriptors;
+        return services;
     }
 }