A custom resolver is added to handle messages other than MapMessages to be compatible with the existing implementation of the log (the old implementation remains unchanged).

(cherry picked from commit 5757ac4)

Author: mrodbratschi

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());
+	}
+}
+