Update places where BindConfiguration is called, which registers anonymous delegates, and is thus not safe to be called multiple times. (#1609)

With a pre-check in place, several Try* methods behind it can be replaced for efficiency, but only if:
- The implementation is an internal type and does not implement a public interface
- The implementation type is not shared between Steeltoe components

Author: bart-vmware

src/Configuration/src/CloudFoundry/CloudFoundryServiceCollectionExtensions.cs

@@ -28,17 +28,25 @@ public static IServiceCollection AddCloudFoundryOptions(this IServiceCollection
     {
         ArgumentNullException.ThrowIfNull(services);
 
-        services.AddOptions<CloudFoundryServicesOptions>().BindConfiguration("vcap");
+        if (!IsRegistered(services))
+        {
+            services.AddOptions<CloudFoundryServicesOptions>().BindConfiguration("vcap");
 
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<ApplicationInstanceInfo>, ConfigureApplicationInstanceInfo>());
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<CloudFoundryApplicationOptions>, ConfigureCloudFoundryApplicationOptions>());
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<IConfigureOptions<ApplicationInstanceInfo>, ConfigureApplicationInstanceInfo>());
+            services.AddSingleton<IConfigureOptions<CloudFoundryApplicationOptions>, ConfigureCloudFoundryApplicationOptions>();
 
-        services.Replace(ServiceDescriptor.Singleton<IApplicationInstanceInfo>(serviceProvider =>
-        {
-            var optionsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<CloudFoundryApplicationOptions>>();
-            return optionsMonitor.CurrentValue;
-        }));
+            services.Replace(ServiceDescriptor.Singleton<IApplicationInstanceInfo>(serviceProvider =>
+            {
+                var optionsMonitor = serviceProvider.GetRequiredService<IOptionsMonitor<CloudFoundryApplicationOptions>>();
+                return optionsMonitor.CurrentValue;
+            }));
+        }
 
         return services;
     }
+
+    private static bool IsRegistered(IServiceCollection services)
+    {
+        return services.Any(descriptor => descriptor.SafeGetImplementationType() == typeof(ConfigureCloudFoundryApplicationOptions));
+    }
 }

src/Configuration/test/CloudFoundry.Test/CloudFoundryHostBuilderExtensionsTest.cs

@@ -63,4 +63,18 @@ public void HostApplicationAddCloudFoundryConfiguration_Adds()
 
         configurationRoot.EnumerateProviders<CloudFoundryConfigurationProvider>().Should().ContainSingle();
     }
+
+    [Fact]
+    public void Does_not_register_multiple_times()
+    {
+        WebApplicationBuilder hostBuilder = TestWebApplicationBuilderFactory.Create();
+        hostBuilder.AddCloudFoundryConfiguration();
+        int beforeSourceCount = hostBuilder.Configuration.EnumerateSources().Count();
+        int beforeServiceCount = hostBuilder.Services.Count;
+
+        hostBuilder.AddCloudFoundryConfiguration();
+
+        hostBuilder.Configuration.EnumerateSources().Count().Should().Be(beforeSourceCount);
+        hostBuilder.Services.Count.Should().Be(beforeServiceCount);
+    }
 }

src/Discovery/src/Configuration/ConfigurationServiceCollectionExtensions.cs

@@ -4,6 +4,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Steeltoe.Common;
 using Steeltoe.Common.Discovery;
 
 namespace Steeltoe.Discovery.Configuration;
@@ -49,11 +50,19 @@ public static IServiceCollection AddConfigurationDiscoveryClient(this IServiceCo
     {
         ArgumentNullException.ThrowIfNull(services);
 
-        services.AddOptions<ConfigurationDiscoveryOptions>().BindConfiguration(ConfigurationDiscoveryOptions.ConfigurationPrefix);
+        if (!IsRegistered(services))
+        {
+            services.AddOptions<ConfigurationDiscoveryOptions>().BindConfiguration(ConfigurationDiscoveryOptions.ConfigurationPrefix);
 
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IDiscoveryClient, ConfigurationDiscoveryClient>());
-        services.AddHostedService<DiscoveryClientHostedService>();
+            services.TryAddEnumerable(ServiceDescriptor.Singleton<IDiscoveryClient, ConfigurationDiscoveryClient>());
+            services.AddHostedService<DiscoveryClientHostedService>();
+        }
 
         return services;
     }
+
+    private static bool IsRegistered(IServiceCollection services)
+    {
+        return services.Any(descriptor => descriptor.SafeGetImplementationType() == typeof(ConfigurationDiscoveryClient));
+    }
 }

src/Discovery/src/Consul/ConsulServiceCollectionExtensions.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
+using Steeltoe.Common;
 using Steeltoe.Common.Discovery;
 using Steeltoe.Common.Extensions;
 using Steeltoe.Common.HealthChecks;
@@ -32,12 +33,20 @@ public static IServiceCollection AddConsulDiscoveryClient(this IServiceCollectio
     {
         ArgumentNullException.ThrowIfNull(services);
 
-        ConfigureConsulServices(services);
-        AddConsulServices(services);
+        if (!IsRegistered(services))
+        {
+            ConfigureConsulServices(services);
+            AddConsulServices(services);
+        }
 
         return services;
     }
 
+    private static bool IsRegistered(IServiceCollection services)
+    {
+        return services.Any(descriptor => descriptor.SafeGetImplementationType() == typeof(PostConfigureConsulDiscoveryOptions));
+    }
+
     private static void ConfigureConsulServices(IServiceCollection services)
     {
         services.AddApplicationInstanceInfo();
@@ -96,6 +105,6 @@ private static void AddConsulServices(IServiceCollection services)
         services.AddSingleton<ConsulServiceRegistrar>();
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IDiscoveryClient, ConsulDiscoveryClient>());
         services.AddHostedService<DiscoveryClientHostedService>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IHealthContributor, ConsulHealthContributor>());
