File tree Expand file tree Collapse file tree 2 files changed +17
-3
lines changed
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap Expand file tree Collapse file tree 2 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -1456,9 +1456,15 @@ private static synchronized void startDebuggerAgent(
14561456
14571457 private static void configureLogger () {
14581458 setSystemPropertyDefault (SIMPLE_LOGGER_SHOW_DATE_TIME_PROPERTY , "true" );
1459- setSystemPropertyDefault (SIMPLE_LOGGER_JSON_ENABLED_PROPERTY , "false" );
1460- String simpleLoggerJsonEnabled = SystemProperties .get (SIMPLE_LOGGER_JSON_ENABLED_PROPERTY );
1461- if (simpleLoggerJsonEnabled != null && simpleLoggerJsonEnabled .equalsIgnoreCase ("true" )) {
1459+
1460+ String logFormatJson = ddGetProperty ("dd.log.format.json" );
1461+ if (null != logFormatJson ) {
1462+ setSystemPropertyDefault (SIMPLE_LOGGER_JSON_ENABLED_PROPERTY , logFormatJson );
1463+ } else {
1464+ setSystemPropertyDefault (SIMPLE_LOGGER_JSON_ENABLED_PROPERTY , "false" );
1465+ }
1466+
1467+ if (Boolean .parseBoolean (SystemProperties .get (SIMPLE_LOGGER_JSON_ENABLED_PROPERTY ))) {
14621468 setSystemPropertyDefault (
14631469 SIMPLE_LOGGER_DATE_TIME_FORMAT_PROPERTY , SIMPLE_LOGGER_DATE_TIME_FORMAT_JSON_DEFAULT );
14641470 } else {
Original file line number Diff line number Diff line change 22012201 "aliases" : []
22022202 }
22032203 ],
2204+ "DD_LOG_FORMAT_JSON" : [
2205+ {
2206+ "version" : " A" ,
2207+ "type" : " boolean" ,
2208+ "default" : null ,
2209+ "aliases" : []
2210+ }
2211+ ],
22042212 "DD_MEASURE_METHODS" : [
22052213 {
22062214 "version" : " A" ,
You can’t perform that action at this time.
0 commit comments