adding branch coverage

Author: mhlidd

components/environment/build.gradle.kts

@@ -58,10 +58,12 @@ tasks.shadowJar {
 extra.set("minimumInstructionCoverage", 0.7)
 val excludedClassesCoverage by extra {
   listOf(
+    "datadog.environment.GeneratedSupportedConfigurations", // generated static file
     "datadog.environment.JavaVirtualMachine", // depends on OS and JVM vendor
     "datadog.environment.JavaVirtualMachine.JvmOptionsHolder", // depends on OS and JVM vendor
     "datadog.environment.JvmOptions", // depends on OS and JVM vendor
     "datadog.environment.OperatingSystem", // depends on OS
+    "datadog.environment.SupportedConfigurationSource", // wrapper class
   )
 }
 val excludedClassesBranchCoverage by extra {

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

@@ -56,12 +56,14 @@ public static Map<String, String> getEnvironmentVariables() {
             }
           }
         }
-        //        if (deprecatedConfigurations.containsKey(key)) {
+
+        // TODO: Follow-up - Add deprecation handling
+        //        if (configSource.getDeprecatedConfigurations().containsKey(key)) {
         //          String warning = "Environment variable " + key + " is deprecated. " +
-        //              (aliasMapping.containsKey(key)
-        //                  ? "Please use " + aliasMapping.get(key) + " instead."
-        //                  : deprecatedConfigurations.get(key));
-        //          System.err.println(warning); // TODO: REPLACE with log call
+        //              (configSource.getAliasMapping().containsKey(key)
+        //                  ? "Please use " + configSource.getAliasMapping().get(key) + " instead."
+        //                  : configSource.getDeprecatedConfigurations().get(key));
+        //          System.err.println(warning);
         //        }
       } else {
         configs.put(key, value);

components/environment/src/test/java/datadog/environment/ConfigHelperTest.java

@@ -32,6 +32,10 @@ public class ConfigHelperTest {
   private static final String NON_DD_ALIAS_VAR = "TEST_CONFIG_ALIAS";
   private static final String NON_DD_ALIAS_VAL = "test_alias_val_non_dd";
 
+  private static final String NEW_ALIAS_TARGET = "DD_NEW_ALIAS_TARGET";
+  private static final String NEW_ALIAS_KEY_1 = "DD_NEW_ALIAS_KEY_1";
+  private static final String NEW_ALIAS_KEY_2 = "DD_NEW_ALIAS_KEY_2";
+
   private static ConfigInversionStrictStyle strictness;
   private static TestSupportedConfigurationSource testSource;
 
@@ -43,10 +47,12 @@ static void setUp() {
 
     Map<String, List<String>> testAliases = new HashMap<>();
     testAliases.put(TEST_DD_VAR, Arrays.asList(ALIAS_DD_VAR, NON_DD_ALIAS_VAR));
+    testAliases.put(NEW_ALIAS_TARGET, Arrays.asList(NEW_ALIAS_KEY_1));
 
     Map<String, String> testAliasMapping = new HashMap<>();
     testAliasMapping.put(ALIAS_DD_VAR, TEST_DD_VAR);
     testAliasMapping.put(NON_DD_ALIAS_VAR, TEST_DD_VAR);
+    testAliasMapping.put(NEW_ALIAS_KEY_2, NEW_ALIAS_TARGET);
 
     // Create and set test configuration source
     testSource =
@@ -186,6 +192,19 @@ void testAliasSkippedWhenBaseAlreadyPresent() {
     setEnvVar(NON_DD_ALIAS_VAR, null);
   }
 
+  @Test
+  void testInconsistentAliasesAndAliasMapping() {
+    setEnvVar(NEW_ALIAS_KEY_2, "some_value");
+
+    Map<String, String> result = ConfigHelper.getEnvironmentVariables();
+
+    assertFalse(result.containsKey(NEW_ALIAS_KEY_2));
+    assertFalse(result.containsKey(NEW_ALIAS_TARGET));
+
+    // Cleanup
+    setEnvVar(NEW_ALIAS_KEY_2, null);
+  }
+
   // Copied from utils.TestHelper
   @SuppressWarnings("unchecked")
   private static void setEnvVar(String envName, String envValue) {

dd-trace-api/build.gradle.kts

@@ -11,6 +11,7 @@ val minimumBranchCoverage by extra(0.8)
 val excludedClassesCoverage by extra(
   listOf(
     "datadog.trace.api.ConfigDefaults",
+    "datadog.trace.api.ConfigInversionStrictStyle",
     "datadog.trace.api.CorrelationIdentifier",
     "datadog.trace.api.DDSpanTypes",
     "datadog.trace.api.DDTags",

gradle/jacoco.gradle

@@ -37,9 +37,7 @@ if (!project.ext.hasProperty('excludedClassesBranchCoverage')) {
 }
 
 if (!project.ext.hasProperty('excludedClassesInstructionCoverage')) {
-  project.ext.excludedClassesInstructionCoverage = [
-    "datadog.environment.GeneratedSupportedConfigurations",
-    "datadog.environment.SupportedConfigurationSource"] // Generated static file
+  project.ext.excludedClassesInstructionCoverage = []
 }
 
 // defaults can be overridden per project: