Log API Improvements

common/src/main/java/com/genexus/diagnostics/LogLevel.java

@@ -2,13 +2,12 @@
 
 public class LogLevel {
 
-	static final int OFF = 0;
-	static final int TRACE = 1;
-	static final int DEBUG = 5;
-	static final int INFO = 10;
-	static final int WARNING = 15;
-	static final int ERROR = 20;
-	static final int FATAL = 30;
-
+	public static final int OFF = 0;
+	public static final int TRACE = 1;
+	public static final int DEBUG = 5;
+	public static final int INFO = 10;
+	public static final int WARNING = 15;
+	public static final int ERROR = 20;
+	public static final int FATAL = 30;
 
 }

common/src/main/java/com/genexus/diagnostics/UserLog.java

@@ -120,4 +120,51 @@ public static void debug(String message, String topic) {
 	public static void debug(String message, String topic, Throwable ex) {
 		getLogger(topic).debug(message, ex);
 	}
+
+	public static void setContext(String key, Object value) {
+		// Topic is ignored, also if you put something
+		getLogger("$").setContext(key, value);
+	}
+
+	public static void write(String message, String topic, int logLevel, Object data, boolean stackTrace) {
+		getLogger(topic).write(message, logLevel, data, stackTrace);
+	}
+
+	public static void write(String message, String topic, int logLevel, Object data) {
+		getLogger(topic).write(message, logLevel, data, false);
+	}
+
+	public static boolean isDebugEnabled() {
+		return getLogger().isDebugEnabled();
+	}
+
+	public static boolean isErrorEnabled() {
+		return getLogger().isErrorEnabled();
+	}
+
+	public static boolean isFatalEnabled() {
+		return getLogger().isFatalEnabled();
+	}
+
+	public static boolean isInfoEnabled() {
+		return getLogger().isInfoEnabled();
+	}
+
+	public static boolean isWarnEnabled() {
+		return getLogger().isWarnEnabled();
+	}
+
+	public static boolean isTraceEnabled() {
+		return getLogger().isTraceEnabled();
+	}
+
+	public static boolean isEnabled(int logLevel) {
+		return getLogger().isEnabled(logLevel);
+	}
+
+	public static boolean isEnabled(int logLevel, String topic) {
+		return getLogger(topic).isEnabled(logLevel);
+	}
+
+
 }

common/src/main/java/com/genexus/diagnostics/core/ILogger.java

@@ -65,5 +65,20 @@ public interface ILogger {
 	 * msg); } }
 	 */
 
-
+	default void setContext(String key, Object value) {}
+
+	default void write(String message, int logLevel, Object data, boolean stackTrace) {}
+
+	default boolean isFatalEnabled() { return false; }
+
+	default boolean isWarnEnabled() { return false; }
+
+	default boolean isInfoEnabled() { return false; }
+
+	default boolean isTraceEnabled() { return false; }
+
+	default boolean isEnabled(int logLevel) { return false; }
+
+	//boolean isEnabled(int logLevel, String topic);
+
 }

wrappercommon/pom.xml

@@ -38,8 +38,18 @@
 			<groupId>org.apache.ws.security</groupId>
 			<artifactId>wss4j</artifactId>
 			<version>1.6.19</version>			
-		</dependency>		        			
-	</dependencies>	
+		</dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <version>2.24.3</version>
+        </dependency>
+    </dependencies>
 
 	<build>
 		<finalName>gxwrappercommon</finalName>

wrappercommon/src/main/java/com/genexus/diagnostics/core/provider/CustomEcsLayout.json

@@ -0,0 +1,57 @@
+{
+  "@timestamp": {
+    "$resolver": "timestamp",
+    "pattern": {
+      "format": "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+      "timeZone": "UTC"
+    }
+  },
+  "ecs.version": "1.2.0",
+  "log.level": {
+    "$resolver": "level",
+    "field": "name"
+  },
+  "message": {
+    "$resolver": "customMessage",
+    "stringified": true
+  },
+  "data": {
+    "$resolver": "map",
+    "key": "data"
+  },
+  "process.thread.name": {
+    "$resolver": "thread",
+    "field": "name"
+  },
+  "log.logger": {
+    "$resolver": "logger",
+    "field": "name"
+  },
+  "tags": {
+    "$resolver": "ndc"
+  },
+  "error.type": {
+    "$resolver": "exception",
+    "field": "className"
+  },
+  "error.message": {
+    "$resolver": "exception",
+    "field": "message"
+  },
+  "error.stack_trace": {
+    "$resolver": "exception",
+    "field": "stackTrace",
+    "stackTrace": {
+      "stringified": true
+    }
+  },
+  "context": {
+    "$resolver": "mdc",
+    "field": "context",
+    "stringified": false
+  },
+  "stackTrace": {
+    "$resolver": "map",
+    "key": "stackTrace"
+  }
+}

wrappercommon/src/main/java/com/genexus/diagnostics/core/provider/CustomMessageFactory.java

@@ -0,0 +1,29 @@
+package com.genexus.diagnostics.core.provider;
+
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.layout.template.json.resolver.EventResolverContext;
+import org.apache.logging.log4j.layout.template.json.resolver.EventResolverFactory;
+import org.apache.logging.log4j.layout.template.json.resolver.TemplateResolverConfig;
+import org.apache.logging.log4j.layout.template.json.resolver.TemplateResolverFactory;
+
+
+@Plugin(name = "CustomMessageFactory", category = TemplateResolverFactory.CATEGORY)
+public final class CustomMessageFactory implements EventResolverFactory {
+	private static final CustomMessageFactory INSTANCE = new CustomMessageFactory();
+
+	@PluginFactory
+	public static CustomMessageFactory getInstance() {
+		return INSTANCE;
+	}
+
+	@Override
+	public String getName() {
+		return CustomMessageResolver.getName();
+	}
+
+	@Override
+	public CustomMessageResolver create(EventResolverContext context, TemplateResolverConfig config) {
+		return new CustomMessageResolver(config);
+	}
+}

wrappercommon/src/main/java/com/genexus/diagnostics/core/provider/CustomMessageResolver.java

@@ -0,0 +1,36 @@
+package com.genexus.diagnostics.core.provider;
+
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.layout.template.json.resolver.EventResolver;
+import org.apache.logging.log4j.layout.template.json.resolver.TemplateResolverConfig;
+import org.apache.logging.log4j.layout.template.json.util.JsonWriter;
+import org.apache.logging.log4j.message.MapMessage;
+import org.apache.logging.log4j.message.Message;
+
+
+public class CustomMessageResolver implements EventResolver {
+	private static final String RESOLVER_NAME = "customMessage";
+
+	CustomMessageResolver(TemplateResolverConfig config) {
+	}
+
+	static String getName() {
+		return RESOLVER_NAME;
+	}
+
+	@Override
+	public void resolve(LogEvent logEvent, JsonWriter jsonWriter) {
+		Message message = logEvent.getMessage();
+		if (message instanceof MapMessage) {
+			MapMessage<?, ?> mapMessage = (MapMessage<?, ?>) message;
+			Object msgValue = mapMessage.get("message");
+			if (msgValue != null) {
+				jsonWriter.writeString(msgValue.toString());
+				return;
+			}
+		}
+		// fallback
+		jsonWriter.writeString(message.getFormattedMessage());
+	}
+}
+