diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java index f3b5da141fc..8a8e8554d02 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java @@ -1456,9 +1456,15 @@ private static synchronized void startDebuggerAgent( private static void configureLogger() { setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true"); - setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false"); - String simpleLoggerJsonEnabled = SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY); - if (simpleLoggerJsonEnabled != null && simpleLoggerJsonEnabled.equalsIgnoreCase("true")) { + + String logFormatJson = ddGetProperty("dd.log.format.json"); + if (null != logFormatJson) { + setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, logFormatJson); + } else { + setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false"); + } + + if (Boolean.parseBoolean(SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY))) { setSystemPropertyDefault( SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT); } else { diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index 23eeee9ba80..50c2d6c61d6 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -2201,6 +2201,14 @@ "aliases": [] } ], + "DD_LOG_FORMAT_JSON": [ + { + "version": "A", + "type": "boolean", + "default": null, + "aliases": [] + } + ], "DD_MEASURE_METHODS": [ { "version": "A",