Merge pull request #2460 from RocketSurgeonsGuild/fix-blazor

fix-blazor

Author: david-driscoll

Directory.Packages.props

@@ -27,6 +27,8 @@
         <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" />
         <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
         <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
+        <PackageVersion Include="OpenTelemetry.AutoInstrumentation" Version="1.9.0" />
+        <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.10.0-beta.1" />
         <PackageVersion Include="PartiallyApplied" Version="1.3.0" />
         <PackageVersion Include="Serilog.Enrichers.AssemblyName" Version="2.0.0" />
         <PackageVersion Include="Serilog.Enrichers.Demystifier" Version="1.0.3" />

sample/Sample.Minimal/CustomHostedService.cs

@@ -8,7 +8,6 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers().AddControllersAsServices();
-builder.Services.AddHostedService<CustomHostedService>();
 
 var app = await builder.ConfigureRocketSurgery();
 app.UseExceptionHandler();

sample/Sample.Minimal/CustomHostedServiceOptions.cs

@@ -1,7 +1,4 @@
-using FluentValidation;
-
 using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Options;
 
 using Rocket.Surgery.Hosting;
 using Rocket.Surgery.LaunchPad.AspNetCore;
@@ -11,7 +8,6 @@
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddControllers().AddControllersAsServices();
-builder.Services.AddHostedService<CustomHostedService>();
 
 var app = await builder.ConfigureRocketSurgery();
 app.UseExceptionHandler();
@@ -53,24 +49,3 @@
 app.Run();
 
 public partial class Program;
-
-internal class CustomHostedServiceOptions
-{
-    public string? A { get; set; }
-
-    [UsedImplicitly]
-    private sealed class Validator : AbstractValidator<CustomHostedServiceOptions>
-    {
-        public Validator() => RuleFor(z => z.A).NotNull();
-    }
-}
-
-internal class CustomHostedService(IOptions<CustomHostedServiceOptions> options) : BackgroundService
-{
-    protected override Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        // ReSharper disable once UnusedVariable
-        var v = options.Value.A;
-        return Task.CompletedTask;
-    }
-}

sample/Sample.Minimal/Program.cs

@@ -1,13 +1,10 @@
-using System.Globalization;
-
 using FluentValidation;
 
 using MediatR;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Options;
 
 using Rocket.Surgery.Conventions;
@@ -56,31 +53,9 @@ public void Register(IConventionContext context, IConfiguration configuration, I
                     .WithTransientLifetime()
             );
 
-        if (_options.RegisterValidationOptionsAsHealthChecks == true
-         || ( !_options.RegisterValidationOptionsAsHealthChecks.HasValue
-             && Convert.ToBoolean(
-                    context.Properties["RegisterValidationOptionsAsHealthChecks"],
-                    CultureInfo.InvariantCulture
-                ) )
-         || Environment.CommandLine.Contains(
-                "microsoft.extensions.apidescription.server",
-                StringComparison.OrdinalIgnoreCase
-            ))
-        {
-            // need to do validations using ValidateOnStart
-            services.Decorate<HealthCheckService, CustomHealthCheckService>();
-            services.AddSingleton<ValidationHealthCheckResults>();
-            services.AddSingleton(typeof(IValidateOptions<>), typeof(HealthCheckFluentValidationOptions<>));
-        }
-        else
-        {
-            services.AddSingleton(typeof(IValidateOptions<>), typeof(FluentValidationOptions<>));
-        }
-
+        services.AddSingleton(typeof(IValidateOptions<>), typeof(FluentValidationOptions<>));
         services.TryAddEnumerable(ServiceDescriptor.Describe(typeof(IPipelineBehavior<,>), typeof(ValidationPipelineBehavior<,>), _options.MediatorLifetime));
-        services.TryAddEnumerable(
-            ServiceDescriptor.Describe(typeof(IStreamPipelineBehavior<,>), typeof(ValidationStreamPipelineBehavior<,>), _options.MediatorLifetime)
-        );
+        services.TryAddEnumerable(ServiceDescriptor.Describe(typeof(IStreamPipelineBehavior<,>), typeof(ValidationStreamPipelineBehavior<,>), _options.MediatorLifetime));
     }
 
     private readonly FoundationOptions _options = options ?? new FoundationOptions();

sample/Sample.Restful/Program.cs

@@ -1,7 +1,9 @@
 using Microsoft.Extensions.Configuration;
+
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
+
 using Rocket.Surgery.Conventions;
 using Rocket.Surgery.LaunchPad.Telemetry;
 
@@ -21,6 +23,11 @@ public class InstrumentationConvention : IOpenTelemetryConvention
     public void Register(IConventionContext context, IConfiguration configuration, IOpenTelemetryBuilder builder)
     {
         builder.WithTracing(b => b.AddHttpClientInstrumentation(x => x.RecordException = true));
-        builder.WithMetrics(b => b.AddRuntimeInstrumentation().AddHttpClientInstrumentation());
+        builder.WithMetrics(
+            b => b
+                .AddHttpClientInstrumentation()
+                .AddRuntimeInstrumentation()
+                .AddProcessInstrumentation()
+        );
     }
 }

src/Foundation/Conventions/FluentValidationConvention.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+
 using NodaTime.TimeZones;
 
 namespace Rocket.Surgery.LaunchPad.Foundation;
@@ -28,4 +29,4 @@ public class FoundationOptions
     ///     Validation options are registered as health checks instead of throwing and stopping application startup
     /// </summary>
     public bool? RegisterValidationOptionsAsHealthChecks { get; set; }
