nits: add configId in ConfigProvider methods where it was missing; fix configId test to accommodate new ConfigCollector data structure

Author: mtoffl01

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

@@ -19,6 +19,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -79,6 +80,7 @@ public <T extends Enum<T>> T getEnum(String key, Class<T> enumType, T defaultVal
   }
 
   public String getString(String key, String defaultValue, String... aliases) {
+    boolean toLog = (Objects.equals(key, "test.key"));
     if (collectConfig) {
       ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT, DEFAULT_SEQ_ID);
     }

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

@@ -321,7 +321,7 @@ class ConfigCollectorTest extends DDSpecification {
 
     then:
     // Verify the config was collected but without a config ID
-    def setting = settings.get(key)
+    def setting = settings.get(ConfigOrigin.JVM_PROP).get(key)
     setting != null
     setting.configId == null
     setting.value == value