Adapt JSON keys to DD LOG UI

Author: Cecile Terpin

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -71,6 +71,8 @@ public class Agent {
       "datadog.slf4j.simpleLogger.showDateTime";
   private static final String SIMPLE_LOGGER_JSON_ENABLED_PROPERTY =
       "datadog.slf4j.simpleLogger.json.enabled";
+  private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT =
+      "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
   private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY =
       "datadog.slf4j.simpleLogger.dateTimeFormat";
   private static final String SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT =
@@ -1104,9 +1106,21 @@ private static synchronized void startDebuggerAgent(
 
   private static void configureLogger() {
     setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true");
-    setSystemPropertyDefault(
-        SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT);
-    setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
+
+    String simpleLoggerJsonInSystemPropertySetByUser =
+        System.getProperty(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY);
+    String simpleLoggerJsonInEnvVarSetByUser = ddGetEnv(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY);
+    if ((simpleLoggerJsonInSystemPropertySetByUser != null
+            && simpleLoggerJsonInSystemPropertySetByUser.equalsIgnoreCase("true"))
+        || (simpleLoggerJsonInEnvVarSetByUser != null
+            && simpleLoggerJsonInEnvVarSetByUser.equalsIgnoreCase("true"))) {
+      setSystemPropertyDefault(
+          SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT);
+    } else {
+      setSystemPropertyDefault(
+          SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_DEFAULT);
+      setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
+    }
 
     String logLevel;
     if (isDebugMode()) {

dd-java-agent/agent-logging/src/main/java/datadog/trace/logging/simplelogger/SLCompatHelper.java

@@ -36,7 +36,6 @@ public void log(LogLevel level, Marker marker, String message, Throwable t) {
     if (settings.showDateTime) {
       timeMillis = System.currentTimeMillis();
     }
-    System.out.println("CTE settings.jsonEnabled: " + settings.jsonEnabled);
     if (settings.jsonEnabled) {
       logJson(level, marker, SLCompatFactory.START_TIME, timeMillis, message, t);
     } else {
@@ -147,15 +146,16 @@ void logJson(
     StringBuilder buf = new StringBuilder(32);
 
     buf.append("{");
+    embedJson(buf, "origin", "dd.trace", true);
 
     if (timeMillis >= 0 && settings.showDateTime) {
-      embedJsonKey(buf, "time");
+      embedJsonKey(buf, "date");
       settings.dateTimeFormatter.appendFormattedDate(buf, timeMillis, startTimeMillis);
       buf.append("\",");
     }
 
     if (settings.showThreadName && threadName != null) {
-      embedJson(buf, "threadName", threadName, true);
+      embedJson(buf, "logger.thread_name", threadName, true);
     }
 
     embedJsonKey(buf, "level");
@@ -169,7 +169,7 @@ void logJson(
     }
 
     if (!logName.isEmpty()) {
-      embedJson(buf, "loggerName", logName, true);
+      embedJson(buf, "logger.name", logName, true);
     }
     embedJson(buf, "message", message, false);