src/KPI Generator/KPI Generator.csproj

@@ -7,7 +7,7 @@
 		<AssemblyName>Coscine.KpiGenerator</AssemblyName>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.1.11</Version>
+		<Version>0.1.12</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

src/KPI Generator/Program.cs

@@ -15,7 +15,7 @@ namespace Coscine.KpiGenerator;
 
 public class Program
 {
-    private static ILogger _logger = null!;
+    private static ILogger<Program> _logger = null!;
 
     public static int Main(string[] args)
     {
@@ -34,12 +34,12 @@ public class Program
                 SystemReportingOptions
                 >(args)
             .MapResult(
-              (CompleteReportingOptions options) => new CompleteReporting(SanitizeOptions(options), _logger).Run(),
-              (ProjectReportingOptions options) => new ProjectReporting(SanitizeOptions(options), _logger).Run(),
-              (ResourceReportingOptions options) => new ResourceReporting(SanitizeOptions(options), _logger).Run(),
-              (UserReportingOptions options) => new UserReporting(SanitizeOptions(options), _logger).Run(),
-              (ApplicationProfileReportingOptions options) => new ApplicationProfileReporting(SanitizeOptions(options), _logger).Run(),
-              (SystemReportingOptions options) => new SystemReporting(SanitizeOptions(options), _logger).Run(),
+              (CompleteReportingOptions options) => new CompleteReporting(SanitizeOptions(options)).Run(),
+              (ProjectReportingOptions options) => new ProjectReporting(SanitizeOptions(options)).Run(),
+              (ResourceReportingOptions options) => new ResourceReporting(SanitizeOptions(options)).Run(),
+              (UserReportingOptions options) => new UserReporting(SanitizeOptions(options)).Run(),
+              (ApplicationProfileReportingOptions options) => new ApplicationProfileReporting(SanitizeOptions(options)).Run(),
+              (SystemReportingOptions options) => new SystemReporting(SanitizeOptions(options)).Run(),
               _ => false);
             if (result)
             {

src/KPI Generator/Reporting.cs

@@ -5,10 +5,10 @@ using GitLabApiClient;
 using GitLabApiClient.Models.Branches.Requests;
 using GitLabApiClient.Models.Commits.Requests.CreateCommitRequest;
 using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
 using Polly;
 using System.Text;
 using System.Web;
-using VDS.RDF.Query;
 using static KPIGenerator.Utils.CommandLineOptions;
 
 namespace Coscine.KpiGenerator;
@@ -30,7 +30,7 @@ public abstract class Reporting<O> where O : class
     private string ReportingBranch { get; init; }
     public string RwthRor { get; init; }
 
-    public readonly ILogger _logger = null!;
+    private readonly ILogger<Reporting<O>> _logger;
 
     public readonly Organization _otherOrganization = new()
     {
@@ -38,7 +38,7 @@ public abstract class Reporting<O> where O : class
         RorUrl = "https://ror.org/_other",
     };
 
-    public Reporting(O options, ILogger logger)
+    public Reporting(O options)
     {
         InstanceName = GetType().Name;
         Options = options;
@@ -53,7 +53,7 @@ public abstract class Reporting<O> where O : class
         ReportingBranch = Configuration.GetStringAndWait("coscine/local/reporting/branch");
 
         RwthRor = Configuration.GetStringAndWait("coscine/global/organizations/rwth/ror_url");
-        _logger = logger;
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<Reporting<O>>();
     }
 
     public abstract IEnumerable<ReportingFileObject> GenerateReporting();
@@ -173,7 +173,7 @@ public abstract class Reporting<O> where O : class
         else
         {
             var organizationTriples = WrapRequest(() => RdfStoreConnector.GetLabelForSubject(new Uri(Uri.UnescapeDataString(rorUrl))).ToList());
-            if (organizationTriples.Any())
+            if (organizationTriples is not null && organizationTriples.Any())
             {
                 result = new Organization
                 {

src/KPI Generator/Reportings/ApplicationProfile/ApplicationProfileReporting.cs

 using Coscine.KpiGenerator.Utils;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NLog.Extensions.Logging;
 using VDS.RDF.Query;
 using static KPIGenerator.Utils.CommandLineOptions;
 
@@ -8,9 +9,12 @@ namespace Coscine.KpiGenerator.Reportings.ApplicationProfile;
 
 public class ApplicationProfileReporting : Reporting<ApplicationProfileReportingOptions>
 {
-    public ApplicationProfileReporting(ApplicationProfileReportingOptions options, ILogger _logger) : base(options, _logger)
+    private readonly ILogger<ApplicationProfileReporting> _logger;
+
+    public ApplicationProfileReporting(ApplicationProfileReportingOptions options) : base(options)
     {
         ReportingFileName = "application_profiles.json";
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<ApplicationProfileReporting>();
     }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()

src/KPI Generator/Reportings/Complete/CompleteReporting.cs

@@ -5,14 +5,19 @@ using Coscine.KpiGenerator.Reportings.System;
 using Coscine.KpiGenerator.Reportings.User;
 using Coscine.KpiGenerator.Utils;
 using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
 using static KPIGenerator.Utils.CommandLineOptions;
 
 namespace Coscine.KpiGenerator.Reportings.Complete;
 
 public class CompleteReporting : Reporting<CompleteReportingOptions>
 {
-    public CompleteReporting(CompleteReportingOptions options, ILogger _logger) : base(options, _logger)
-    { }
+    private readonly ILogger<CompleteReporting> _logger;
+
+    public CompleteReporting(CompleteReportingOptions options) : base(options)
+    {
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<CompleteReporting>();
+    }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()
     {
@@ -24,7 +29,7 @@ public class CompleteReporting : Reporting<CompleteReportingOptions>
             result.AddRange(new ProjectReporting(new ProjectReportingOptions
             {
                 DummyMode = Options.DummyMode
-            }, _logger).GenerateReporting());
+            }).GenerateReporting());
         }
         catch (Exception e)
         {
@@ -38,7 +43,7 @@ public class CompleteReporting : Reporting<CompleteReportingOptions>
             result.AddRange(new ResourceReporting(new ResourceReportingOptions
             {
                 DummyMode = Options.DummyMode
-            }, _logger).GenerateReporting());
+            }).GenerateReporting());
         }
         catch (Exception e)
         {
@@ -52,7 +57,7 @@ public class CompleteReporting : Reporting<CompleteReportingOptions>
             result.AddRange(new UserReporting(new UserReportingOptions
             {
                 DummyMode = Options.DummyMode
-            }, _logger).GenerateReporting());
+            }).GenerateReporting());
         }
         catch (Exception e)
         {
@@ -66,7 +71,7 @@ public class CompleteReporting : Reporting<CompleteReportingOptions>
             result.AddRange(new ApplicationProfileReporting(new ApplicationProfileReportingOptions
             {
                 DummyMode = Options.DummyMode
-            }, _logger).GenerateReporting());
+            }).GenerateReporting());
         }
         catch (Exception e)
         {
@@ -80,7 +85,7 @@ public class CompleteReporting : Reporting<CompleteReportingOptions>
             result.AddRange(new SystemReporting(new SystemReportingOptions
             {
                 DummyMode = Options.DummyMode
-            }, _logger).GenerateReporting());
+            }).GenerateReporting());
         }
         catch (Exception e)
         {

src/KPI Generator/Reportings/Project/ProjectReporting.cs

@@ -5,19 +5,22 @@ using Coscine.KpiGenerator.Utils;
 using Coscine.ResourceTypes;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NLog.Extensions.Logging;
 using static KPIGenerator.Utils.CommandLineOptions;
 
 namespace Coscine.KpiGenerator.Reportings.Project;
 
 public class ProjectReporting : Reporting<ProjectReportingOptions>
 {
+    private readonly ILogger<ProjectReporting> _logger;
+
     private readonly ProjectModel _projectModel;
     private readonly ResourceModel _resourceModel;
     private readonly ProjectRoleModel _projectRoleModel;
     private readonly ProjectQuotaModel _projectQuotaModel;
     private readonly ResourceTypeModel _resourceTypeModel;
 
-    public ProjectReporting(ProjectReportingOptions options, ILogger _logger) : base(options, _logger)
+    public ProjectReporting(ProjectReportingOptions options) : base(options)
     {
         ReportingFileName = "projects.json";
         _projectModel = new ProjectModel();
@@ -25,6 +28,7 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
         _projectQuotaModel = new ProjectQuotaModel();
         _resourceModel = new ResourceModel();
         _resourceTypeModel = new ResourceTypeModel();
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<ProjectReporting>();
     }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()

src/KPI Generator/Reportings/Resource/ResourceReporting.cs

@@ -5,22 +5,26 @@ using Coscine.ResourceTypes;
 using Coscine.ResourceTypes.Base;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NLog.Extensions.Logging;
 using static KPIGenerator.Utils.CommandLineOptions;
 
 namespace Coscine.KpiGenerator.Reportings.Resource;
 
 public class ResourceReporting : Reporting<ResourceReportingOptions>
 {
+    private readonly ILogger<ResourceReporting> _logger;
+
     private readonly ResourceModel _resourceModel;
     private readonly ProjectModel _projectModel;
     private readonly ProjectResourceModel _projectResourceModel;
 
-    public ResourceReporting(ResourceReportingOptions options, ILogger _logger) : base(options, _logger)
+    public ResourceReporting(ResourceReportingOptions options) : base(options)
     {
         ReportingFileName = "resources.json";
         _resourceModel = new ResourceModel();
         _projectModel = new ProjectModel();
         _projectResourceModel = new ProjectResourceModel();
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<ResourceReporting>();
     }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()

src/KPI Generator/Reportings/System/SystemReporting.cs

@@ -2,6 +2,7 @@
 using Coscine.KpiGenerator.Utils;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NLog.Extensions.Logging;
 using System.Net.Http.Headers;
 using System.Text;
 using static KPIGenerator.Utils.CommandLineOptions;
@@ -10,12 +11,15 @@ namespace Coscine.KpiGenerator.Reportings.System;
 
 public class SystemReporting : Reporting<SystemReportingOptions>
 {
+    private readonly ILogger<SystemReporting> _logger;
+
     private readonly ConsulConfiguration _configuration;
 
-    public SystemReporting(SystemReportingOptions options, ILogger _logger) : base(options, _logger)
+    public SystemReporting(SystemReportingOptions options) : base(options)
     {
         ReportingFileName = "system_status.json";
         _configuration = new ConsulConfiguration();
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<SystemReporting>();
     }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()

src/KPI Generator/Reportings/User/UserReporting.cs

@@ -4,6 +4,7 @@ using Coscine.KpiGenerator.Utils;
 using Coscine.Metadata;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using NLog.Extensions.Logging;
 using VDS.RDF.Query;
 using static KPIGenerator.Utils.CommandLineOptions;
 
@@ -11,6 +12,8 @@ namespace Coscine.KpiGenerator.Reportings.User;
 
 public class UserReporting : Reporting<UserReportingOptions>
 {
+    private readonly ILogger<UserReporting> _logger;
+
     private readonly ExternalAuthenticatorModel _externalAuthenticatorModel;
     private readonly ExternalIdModel _externalIdModel;
     private readonly ProjectRoleModel _projectRoleModel;
@@ -20,7 +23,7 @@ public class UserReporting : Reporting<UserReportingOptions>
     private readonly LogModel _logModel;
     private readonly IEnumerable<ExternalAuthenticator> _loginProviders;
 
-    public UserReporting(UserReportingOptions options, ILogger _logger) : base(options, _logger)
+    public UserReporting(UserReportingOptions options) : base(options)
     {
         ReportingFileName = "users.json";
         _externalAuthenticatorModel = new ExternalAuthenticatorModel();
@@ -32,6 +35,7 @@ public class UserReporting : Reporting<UserReportingOptions>
         _logModel = new LogModel();
 
         _loginProviders = _externalAuthenticatorModel.GetAll();
+        _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<UserReporting>();
     }
 
     public override IEnumerable<ReportingFileObject> GenerateReporting()