Add Logs for Opentelemetry (#951)

Author: sjuarezgx

dotnet/src/dotnetcore/GxClasses/Services/LogService/GXLogService.cs

@@ -1,3 +1,4 @@
+using System;
 using GeneXus.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -7,15 +8,25 @@ public static class GXLogService
 	{
 		private static string AZURE_APPLICATION_INSIGHTS_LOG = "AZUREAPPLICATIONINSIGHTS";
 		const string OTEL_AZUREMONITOR_EXPORTER = "OTEL_AZUREMONITOR_EXPORTER";
+		const string OPENTELEMETRY = "OPENTELEMETRY";
+		internal static string OTEL_LOGS_EXPORTER = "OTEL_LOGS_EXPORTER";
 		const string LOG_OUTPUT = "LOG_OUTPUT";
+
 		public static ILoggerFactory GetLogFactory()
 		{
-			if (Config.GetValueOf(LOG_OUTPUT, out string logProvider))
-			{
-				if (logProvider == OTEL_AZUREMONITOR_EXPORTER)
-					return AzureAppInsightsLogProvider.GetAzureMonitorLoggerFactory();
-				else if (logProvider == AZURE_APPLICATION_INSIGHTS_LOG)
-					return AzureAppInsightsLogProvider.GetLoggerFactory();
+			string otelLogEnvVar = Environment.GetEnvironmentVariable(OTEL_LOGS_EXPORTER);
+			if (string.IsNullOrEmpty(otelLogEnvVar) || !otelLogEnvVar.ToLower().Equals("none"))
+			{ 
+				if (Config.GetValueOf(LOG_OUTPUT, out string logProvider))
+				{
+					if (logProvider == OTEL_AZUREMONITOR_EXPORTER)
+						return OpentelemetryLogProvider.GetAzureMonitorLoggerFactory();
+					else if (logProvider == AZURE_APPLICATION_INSIGHTS_LOG)
+						return OpentelemetryLogProvider.GetAzureAppInsightsLoggerFactory();
+					else
+						if (logProvider == OPENTELEMETRY)
+						return OpentelemetryLogProvider.GetOpentelemetryLoggerFactory();
+				}
 			}
 			return null;
 		}

dotnet/src/dotnetcore/GxClasses/Services/LogService/AzureAppInsights/AzureAppInsightsLogProvider.cs renamed to dotnet/src/dotnetcore/GxClasses/Services/LogService/OpenTelemetry/OtelLogProvider.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using Azure.Monitor.OpenTelemetry.Exporter;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
+using OpenTelemetry.Resources;
 
 namespace GeneXus.Services.Log
 {
-	public class AzureAppInsightsLogProvider : ILoggerFactory
+	public class OpentelemetryLogProvider : ILoggerFactory
 	{
 		private static string APPLICATIONINSIGHTS_CONNECTION_STRING = "APPLICATIONINSIGHTS_CONNECTION_STRING";
 		private const string LOG_LEVEL_ENVVAR = "GX_LOG_LEVEL";
@@ -25,7 +28,8 @@ public static ILoggerFactory GetAzureMonitorLoggerFactory()
 						builder.AddOpenTelemetry(options =>
 						{
 							options.AddAzureMonitorLogExporter(o => o.ConnectionString = appInsightsConnection);
-							options.AddConsoleExporter();
+							if (GenerateOtelLogsToConsole())
+								options.AddConsoleExporter();
 						}).SetMinimumLevel(loglevel);
 					});
 				}
@@ -42,7 +46,7 @@ public static ILoggerFactory GetAzureMonitorLoggerFactory()
 			return loggerFactory;
 		}
 
-		public static ILoggerFactory GetLoggerFactory()
+		public static ILoggerFactory GetAzureAppInsightsLoggerFactory()
 		{
 			string appInsightsConnection = Environment.GetEnvironmentVariable(APPLICATIONINSIGHTS_CONNECTION_STRING);
 			try
@@ -71,6 +75,23 @@ public static ILoggerFactory GetLoggerFactory()
 
 			return loggerFactory;
 		}
+
+		public static ILoggerFactory GetOpentelemetryLoggerFactory()
+		{
+			LogLevel loglevel = GetLogLevel();
+			loggerFactory = LoggerFactory.Create(builder => builder.AddOpenTelemetry(logging =>
+			{
+				var resourceBuilder = ResourceBuilder.CreateDefault()
+				.AddTelemetrySdk();
+
+				logging.SetResourceBuilder(resourceBuilder);
+				if (GenerateOtelLogsToConsole())
+					logging.AddConsoleExporter();
+				
+			})
+			.SetMinimumLevel(loglevel));
+			return loggerFactory;
+		}
 		private static LogLevel GetLogLevel()
 		{
 			string loglevelvalue = Environment.GetEnvironmentVariable(LOG_LEVEL_ENVVAR);
@@ -79,7 +100,7 @@ private static LogLevel GetLogLevel()
 			{
 				if (!Enum.TryParse<LogLevel>(loglevelvalue, out loglevel))
 				{
-					CustomLogLevel customLogLevel = CustomLogLevel.Info;
+					CustomLogLevel customLogLevel = CustomLogLevel.info;
 					if (Enum.TryParse<CustomLogLevel>(loglevelvalue, out customLogLevel))
 					{
 						loglevel = toLogLevel(customLogLevel);
@@ -91,6 +112,13 @@ private static LogLevel GetLogLevel()
 			return loglevel;
 		}
 
+		private static bool GenerateOtelLogsToConsole()
+		{
+			string otelLogsEnvVar = Environment.GetEnvironmentVariable(GXLogService.OTEL_LOGS_EXPORTER);
+			if (string.IsNullOrEmpty(otelLogsEnvVar)) { return false; }
+			return otelLogsEnvVar.ToLower().Contains("console") || otelLogsEnvVar.ToLower().Contains("logging");
+		}
+
 		public void AddProvider(ILoggerProvider provider)
 		{
 			loggerFactory.AddProvider(provider);
@@ -105,25 +133,25 @@ public ILogger CreateLogger(string name)
 		}
 		private enum CustomLogLevel
 		{
-			None,
-			All,
-			Debug,
-			Info,
-			Warn,
-			Error,
-			Fatal
+			none,
+			all,
+			debug,
+			info,
+			warn,
+			error,
+			fatal
 		}
 		private static LogLevel toLogLevel(CustomLogLevel customLogLevel)
 		{
 			switch (customLogLevel)
 			{
-				case CustomLogLevel.None: return LogLevel.None;
-				case CustomLogLevel.All: return LogLevel.Trace;
-				case CustomLogLevel.Debug: return LogLevel.Debug;
-				case CustomLogLevel.Info: return LogLevel.Information;
-				case CustomLogLevel.Warn: return LogLevel.Warning;
-				case CustomLogLevel.Error: return LogLevel.Error;
-				case CustomLogLevel.Fatal: return LogLevel.Critical;
+				case CustomLogLevel.none: return LogLevel.None;
+				case CustomLogLevel.all: return LogLevel.Trace;
+				case CustomLogLevel.debug: return LogLevel.Debug;
+				case CustomLogLevel.info: return LogLevel.Information;
+				case CustomLogLevel.warn: return LogLevel.Warning;
+				case CustomLogLevel.error: return LogLevel.Error;
+				case CustomLogLevel.fatal: return LogLevel.Critical;
 				default: return LogLevel.Information;
 			}
 		}

dotnet/src/dotnetframework/GxClasses/Diagnostics/Log.cs

@@ -3,6 +3,7 @@
 using log4net;
 using System.Collections.Concurrent;
 
+
 #if NETCORE
 using GeneXus.Services.Log;
 using Microsoft.Extensions.Logging;
@@ -25,10 +26,8 @@ private enum LogLevel
 		}
 
 		private const string LoggerPrefix = "$";
-		private static readonly string DefaultRepository = LogManager.GetRepository().Name;
 		private static readonly string DefaultUserLogNamespace = Config.GetValueOf("USER_LOG_NAMESPACE", LogConfiguration.USER_LOG_TOPIC);
-		private static readonly IGXLogger GlobalLog = new GXLoggerLog4Net(LogManager.GetLogger(DefaultRepository, DefaultUserLogNamespace));
-		private static ConcurrentDictionary<string, IGXLogger> LoggerDictionary = new ConcurrentDictionary<string, IGXLogger>() { [string.Empty] = GlobalLog };
+		private static ConcurrentDictionary<string, IGXLogger> LoggerDictionary = new ConcurrentDictionary<string, IGXLogger>() {};
 		internal static IGXLogger GetLogger(string topic)
 		{
 			if (LoggerDictionary.TryGetValue(topic, out IGXLogger logger))
@@ -37,7 +36,12 @@ internal static IGXLogger GetLogger(string topic)
 			}
 			else
 			{
-				string loggerName = topic.StartsWith(LoggerPrefix) ? topic.Substring(1) : $"{DefaultUserLogNamespace}.{topic.Trim()}";
+				string loggerName;
+				if (!string.IsNullOrEmpty(topic))
+					loggerName = topic.StartsWith(LoggerPrefix) ? topic.Substring(1) : $"{DefaultUserLogNamespace}.{topic.Trim()}";
+				else
+					loggerName = DefaultUserLogNamespace;
+
 				logger = GXLoggerFactory.GetLogger(loggerName);
 				LoggerDictionary.TryAdd(topic, logger);
 				return logger;