Use InvalidBooleanValueException; return false when encountered

Author: mtoffl01

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigConverter.java

@@ -21,6 +21,16 @@ final class ConfigConverter {
 
   private static final Logger log = LoggerFactory.getLogger(ConfigConverter.class);
 
+  /**
+   * Custom exception for invalid boolean values to maintain backward compatibility. When caught in
+   * ConfigProvider, boolean methods should return false instead of default value.
+   */
+  static class InvalidBooleanValueException extends IllegalArgumentException {
+    public InvalidBooleanValueException(String message) {
+      super(message);
+    }
+  }
+
   private static final ValueOfLookup LOOKUP = new ValueOfLookup();
 
   /**
@@ -422,8 +432,8 @@ public static Boolean booleanValueOf(String value) {
     } else if ("false".equalsIgnoreCase(value)) {
       return Boolean.FALSE;
     } else {
-      // Throw exception for invalid boolean values
-      throw new IllegalArgumentException("Invalid boolean value: " + value);
+      // Throw custom exception for invalid boolean values to maintain backward compatibility
+      throw new InvalidBooleanValueException("Invalid boolean value: " + value);
     }
   }
 

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/ConfigProvider.java

@@ -193,17 +193,27 @@ public double getDouble(String key, double defaultValue) {
 
   private <T> T get(String key, T defaultValue, Class<T> type, String... aliases) {
     for (ConfigProvider.Source source : sources) {
+      String sourceValue = source.get(key, aliases);
       try {
-        String sourceValue = source.get(key, aliases);
         T value = ConfigConverter.valueOf(sourceValue, type);
         if (value != null) {
           if (collectConfig) {
             ConfigCollector.get().put(key, sourceValue, source.origin());
           }
           return value;
         }
+      } catch (ConfigConverter.InvalidBooleanValueException ex) {
+        // For backward compatibility: invalid boolean values should return false, not default
+        // Store the invalid sourceValue for telemetry, but return false for the application
+        if (Boolean.class.equals(type)) {
+          if (collectConfig) {
+            ConfigCollector.get().put(key, sourceValue, source.origin());
+          }
+          return (T) Boolean.FALSE;
+        }
+        // For non-boolean types, continue to next source
       } catch (IllegalArgumentException ex) {
-        // continue - covers both NumberFormatException and IllegalArgumentException
+        // continue - covers both NumberFormatException and other IllegalArgumentException
       }
     }
     if (collectConfig) {

internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy

@@ -657,7 +657,7 @@ class ConfigTest extends DDSpecification {
     config.agentHost == " "
     config.agentPort == 8126
     config.agentUrl == "http:// :8126"
-    config.prioritySamplingEnabled == true
+    config.prioritySamplingEnabled == false
     config.traceResolverEnabled == true
     config.serviceMapping == [:]
     config.mergedSpanTags == [:]

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/ConfigConverterTest.groovy

@@ -28,7 +28,7 @@ class ConfigConverterTest extends DDSpecification {
     ConfigConverter.valueOf(invalidValue, Boolean)
 
     then:
-    def exception = thrown(IllegalArgumentException)
+    def exception = thrown(ConfigConverter.InvalidBooleanValueException)
     exception.message.contains("Invalid boolean value:")
 
     where: