make logs scoped

Author: stas

src/ApiService/ApiService/EnvironmentVariables.cs

@@ -22,6 +22,9 @@ static EnvironmentVariables()
     //TODO: Add environment variable to control where to write logs to
     public static LogDestination[] LogDestinations { get; set; }
 
+    //TODO: Get this from Environment variable
+    public static ApplicationInsights.DataContracts.SeverityLevel LogSeverityLevel() { return ApplicationInsights.DataContracts.SeverityLevel.Verbose; }
+
     public static class AppInsights
     {
         public static string? AppId { get => Environment.GetEnvironmentVariable("APPINSIGHTS_APPID"); }

src/ApiService/ApiService/Log.cs

@@ -5,6 +5,7 @@
 using Microsoft.ApplicationInsights.DataContracts;
 
 using System.Diagnostics;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.OneFuzz.Service;
 
@@ -132,6 +133,7 @@ public interface ILogTracer
     void ForceFlush();
     void Info(string message);
     void Warning(string message);
+    void Verbose(string message);
 
     ILogTracer WithTag(string k, string v);
     ILogTracer WithTags((string, string)[]? tags);
@@ -155,11 +157,11 @@ public class LogTracer : ILogTracerInternal
     private Guid _correlationId;
     private List<ILog> _loggers;
     private Dictionary<string, string> _tags;
+    private SeverityLevel _logSeverityLevel;
 
     public Guid CorrelationId => _correlationId;
     public IReadOnlyDictionary<string, string> Tags => _tags;
 
-
     private static List<KeyValuePair<string, string>> ConvertTags((string, string)[]? tags)
     {
         List<KeyValuePair<string, string>> converted = new List<KeyValuePair<string, string>>();
@@ -177,14 +179,17 @@ private static List<KeyValuePair<string, string>> ConvertTags((string, string)[]
         }
     }
 
-    public LogTracer(Guid correlationId, (string, string)[]? tags, List<ILog> loggers) : this(correlationId, new Dictionary<string, string>(ConvertTags(tags)), loggers) { }
+    public LogTracer(Guid correlationId, (string, string)[]? tags, List<ILog> loggers, SeverityLevel logSeverityLevel) :
+        this(correlationId, new Dictionary<string, string>(ConvertTags(tags)), loggers, logSeverityLevel)
+    { }
 
 
-    public LogTracer(Guid correlationId, IReadOnlyDictionary<string, string> tags, List<ILog> loggers)
+    public LogTracer(Guid correlationId, IReadOnlyDictionary<string, string> tags, List<ILog> loggers, SeverityLevel logSeverityLevel)
     {
         _correlationId = correlationId;
         _tags = new(tags);
         _loggers = loggers;
+        _logSeverityLevel = logSeverityLevel;
     }
 
     //Single threaded only
@@ -220,42 +225,66 @@ public ILogTracer WithTags((string, string)[]? tags)
                 newTags[k] = v;
             }
         }
-        return new LogTracer(CorrelationId, newTags, _loggers);
+        return new LogTracer(CorrelationId, newTags, _loggers, _logSeverityLevel);
+    }
+
+    public void Verbose(string message)
+    {
+        if (_logSeverityLevel >= SeverityLevel.Verbose)
+        {
+            var caller = GetCaller();
+            foreach (var logger in _loggers)
+            {
+                logger.Log(CorrelationId, message, SeverityLevel.Verbose, Tags, caller);
+            }
+        }
     }
 
     public void Info(string message)
     {
-        var caller = GetCaller();
-        foreach (var logger in _loggers)
+        if (_logSeverityLevel >= SeverityLevel.Information)
         {
-            logger.Log(CorrelationId, message, SeverityLevel.Information, Tags, caller);
+            var caller = GetCaller();
+            foreach (var logger in _loggers)
+            {
+                logger.Log(CorrelationId, message, SeverityLevel.Information, Tags, caller);
+            }
         }
     }
 
     public void Warning(string message)
     {
-        var caller = GetCaller();
-        foreach (var logger in _loggers)
+        if (_logSeverityLevel >= SeverityLevel.Warning)
         {
-            logger.Log(CorrelationId, message, SeverityLevel.Warning, Tags, caller);
+            var caller = GetCaller();
+            foreach (var logger in _loggers)
+            {
+                logger.Log(CorrelationId, message, SeverityLevel.Warning, Tags, caller);
+            }
         }
     }
 
     public void Error(string message)
     {
-        var caller = GetCaller();
-        foreach (var logger in _loggers)
+        if (_logSeverityLevel >= SeverityLevel.Error)
         {
-            logger.Log(CorrelationId, message, SeverityLevel.Error, Tags, caller);
+            var caller = GetCaller();
+            foreach (var logger in _loggers)
+            {
+                logger.Log(CorrelationId, message, SeverityLevel.Error, Tags, caller);
+            }
         }
     }
 
     public void Critical(string message)
     {
-        var caller = GetCaller();
-        foreach (var logger in _loggers)
+        if (_logSeverityLevel >= SeverityLevel.Critical)
         {
-            logger.Log(CorrelationId, message, SeverityLevel.Critical, Tags, caller);
+            var caller = GetCaller();
+            foreach (var logger in _loggers)
+            {
+                logger.Log(CorrelationId, message, SeverityLevel.Critical, Tags, caller);
+            }
         }
     }
 

src/ApiService/ApiService/Program.cs

@@ -65,7 +65,7 @@ public static void Main()
         )
         .ConfigureServices((context, services) =>
             services
-            .AddScoped<ILogTracer>(_ => new LogTracerFactory(GetLoggers()).CreateLogTracer(Guid.NewGuid()))
+            .AddScoped<ILogTracer>(_ => new LogTracerFactory(GetLoggers()).CreateLogTracer(Guid.NewGuid(), logSeverityLevel: EnvironmentVariables.LogSeverityLevel()))
             .AddSingleton<INodeOperations, NodeOperations>()
             .AddSingleton<IEvents, Events>()
             .AddSingleton<IWebhookOperations, WebhookOperations>()

src/ApiService/ApiService/onefuzzlib/InstanceConfig.cs

@@ -60,9 +60,6 @@ public async Async.Task Save(InstanceConfig config, bool isNew = false, bool req
             }
         }
 
-        if (r.IsOk)
-        {
-            await _events.SendEvent(new EventInstanceConfigUpdated(config));
-        }
+        await _events.SendEvent(new EventInstanceConfigUpdated(config));
     }
 }

src/ApiService/ApiService/onefuzzlib/orm/EntityConverter.cs

@@ -198,10 +198,16 @@ public T ToRecord<T>(TableEntity entity) where T : EntityBase
                         {
                             throw new Exception("invalid ");
                         }
-
                     }
 
                     var fieldName = ef.columnName;
+                    var obj = entity[fieldName];
+                    if (obj == null)
+                    {
+                        return null;
+                    }
+                    var objType = obj.GetType();
+
                     if (ef.type == typeof(string))
                     {
                         return entity.GetString(fieldName);
@@ -245,10 +251,6 @@ public T ToRecord<T>(TableEntity entity) where T : EntityBase
                     else
                     {
                         var value = entity.GetString(fieldName);
-                        if (value == null)
-                        {
-                            return null;
-                        }
                         return JsonSerializer.Deserialize(value, ef.type, options: _options); ;
                     }
                 }