+        services.AddSingleton<IHealthContributor, ConsulHealthContributor>();
     }
 }

src/Discovery/src/Eureka/EurekaServiceCollectionExtensions.cs

@@ -35,7 +35,7 @@ public static IServiceCollection AddEurekaDiscoveryClient(this IServiceCollectio
     {
         ArgumentNullException.ThrowIfNull(services);
 
-        if (services.All(descriptor => descriptor.SafeGetImplementationType() != typeof(EurekaDiscoveryClient)))
+        if (!IsRegistered(services))
         {
             ConfigureEurekaServices(services);
             AddEurekaServices(services);
@@ -44,6 +44,11 @@ public static IServiceCollection AddEurekaDiscoveryClient(this IServiceCollectio
         return services;
     }
 
+    private static bool IsRegistered(IServiceCollection services)
+    {
+        return services.Any(descriptor => descriptor.SafeGetImplementationType() == typeof(EurekaDiscoveryClient));
+    }
+
     private static void ConfigureEurekaServices(IServiceCollection services)
     {
         services.AddApplicationInstanceInfo();
@@ -86,9 +91,9 @@ private static void ConfigureEurekaInstanceOptions(IServiceCollection services)
     private static void AddEurekaServices(IServiceCollection services)
     {
         services.TryAddSingleton(TimeProvider.System);
-        services.AddSingleton<HealthCheckHandlerProvider>();
-        services.TryAddEnumerable(ServiceDescriptor.Singleton<IHealthContributor, EurekaServerHealthContributor>());
-        services.AddSingleton<EurekaApplicationInfoManager>();
+        services.TryAddSingleton<HealthCheckHandlerProvider>();
+        services.AddSingleton<IHealthContributor, EurekaServerHealthContributor>();
+        services.TryAddSingleton<EurekaApplicationInfoManager>();
 
         services.TryAddSingleton<EurekaDiscoveryClient>();
         services.AddSingleton<IDiscoveryClient>(serviceProvider => serviceProvider.GetRequiredService<EurekaDiscoveryClient>());
@@ -103,9 +108,9 @@ private static void AddEurekaServices(IServiceCollection services)
     private static void AddEurekaClient(IServiceCollection services)
     {
         services.TryAddSingleton<HttpClientHandlerFactory>();
-        services.TryAddSingleton<ValidateCertificatesHttpClientHandlerConfigurer<EurekaClientOptions>>();
+        services.AddSingleton<ValidateCertificatesHttpClientHandlerConfigurer<EurekaClientOptions>>();
         services.TryAddSingleton<ClientCertificateHttpClientHandlerConfigurer>();
-        services.TryAddSingleton<EurekaHttpClientHandlerConfigurer>();
+        services.AddSingleton<EurekaHttpClientHandlerConfigurer>();
         services.ConfigureCertificateOptions("Eureka");
 
         IHttpClientBuilder eurekaHttpClientBuilder = services.AddHttpClient("Eureka");

src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs

@@ -179,4 +179,16 @@ public async Task RegistersHostedService()
 
         serviceProvider.GetServices<IHostedService>().OfType<DiscoveryClientHostedService>().Should().ContainSingle();
     }
+
+    [Fact]
+    public void Does_not_register_multiple_times()
+    {
+        var services = new ServiceCollection();
+        services.AddConfigurationDiscoveryClient();
+        int beforeServiceCount = services.Count;
+
+        services.AddConfigurationDiscoveryClient();
+
+        services.Count.Should().Be(beforeServiceCount);
+    }
 }

src/Discovery/test/HttpClients.Test/RegisterMultipleDiscoveryClientsTest.cs

@@ -873,4 +873,20 @@ public async Task WithMultipleClients_AddsDiscoveryClients()
         serviceProvider.GetServices<IHealthContributor>().OfType<EurekaServerHealthContributor>().Should().ContainSingle();
         serviceProvider.GetServices<IHealthContributor>().OfType<EurekaApplicationsHealthContributor>().Should().BeEmpty();
     }
+
+    [Fact]
+    public void WithMultipleClients_DotNotRegisterMultipleTimes()
+    {
+        var services = new ServiceCollection();
+        services.AddConfigurationDiscoveryClient();
+        services.AddConsulDiscoveryClient();
+        services.AddEurekaDiscoveryClient();
+        int beforeServiceCount = services.Count;
+
+        services.AddConfigurationDiscoveryClient();
+        services.AddConsulDiscoveryClient();
+        services.AddEurekaDiscoveryClient();
+
+        services.Count.Should().Be(beforeServiceCount);
+    }
 }

src/Logging/src/DynamicSerilog/SerilogLoggingBuilderExtensions.cs

@@ -104,7 +104,7 @@ public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, Lo
     private static bool IsSerilogDynamicLoggerProviderAlreadyRegistered(ILoggingBuilder builder)
     {
         return builder.Services.Any(descriptor =>
-            descriptor.ServiceType == typeof(ILoggerProvider) && descriptor.SafeGetImplementationType() == typeof(DynamicSerilogLoggerProvider));
+            descriptor.SafeGetImplementationType() == typeof(DynamicSerilogLoggerProvider) && descriptor.ServiceType == typeof(ILoggerProvider));
     }
 
     private static void AssertNoDynamicLoggerProviderRegistered(ILoggingBuilder builder)