Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,12 @@ private String getDatadogProperty(String sysProp) {
* <p>Checks system properties and environment variables.
*/
private static String getProperty(String sysProp) {
String value = SystemProperties.get(sysProp);
if (null == value) {
value = ConfigHelper.env(toEnvVar(sysProp));
// Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
String value = ConfigHelper.env(toEnvVar(sysProp));
// System property takes precedence over environment variable
String sysPropValue = SystemProperties.get(sysProp);
if (sysPropValue != null) {
value = sysPropValue;
}
return value;
}
Expand Down
Loading