moving normalization to ConfigSetting

Author: mhlidd

utils/config-utils/src/main/java/datadog/trace/api/ConfigSetting.java

@@ -1,6 +1,7 @@
 package datadog.trace.api;
 
 import static datadog.trace.util.ConfigStrings.propertyNameToEnvironmentVariableName;
+import static datadog.trace.util.ConfigStrings.toEnvVar;
 
 import java.util.Arrays;
 import java.util.BitSet;
@@ -53,6 +54,10 @@ private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId,
   }
 
   public String normalizedKey() {
+    // OTel configurations should not be normalized with DD_
+    if (key.startsWith("otel.") || key.startsWith("OTEL_")) {
+      return toEnvVar(key);
+    }
     return propertyNameToEnvironmentVariableName(key);
   }
 

utils/config-utils/src/main/java/datadog/trace/util/ConfigStrings.java

@@ -23,10 +23,6 @@ public static String toEnvVarLowerCase(String string) {
    */
   @Nonnull
   public static String propertyNameToEnvironmentVariableName(final String setting) {
-    // OTel configurations should not be normalized with DD_
-    if (setting.startsWith("otel.") || setting.startsWith("OTEL_")) {
-      return toEnvVar(setting);
-    }
     return "DD_" + toEnvVar(setting);
   }