File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed
utils/config-utils/src/main/java/datadog/trace/bootstrap/config/provider Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -318,9 +318,12 @@ private String getDatadogProperty(String sysProp) {
318318 * <p>Checks system properties and environment variables.
319319 */
320320 private static String getProperty (String sysProp ) {
321- String value = SystemProperties .get (sysProp );
322- if (null == value ) {
323- value = ConfigHelper .env (toEnvVar (sysProp ));
321+ // Always validate through ConfigHelper so STRICT_TEST mode can detect unsupported configs
322+ String value = ConfigHelper .env (toEnvVar (sysProp ));
323+ // System property takes precedence over environment variable
324+ String sysPropValue = SystemProperties .get (sysProp );
325+ if (sysPropValue != null ) {
326+ value = sysPropValue ;
324327 }
325328 return value ;
326329 }
You can’t perform that action at this time.
0 commit comments