Skip to content

[feature/10.0] Fix a few binding callsites #8262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feature/10.0
Choose a base branch
from
Open

[feature/10.0] Fix a few binding callsites #8262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/Tools/dotnet-monitor/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
using Microsoft.Diagnostics.Tools.Monitor.Stacks;
using Microsoft.Diagnostics.Tools.Monitor.StartupHook;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Binder.SourceGeneration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.FileProviders;
Expand All @@ -49,43 +50,43 @@ internal static class ServiceCollectionExtensions
{
public static IServiceCollection ConfigureCors(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<CorsConfigurationOptions>(configuration.GetSection(ConfigurationKeys.CorsConfiguration));
return BindingExtensions.Configure<CorsConfigurationOptions>(services, configuration.GetSection(ConfigurationKeys.CorsConfiguration));
}

public static IServiceCollection ConfigureDotnetMonitorDebug(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<DotnetMonitorDebugOptions>(configuration.GetSection(ConfigurationKeys.DotnetMonitorDebug));
return BindingExtensions.Configure<DotnetMonitorDebugOptions>(services, configuration.GetSection(ConfigurationKeys.DotnetMonitorDebug));
}

public static IServiceCollection ConfigureGlobalCounter(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<GlobalCounterOptions>(configuration.GetSection(ConfigurationKeys.GlobalCounter))
return BindingExtensions.Configure<GlobalCounterOptions>(services, configuration.GetSection(ConfigurationKeys.GlobalCounter))
.AddSingleton<IValidateOptions<GlobalCounterOptions>, DataAnnotationValidateOptions<GlobalCounterOptions>>();

}

public static IServiceCollection ConfigureCollectionRuleDefaults(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<CollectionRuleDefaultsOptions>(configuration.GetSection(ConfigurationKeys.CollectionRuleDefaults));
return BindingExtensions.Configure<CollectionRuleDefaultsOptions>(services, configuration.GetSection(ConfigurationKeys.CollectionRuleDefaults));
}

public static IServiceCollection ConfigureTemplates(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<TemplateOptions>(configuration.GetSection(ConfigurationKeys.Templates));
return BindingExtensions.Configure<TemplateOptions>(services, configuration.GetSection(ConfigurationKeys.Templates));
}

public static IServiceCollection ConfigureInProcessFeatures(this IServiceCollection services, IConfiguration configuration)
{
services.Configure<CallStacksOptions>(configuration.GetSection(ConfigurationKeys.InProcessFeatures_CallStacks))
BindingExtensions.Configure<CallStacksOptions>(services, configuration.GetSection(ConfigurationKeys.InProcessFeatures_CallStacks))
.AddSingleton<IPostConfigureOptions<CallStacksOptions>, CallStacksPostConfigureOptions>();

services.Configure<ExceptionsOptions>(configuration.GetSection(ConfigurationKeys.InProcessFeatures_Exceptions))
BindingExtensions.Configure<ExceptionsOptions>(services, configuration.GetSection(ConfigurationKeys.InProcessFeatures_Exceptions))
.AddSingleton<IPostConfigureOptions<ExceptionsOptions>, ExceptionsPostConfigureOptions>();

services.Configure<ParameterCapturingOptions>(configuration.GetSection(ConfigurationKeys.InProcessFeatures_ParameterCapturing))
BindingExtensions.Configure<ParameterCapturingOptions>(services, configuration.GetSection(ConfigurationKeys.InProcessFeatures_ParameterCapturing))
.AddSingleton<IPostConfigureOptions<ParameterCapturingOptions>, ParameterCapturingPostConfigureOptions>();

services.Configure<InProcessFeaturesOptions>(configuration.GetSection(ConfigurationKeys.InProcessFeatures))
BindingExtensions.Configure<InProcessFeaturesOptions>(services, configuration.GetSection(ConfigurationKeys.InProcessFeatures))
.AddSingleton<InProcessFeaturesService>()
.AddSingleton<IEndpointInfoSourceCallbacks, InProcessFeaturesEndpointInfoSourceCallbacks>();

Expand All @@ -94,7 +95,7 @@ public static IServiceCollection ConfigureInProcessFeatures(this IServiceCollect

public static IServiceCollection ConfigureMetrics(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<MetricsOptions>(configuration.GetSection(ConfigurationKeys.Metrics))
return BindingExtensions.Configure<MetricsOptions>(services, configuration.GetSection(ConfigurationKeys.Metrics))
.AddSingleton<IValidateOptions<MetricsOptions>, DataAnnotationValidateOptions<MetricsOptions>>()
.AddSingleton<MetricsStoreService>()
.AddHostedService<MetricsService>()
Expand All @@ -103,7 +104,7 @@ public static IServiceCollection ConfigureMetrics(this IServiceCollection servic

public static IServiceCollection ConfigureMonitorApiKeyOptions(this IServiceCollection services, IConfiguration configuration, bool allowConfigurationUpdates)
{
services.Configure<MonitorApiKeyOptions>(configuration.GetSection(ConfigurationKeys.MonitorApiKey));
BindingExtensions.Configure<MonitorApiKeyOptions>(services, configuration.GetSection(ConfigurationKeys.MonitorApiKey));

// Loads and validates MonitorApiKeyOptions into MonitorApiKeyConfiguration
services.AddSingleton<IPostConfigureOptions<MonitorApiKeyConfiguration>, MonitorApiKeyPostConfigure>();
Expand Down Expand Up @@ -237,7 +238,7 @@ public static IServiceCollection RegisterCollectionRuleTrigger<TFactory, TOption

public static IServiceCollection ConfigureStorage(this IServiceCollection services, IConfiguration configuration)
{
services.Configure<StorageOptions>(configuration.GetSection(ConfigurationKeys.Storage));
BindingExtensions.Configure<StorageOptions>(services, configuration.GetSection(ConfigurationKeys.Storage));
services.AddSingleton<IPostConfigureOptions<StorageOptions>, StoragePostConfigureOptions>();
return services;
}
Expand All @@ -255,7 +256,7 @@ public static IServiceCollection ConfigureCapabilities(this IServiceCollection s

public static IServiceCollection ConfigureDefaultProcess(this IServiceCollection services, IConfiguration configuration)
{
return services.Configure<ProcessFilterOptions>(configuration.GetSection(ConfigurationKeys.DefaultProcess));
return BindingExtensions.Configure<ProcessFilterOptions>(services, configuration.GetSection(ConfigurationKeys.DefaultProcess));
}

public static IServiceCollection ConfigureExtensions(this IServiceCollection services)
Expand Down Expand Up @@ -333,7 +334,7 @@ public static IServiceCollection ConfigureEgress(this IServiceCollection service

public static IServiceCollection ConfigureDiagnosticPort(this IServiceCollection services, IConfiguration configuration)
{
services.Configure<DiagnosticPortOptions>(configuration.GetSection(ConfigurationKeys.DiagnosticPort));
BindingExtensions.Configure<DiagnosticPortOptions>(services, configuration.GetSection(ConfigurationKeys.DiagnosticPort));
services.AddSingleton<IPostConfigureOptions<DiagnosticPortOptions>, DiagnosticPortPostConfigureOptions>();
services.AddSingleton<IValidateOptions<DiagnosticPortOptions>, DiagnosticPortValidateOptions>();

Expand Down