Skip to content
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

Remove startup overhead caused by enumerating all assemblies for callsite logic #485

Merged
merged 2 commits into from
Aug 26, 2021
Merged

Remove startup overhead caused by enumerating all assemblies for callsite logic #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e901fc7
Removed unnecessary enumeration of all assemblies for NetStandard2 (a…
snakefoot Feb 28, 2021
00ffa03
Merge branch 'master' into AddHiddenAssemblyFaster2
snakefoot Jun 14, 2021
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
2 changes: 1 addition & 1 deletion src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOption
private static void AddNLogLoggerProvider(IServiceCollection services, IConfiguration configuration, NLogProviderOptions options, Func<IServiceProvider, IConfiguration, NLogProviderOptions, NLogLoggerProvider> factory)
{
ConfigurationItemFactory.Default.RegisterItemsFromAssembly(typeof(ConfigureExtensions).GetTypeInfo().Assembly);

LogManager.AddHiddenAssembly(typeof(ConfigureExtensions).GetTypeInfo().Assembly);
services.TryAddNLogLoggingProvider((svc, addlogging) => svc.AddLogging(addlogging), configuration, options, factory);
}

Expand Down
42 changes: 6 additions & 36 deletions src/NLog.Extensions.Logging/Logging/NLogLoggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,53 +99,23 @@ protected virtual void Dispose(bool disposing)
private static void RegisterHiddenAssembliesForCallSite()
{
InternalLogger.Debug("Hide assemblies for callsite");
LogManager.AddHiddenAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);
Config.ConfigurationItemFactory.Default.RegisterItemsFromAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);

LogManager.AddHiddenAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.ILogger).GetTypeInfo().Assembly);

#if !NETCORE1_0
var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
foreach (var assembly in allAssemblies)
{
if (ShouldAddHiddenAssembly(assembly))
{
LogManager.AddHiddenAssembly(assembly);
}
}
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.LoggerFactory).GetTypeInfo().Assembly);
#else
SafeAddHiddenAssembly("Microsoft.Logging");
SafeAddHiddenAssembly("Microsoft.Extensions.Logging");
SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Abstractions");

//try the Filter ext, this one is not mandatory so could fail
SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Filter", false);
#endif
}

#if !NETCORE1_0
private static bool ShouldAddHiddenAssembly(Assembly assembly)
{
var assemblyFullName = assembly?.FullName;
if (string.IsNullOrEmpty(assemblyFullName))
return false;

foreach (var hiddenAssemblyPrefix in HiddenAssemblyPrefixes)
if (assemblyFullName.StartsWith(hiddenAssemblyPrefix, StringComparison.OrdinalIgnoreCase))
return true;

return false;
}

private static readonly string[] HiddenAssemblyPrefixes = new[]
{
"NLog.Extensions.Logging,",
"NLog.Web,",
"NLog.Web.AspNetCore,",
"Microsoft.Extensions.Logging,",
"Microsoft.Extensions.Logging.Abstractions,",
"Microsoft.Extensions.Logging.Filter,",
"Microsoft.Logging,"
};
#else
#if NETCORE1_0
private static void SafeAddHiddenAssembly(string assemblyName, bool logOnException = true)
{
try
Expand All @@ -163,7 +133,7 @@ private static void SafeAddHiddenAssembly(string assemblyName, bool logOnExcepti
}
}
#endif
}
}
}