Skip to content

Commit 59a95e9

Browse files
authored
Support DD_LOG_FORMAT_JSON (#10223)
1 parent e55ec45 commit 59a95e9

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,9 +1461,15 @@ private static synchronized void startDebuggerAgent(
14611461

14621462
private static void configureLogger() {
14631463
setSystemPropertyDefault(SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY, "true");
1464-
setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
1465-
String simpleLoggerJsonEnabled = SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY);
1466-
if (simpleLoggerJsonEnabled != null && simpleLoggerJsonEnabled.equalsIgnoreCase("true")) {
1464+
1465+
String logFormatJson = ddGetProperty("dd.log.format.json");
1466+
if (null != logFormatJson) {
1467+
setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, logFormatJson);
1468+
} else {
1469+
setSystemPropertyDefault(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY, "false");
1470+
}
1471+
1472+
if (Boolean.parseBoolean(SystemProperties.get(SIMPLE_LOGGER_JSON_ENABLED_PROPERTY))) {
14671473
setSystemPropertyDefault(
14681474
SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY, SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT);
14691475
} else {

metadata/supported-configurations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,6 +2209,14 @@
22092209
"aliases": []
22102210
}
22112211
],
2212+
"DD_LOG_FORMAT_JSON": [
2213+
{
2214+
"version": "A",
2215+
"type": "boolean",
2216+
"default": null,
2217+
"aliases": []
2218+
}
2219+
],
22122220
"DD_MEASURE_METHODS": [
22132221
{
22142222
"version": "A",

0 commit comments

Comments
 (0)