fixing config helper

Author: mhlidd

components/environment/src/generator/resources/supported-configurations.json

@@ -1140,6 +1140,8 @@
     "DD_TRACE_SPLIT_BY_TAGS": ["A"],
     "DD_TRACE_SPRAY_ANALYTICS_ENABLED": ["A"],
     "DD_TRACE_SPRAY_ANALYTICS_SAMPLE_RATE": ["A"],
+    "DD_TRACE_SPRAY_HTTP_ENABLED": ["A"],
+    "DD_TRACE_SPRAY_HTTP_SERVER_ENABLED": ["A"],
     "DD_TRACE_SPRING_ASYNC_ENABLED": ["A"],
     "DD_TRACE_SPRING_BEANS_ENABLED": ["A"],
     "DD_TRACE_SPRING_BOOT_ENABLED": ["A"],
@@ -1639,6 +1641,7 @@
     "DD_TRACE_PEKKO_HTTP_ENABLED": ["DD_TRACE_INTEGRATION_PEKKO_HTTP_ENABLED","DD_INTEGRATION_PEKKO_HTTP_ENABLED"],
     "DD_TRACE_PEKKO_HTTP_SERVER_ANALYTICS_SAMPLE_RATE": ["DD_PEKKO_HTTP_SERVER_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_PEKKO_HTTP_SERVER_ENABLED": ["DD_TRACE_INTEGRATION_PEKKO_HTTP_SERVER_ENABLED","DD_INTEGRATION_PEKKO_HTTP_SERVER_ENABLED"],
+    "DD_TRACE_PEKKO_SCHEDULER_ENABLED": ["DD_TRACE_INTEGRATION_PEKKO_SCHEDULER_ENABLED","DD_INTEGRATION_PEKKO_SCHEDULER_ENABLED"],
     "DD_TRACE_PLAY_ACTION_ENABLED": ["DD_TRACE_INTEGRATION_PLAY_ACTION_ENABLED","DD_INTEGRATION_PLAY_ACTION_ENABLED"],
     "DD_TRACE_PLAY_ANALYTICS_SAMPLE_RATE": ["DD_PLAY_ANALYTICS_SAMPLE_RATE"],
     "DD_TRACE_PLAY_ENABLED": ["DD_TRACE_INTEGRATION_PLAY_ENABLED","DD_INTEGRATION_PLAY_ENABLED"],
@@ -1733,6 +1736,8 @@
     "DD_TRACE_SPARK_EXIT_ENABLED": ["DD_TRACE_INTEGRATION_SPARK_EXIT_ENABLED","DD_INTEGRATION_SPARK_EXIT_ENABLED"],
     "DD_TRACE_SPARK_OPENLINEAGE_ENABLED": ["DD_TRACE_INTEGRATION_SPARK_OPENLINEAGE_ENABLED","DD_INTEGRATION_SPARK_OPENLINEAGE_ENABLED"],
     "DD_TRACE_SPRAY_ANALYTICS_SAMPLE_RATE": ["DD_SPRAY_ANALYTICS_SAMPLE_RATE"],
+    "DD_TRACE_SPRAY_HTTP_ENABLED": ["DD_TRACE_INTEGRATION_SPRAY_HTTP_ENABLED","DD_INTEGRATION_SPRAY_HTTP_ENABLED"],
+    "DD_TRACE_SPRAY_HTTP_SERVER_ENABLED": ["DD_TRACE_INTEGRATION_SPRAY_HTTP_SERVER_ENABLED","DD_INTEGRATION_SPRAY_HTTP_SERVER_ENABLED"],
     "DD_TRACE_SPRING_ASYNC_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_ASYNC_ENABLED","DD_INTEGRATION_SPRING_ASYNC_ENABLED"],
     "DD_TRACE_SPRING_BEANS_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_BEANS_ENABLED","DD_INTEGRATION_SPRING_BEANS_ENABLED"],
     "DD_TRACE_SPRING_BOOT_ENABLED": ["DD_TRACE_INTEGRATION_SPRING_BOOT_ENABLED","DD_INTEGRATION_SPRING_BOOT_ENABLED"],

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

@@ -57,9 +57,8 @@ public static Map<String, String> getEnvironmentVariables() {
   }
 
   public static String getEnvironmentVariable(String name) {
-    if ((name.startsWith("DD_")
-            || name.startsWith("OTEL_")
-            || GeneratedSupportedConfigurations.ALIAS_MAPPING.containsKey(name))
+    if ((name.startsWith("DD_") || name.startsWith("OTEL_"))
+        && !GeneratedSupportedConfigurations.ALIAS_MAPPING.containsKey(name)
         && !GeneratedSupportedConfigurations.SUPPORTED.contains(name)
         && configInversionStrict) {
       System.err.println(

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

@@ -1,5 +1,6 @@
 package datadog.environment;
 
+import de.thetaphi.forbiddenapis.SuppressForbidden;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -32,6 +33,7 @@ private EnvironmentVariables() {}
    * @return The environment variable value, {@code defaultValue} if missing, can't be retrieved or
    *     the environment variable name is {@code null}.
    */
+  @SuppressForbidden
   public static String getOrDefault(@Nonnull String name, String defaultValue) {
     if (name == null) {
       return defaultValue;

gradle/jacoco.gradle

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