-}
+}

src/Foundation/Conventions/InstrumentationConvention.cs

@@ -24,10 +24,6 @@
         <PackageReference Include="NodaTime.Serialization.SystemTextJson" />
         <PackageReference Include="Rocket.Surgery.Conventions" />
         <PackageReference Include="Rocket.Surgery.DependencyInjection.Extensions" />
-        <PackageReference Include="Scrutor" />
-        <PackageReference Include="Serilog.Enrichers.Demystifier" />
-        <PackageReference Include="Serilog.Sinks.ApplicationInsights" />
-        <PackageReference Include="Serilog.Sinks.OpenTelemetry" />
         <PackageReference Include="System.Collections.Immutable" />
         <PackageReference Include="System.Interactive" />
         <PackageReference Include="System.Interactive.Async" />
@@ -36,11 +32,23 @@
         <PackageReference Include="System.Text.Json" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Process" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Serilog\Rocket.Surgery.LaunchPad.Serilog.csproj" />
         <ProjectReference Include="..\Telemetry\Rocket.Surgery.LaunchPad.Telemetry.csproj" />
-        <ProjectReference Include="..\Analyzers\Rocket.Surgery.LaunchPad.Analyzers.csproj" IncludeAssets="analyzers" ExcludeAssets="compile;runtime;native" PrivateAssets="contentfiles;build;buildMultitargeting;buildTransitive" OutputItemType="Analyzer" />
-        <PackageReference Include="Polyfill" IncludeAssets="runtime;build;buildMultitargeting;buildTransitive;native;contentfiles;analyzers" PrivateAssets="All" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
+        <ProjectReference
+            Include="..\Analyzers\Rocket.Surgery.LaunchPad.Analyzers.csproj"
+            IncludeAssets="analyzers"
+            ExcludeAssets="compile;runtime;native"
+            PrivateAssets="contentfiles;build;buildMultitargeting;buildTransitive"
+            OutputItemType="Analyzer"
+        />
+        <PackageReference
+            Include="Polyfill"
+            IncludeAssets="runtime;build;buildMultitargeting;buildTransitive;native;contentfiles;analyzers"
+            PrivateAssets="All"
+            Condition="'$(TargetFramework)' == 'netstandard2.1'"
+        />
     </ItemGroup>
 </Project>

src/Foundation/FoundationOptions.cs

@@ -1,5 +1,7 @@
 using FluentValidation;
+
 using Microsoft.Extensions.Options;
+
 using Rocket.Surgery.LaunchPad.Foundation.Extensions;
 
 namespace Rocket.Surgery.LaunchPad.Foundation.Validation;
@@ -8,24 +10,20 @@ namespace Rocket.Surgery.LaunchPad.Foundation.Validation;
 ///     This class enables fluent validators to be used for options validations!
 /// </summary>
 /// <typeparam name="T"></typeparam>
-internal class FluentValidationOptions<T>(
-    ValidationHealthCheckResults? healthCheckResults = null,
-    IValidator<T>? validator = null
-)
+internal class FluentValidationOptions<T>(IValidator<T>? validator = null)
     : IValidateOptions<T>
     where T : class
 {
     public virtual ValidateOptionsResult Validate(string? name, T options)
     {
-        if (validator == null) return ValidateOptionsResult.Skip;
+        if (validator is null) return ValidateOptionsResult.Skip;
 
         var result = validator.Validate(options);
-        healthCheckResults?.AddResult(typeof(T).GetNestedTypeName(), name ?? Options.DefaultName, result);
-        if (result.IsValid) return ValidateOptionsResult.Success;
-
-        return ValidateOptionsResult.Fail(
-            new[] { $"Failure while validating {typeof(T).GetNestedTypeName()}{( name == Options.DefaultName ? "" : $" (Name: {name})" )}." }
-               .Concat(result.Errors.Select(z => z.ToString()))
-        );
+        return result.IsValid
+            ? ValidateOptionsResult.Success
+            : ValidateOptionsResult.Fail(
+                new[] { $"Failure while validating {typeof(T).GetNestedTypeName()}{( name == Options.DefaultName ? "" : $" (Name: {name})" )}." }
+                   .Concat(result.Errors.Select(z => z.ToString()))
+            );
     }
 }

src/Foundation/Rocket.Surgery.LaunchPad.Foundation.csproj

@@ -1,22 +1,22 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Configuration;
+
 using Rocket.Surgery.Conventions;
 using Rocket.Surgery.LaunchPad.Serilog;
+
 using Serilog;
 
-namespace Rocket.Surgery.LaunchPad.Foundation.Conventions;
+namespace Rocket.Surgery.LaunchPad.Hosting.Conventions;
 
 /// <summary>
-/// Defines serilog telemetry configuration
+///     Defines serilog telemetry configuration
 /// </summary>
 [PublicAPI]
 [ExportConvention]
 [ConventionCategory(ConventionCategory.Core)]
 public partial class SerilogTelemetryConvention : ISerilogConvention
 {
     /// <inheritdoc />
-    public void Register(IConventionContext context, IConfiguration configuration, IServiceProvider services, LoggerConfiguration loggerConfiguration)
-    {
+    [RequiresUnreferencedCode("Serilog")]
+    public void Register(IConventionContext context, IConfiguration configuration, IServiceProvider services, LoggerConfiguration loggerConfiguration) =>
         loggerConfiguration.WriteTo.OpenTelemetry(_ => { }, configuration.GetValue<string>);
-    }
 }