Skip to content

Fix incorrect registration of user configuration actions in generic AddJsonFile overloads #40

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

Merged
adams85 merged 3 commits into from
May 31, 2026
Merged

Fix incorrect registration of user configuration actions in generic AddJsonFile overloads #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d866c08
Fix incorrect registration of user configuration actions in generic A…
adams85 May 29, 2026
a8a1bcd
Add regression tests for generic AddJsonFile named options
gerritgoetzen May 30, 2026
a9a3ed2
Improve method order
adams85 May 31, 2026
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
27 changes: 21 additions & 6 deletions source/FileLogger.Json/JsonFileLoggerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,16 @@ public static ILoggingBuilder AddJsonFile<
Action<FileLoggerOptions>? configure = null, string? optionsName = null)
where TProvider : FileLoggerProvider
{
if (builder is null)
throw new ArgumentNullException(nameof(builder));

optionsName ??= typeof(TProvider).ToString();

builder.AddFile<TProvider>(context, configure: null, optionsName)
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName ?? typeof(TProvider).ToString());
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName);

if (configure is not null)
builder.Services.Configure(configure);
builder.Services.Configure(optionsName, configure);

return builder;
}
Expand All @@ -125,11 +130,16 @@ public static ILoggingBuilder AddJsonFile<
where TProvider : FileLoggerProvider
where TOptions : FileLoggerOptions
{
if (builder is null)
throw new ArgumentNullException(nameof(builder));

optionsName ??= typeof(TProvider).ToString();

builder.AddFile<TProvider, TOptions>(context, configure: null, optionsName)
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName ?? typeof(TProvider).ToString());
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName);

if (configure is not null)
builder.Services.Configure(configure);
builder.Services.Configure(optionsName, configure);

return builder;
}
Expand All @@ -145,11 +155,16 @@ public static ILoggingBuilder AddJsonFile<
where TProvider : FileLoggerProvider
where TOptions : FileLoggerOptions
{
if (builder is null)
throw new ArgumentNullException(nameof(builder));

optionsName ??= typeof(TProvider).ToString();

builder.AddFile<TProvider, TOptions>(bindOptions, context, configure: null, optionsName)
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName ?? typeof(TProvider).ToString());
.ConfigureTextBuilder(textBuilder ?? JsonFileLogEntryTextBuilder.Default, optionsName);

if (configure is not null)
builder.Services.Configure(configure);
builder.Services.Configure(optionsName, configure);

return builder;
}
Expand Down
50 changes: 50 additions & 0 deletions test/FileLogger.Test/SettingsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,4 +381,54 @@ static string BuildConfigJson(LogLevel defaultProviderLevel, LogLevel otherProvi
""
}, lines);
}

[Fact]
public void Issue39_GenericAddJsonFileAppliesUserConfigurationToNamedOptions()
{
const string optionsName = "MyJsonProvider";
const string basePath = "some-sentinel-base-path";

AssertUserConfigurationAppliesToNamedOptions(
lb => lb.AddJsonFile<OtherFileLoggerProvider>(configure: o => o.BasePath = basePath, optionsName: optionsName),
optionsName, basePath);
}

[Fact]
public void Issue39_GenericAddJsonFileWithOptionsAppliesUserConfigurationToNamedOptions()
{
const string optionsName = "MyJsonProvider";
const string basePath = "some-sentinel-base-path";

AssertUserConfigurationAppliesToNamedOptions(
lb => lb.AddJsonFile<OtherFileLoggerProvider, FileLoggerOptions>(configure: o => o.BasePath = basePath, optionsName: optionsName),
optionsName, basePath);
}

[Fact]
public void Issue39_GenericAddJsonFileWithBindOptionsAppliesUserConfigurationToNamedOptions()
{
const string optionsName = "MyJsonProvider";
const string basePath = "some-sentinel-base-path";

AssertUserConfigurationAppliesToNamedOptions(
lb => lb.AddJsonFile<OtherFileLoggerProvider, FileLoggerOptions>(bindOptions: (o, c) => { }, configure: o => o.BasePath = basePath, optionsName: optionsName),
optionsName, basePath);
}

private static void AssertUserConfigurationAppliesToNamedOptions(
Action<ILoggingBuilder> configureLogging, string optionsName, string expectedBasePath)
{
var services = new ServiceCollection();
services.AddLogging(configureLogging);

using ServiceProvider serviceProvider = services.BuildServiceProvider();

// The provider resolves its settings via IOptionsMonitor.Get(optionsName), so the user
// configuration callback must be applied to the named options instance, not Options.DefaultName.
IOptionsMonitor<FileLoggerOptions> optionsMonitor =
serviceProvider.GetRequiredService<IOptionsMonitor<FileLoggerOptions>>();

Assert.Equal(expectedBasePath, optionsMonitor.Get(optionsName).BasePath);
Assert.NotEqual(expectedBasePath, optionsMonitor.Get(Options.DefaultName).BasePath);
}
}
Loading