adding flag for strictness

Author: mhlidd

build.gradle

@@ -66,7 +66,7 @@ spotlessPredeclare {
   }
 }
 apply from: "$rootDir/gradle/spotless.gradle"
-apply from: "$rootDir/gradle/logEnvVarUsages.gradle"
+apply from: "$rootDir/gradle/configInversionLinter.gradle"
 
 def compileTask = tasks.register("compile")
 

components/environment/src/main/java/datadog/environment/ConfigHelper.java

@@ -7,7 +7,15 @@
 
 @SuppressForbidden
 public class ConfigHelper {
-  // Parse the supported-configurations JSON once using ParseSupportedConfigurations.
+  private static boolean configInversionStrict;
+
+  public static void setConfigInversionStrict(boolean configInversionStrict) {
+    ConfigHelper.configInversionStrict = configInversionStrict;
+  }
+
+  public static boolean isConfigInversionStrict() {
+    return configInversionStrict;
+  }
 
   public static Map<String, String> getEnvironmentVariables() {
     Map<String, String> env = System.getenv();
@@ -52,7 +60,8 @@ public static String getEnvironmentVariable(String name) {
     if ((name.startsWith("DD_")
             || name.startsWith("OTEL_")
             || GeneratedSupportedConfigurations.ALIAS_MAPPING.containsKey(name))
-        && !GeneratedSupportedConfigurations.SUPPORTED.contains(name)) {
+        && !GeneratedSupportedConfigurations.SUPPORTED.contains(name)
+        && configInversionStrict) {
       System.err.println(
           "Warning: Missing environment variable " + name + " from supported-configurations.json.");
     }

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -111,5 +111,7 @@ public final class GeneralConfig {
   public static final String SSI_INJECTION_FORCE = "inject.force";
   public static final String INSTRUMENTATION_SOURCE = "instrumentation.source";
 
+  public static final String CONFIG_INVERSION_STRICT = "config.inversion.strict";
+
   private GeneralConfig() {}
 }

gradle/logEnvVarUsages.gradle renamed to gradle/configInversionLinter.gradle

@@ -77,6 +77,7 @@ tasks.register('checkEnvironmentVariablesUsage') {
       include '**/src/main/java/**/*.java'
 
       // Exclude specific files (relative to projectDir)
+      exclude '**/build/**'
       exclude 'components/environment/src/main/java/datadog/environment/ConfigHelper.java'
     }
 
@@ -92,11 +93,11 @@ tasks.register('checkEnvironmentVariablesUsage') {
     }
 
     if (!matches.isEmpty()) {
-      println "\n❌ Found forbidden usages of EnvironmentVariables.get(...):"
+      println "\nFound forbidden usages of EnvironmentVariables.get(...):"
       matches.each { println it }
       throw new GradleException("Forbidden usage of EnvironmentVariables.get(...) found in Java files.")
     } else {
-      println "✅ No forbidden EnvironmentVariables.get(...) usages found in src/main/java."
+      println "No forbidden EnvironmentVariables.get(...) usages found in src/main/java."
     }
   }
 }

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -1204,6 +1204,8 @@ public static String getHostName() {
 
   private final boolean telemetryDebugRequestsEnabled;
 
+  private final boolean configInversionStrict;
+
   private final boolean agentlessLogSubmissionEnabled;
   private final int agentlessLogSubmissionQueueSize;
   private final String agentlessLogSubmissionLevel;
@@ -2009,6 +2011,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
             DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE);
     clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED);
 
+    configInversionStrict = ConfigHelper.isConfigInversionStrict();
+
     appSecReportingInband =
         configProvider.getBoolean(APPSEC_REPORTING_INBAND, DEFAULT_APPSEC_REPORTING_INBAND);
     appSecRulesFile = configProvider.getString(APPSEC_RULES_FILE, null);
@@ -3484,6 +3488,10 @@ public boolean isClientIpEnabled() {
     return clientIpEnabled;
   }
 
+  public boolean isConfigInversionStrict() {
+    return configInversionStrict;
+  }
+
   public ProductActivation getAppSecActivation() {
     return instrumenterConfig.getAppSecActivation();
   }
@@ -5641,6 +5649,8 @@ public String toString() {
         + grpcClientErrorStatuses
         + ", clientIpEnabled="
         + clientIpEnabled
+        + ", configInversionStrict="
+        + configInversionStrict
         + ", appSecReportingInband="
         + appSecReportingInband
         + ", appSecRulesFile='"

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

@@ -1,7 +1,9 @@
 package datadog.trace.bootstrap.config.provider;
 
 import static datadog.trace.api.config.GeneralConfig.CONFIGURATION_FILE;
+import static datadog.trace.api.config.GeneralConfig.CONFIG_INVERSION_STRICT;
 
+import datadog.environment.ConfigHelper;
 import datadog.environment.SystemProperties;
 import datadog.trace.api.ConfigCollector;
 import datadog.trace.api.ConfigOrigin;
@@ -374,9 +376,14 @@ public static ConfigProvider getInstance() {
   }
 
   public static ConfigProvider createDefault() {
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
+    ConfigProvider minimalProvider =
+        new ConfigProvider(new SystemPropertiesConfigSource(), new EnvironmentConfigSource());
+
+    // TODO: Set default value to false before merging
+    ConfigHelper.setConfigInversionStrict(
+        minimalProvider.getBoolean(CONFIG_INVERSION_STRICT, true));
+
+    Properties configProperties = loadConfigurationFile(minimalProvider);
     if (configProperties.isEmpty()) {
       return new ConfigProvider(
           new SystemPropertiesConfigSource(),
@@ -398,10 +405,14 @@ public static ConfigProvider createDefault() {
   }
 
   public static ConfigProvider withoutCollector() {
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(
-                false, new SystemPropertiesConfigSource(), new EnvironmentConfigSource()));
+    ConfigProvider minimalProvider =
+        new ConfigProvider(
+            false, new SystemPropertiesConfigSource(), new EnvironmentConfigSource());
+    // TODO: Set default value to false before merging
+    ConfigHelper.setConfigInversionStrict(
+        minimalProvider.getBoolean(CONFIG_INVERSION_STRICT, true));
+
+    Properties configProperties = loadConfigurationFile(minimalProvider);
     if (configProperties.isEmpty()) {
       return new ConfigProvider(
           false,
@@ -426,12 +437,17 @@ public static ConfigProvider withoutCollector() {
 
   public static ConfigProvider withPropertiesOverride(Properties properties) {
     PropertiesConfigSource providedConfigSource = new PropertiesConfigSource(properties, false);
-    Properties configProperties =
-        loadConfigurationFile(
-            new ConfigProvider(
-                new SystemPropertiesConfigSource(),
-                new EnvironmentConfigSource(),
-                providedConfigSource));
+    ConfigProvider minimalProvider =
+        new ConfigProvider(
+            new SystemPropertiesConfigSource(),
+            new EnvironmentConfigSource(),
+            providedConfigSource);
+
+    // TODO: Set default value to false before merging
+    ConfigHelper.setConfigInversionStrict(
+        minimalProvider.getBoolean(CONFIG_INVERSION_STRICT, true));
+
+    Properties configProperties = loadConfigurationFile(minimalProvider);
     if (configProperties.isEmpty()) {
       return new ConfigProvider(
           new SystemPropertiesConfigSource(),