IGNITE-27423 .NET: Set LoggerFactory automatically in IgniteServiceCollectionExtensions (#7277)

Author: ptupitsyn

modules/platforms/dotnet/Apache.Ignite.Tests/IgniteServiceCollectionExtensionsTests.cs

@@ -153,6 +153,55 @@ public void TestRegisterScopesConfigurationFuncWithKeyKeyed([Values] ServiceLife
             (s, key) => s.AddIgniteClientGroupKeyed(key, (_, _) => CreateGroupConfig(), lifetime));
     }
 
+    [Test]
+    public void TestAutomaticLoggerFactorySetFromServices()
+    {
+        var services = new ServiceCollection();
+
+        var diLoggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+        services.AddSingleton(diLoggerFactory);
+
+        var config = new IgniteClientGroupConfiguration
+        {
+            ClientConfiguration = new IgniteClientConfiguration(_server.Endpoint)
+        };
+
+        services.AddIgniteClientGroup(config);
+
+        using var serviceProvider = services.BuildServiceProvider();
+        using var group = serviceProvider.GetRequiredService<IgniteClientGroup>();
+
+        var actualLoggerFactory = group.Configuration.ClientConfiguration.LoggerFactory;
+        Assert.AreSame(diLoggerFactory, actualLoggerFactory);
+    }
+
+    [Test]
+    public void TestCustomLoggerFactoryIsPreserved()
+    {
+        var services = new ServiceCollection();
+
+        var diLoggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+        services.AddSingleton(diLoggerFactory);
+
+        var customLoggerFactory = TestUtils.GetConsoleLoggerFactory(LogLevel.Trace);
+        var config = new IgniteClientGroupConfiguration
+        {
+            ClientConfiguration = new IgniteClientConfiguration(_server.Endpoint)
+            {
+                LoggerFactory = customLoggerFactory
+            }
+        };
+
+        services.AddIgniteClientGroup(config);
+
+        using var serviceProvider = services.BuildServiceProvider();
+        using var group = serviceProvider.GetRequiredService<IgniteClientGroup>();
+
+        var actualLoggerFactory = group.Configuration.ClientConfiguration.LoggerFactory;
+        Assert.AreSame(customLoggerFactory, actualLoggerFactory);
+        Assert.AreNotSame(diLoggerFactory, actualLoggerFactory);
+    }
+
     private static async Task ValidateRegisterSingleClient(Action<ServiceCollection> register, Func<IServiceProvider, IgniteClientGroup?> resolve)
     {
         var services = new ServiceCollection();

modules/platforms/dotnet/Apache.Ignite/IgniteServiceCollectionExtensions.cs

@@ -18,6 +18,8 @@ namespace Apache.Ignite;
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 /// <summary>
 /// Extension methods for setting up Apache Ignite services
@@ -140,7 +142,30 @@ private static IServiceCollection AddIgniteClientGroupCore(
         services.TryAdd(new ServiceDescriptor(
             typeof(IgniteClientGroup),
             key,
-            (sp, innerKey) => new IgniteClientGroup(configure(sp, innerKey)),
+            (serviceProvider, innerKey) =>
+            {
+                IgniteClientGroupConfiguration cfg = configure(serviceProvider, innerKey);
+
+                if (cfg.ClientConfiguration.LoggerFactory == NullLoggerFactory.Instance)
+                {
+                    // Use DI logger factory if none was provided.
+                    var diFactory = serviceProvider.GetService<ILoggerFactory>();
+
+                    if (diFactory != null && diFactory is not NullLoggerFactory)
+                    {
+                        // Create a new config to avoid modifying the one provided by the user.
+                        cfg = cfg with
+                        {
+                            ClientConfiguration = cfg.ClientConfiguration with
+                            {
+                                LoggerFactory = diFactory
+                            }
+                        };
+                    }
+                }
+
+                return new IgniteClientGroup(cfg);
+            },
             clientGroupLifetime));
 
         return services;

modules/platforms/dotnet/README.md

@@ -60,6 +60,31 @@ IJobExecution<int> jobExecution = await client.Compute.SubmitAsync(
 int wordCount = await jobExecution.GetResultAsync();
 ```
 
+## DI Integration
+
+Use `IgniteServiceCollectionExtensions.AddIgniteClientGroup` to register Ignite client in the dependency injection container:
+
+```cs
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddIgniteClientGroup(new IgniteClientGroupConfiguration
+{
+    Size = 1, // Client pool size, 1 is enough for most scenarios.
+    ClientConfiguration = new IgniteClientConfiguration("localhost:10942")
+});    
+```
+
+Inject `IgniteClientGroup` where needed:
+
+```cs
+app.MapGet("/tables", async ([FromServices] IgniteClientGroup igniteGrp) =>
+{
+    IIgnite ignite = await igniteGrp.GetIgniteAsync();
+
+    return await ignite.Tables.GetTablesAsync();
+});
+```
+
 # API Walkthrough
 
 ## Configuration