initial introduction of config_id

Author: mtoffl01

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

@@ -27,6 +27,11 @@ public void put(String key, Object value, ConfigOrigin origin) {
     collected.put(key, setting);
   }
 
+  public void put(String key, Object value, ConfigOrigin origin, String configId) {
+    ConfigSetting setting = ConfigSetting.of(key, value, origin);
+    collected.put(key, setting);
+  }
+
   public void putAll(Map<String, Object> keysAndValues, ConfigOrigin origin) {
     // attempt merge+replace to avoid collector seeing partial update
     Map<String, ConfigSetting> merged =

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

@@ -11,19 +11,25 @@ public final class ConfigSetting {
   public final String key;
   public final Object value;
   public final ConfigOrigin origin;
+  public final String configId;
 
   private static final Set<String> CONFIG_FILTER_LIST =
       new HashSet<>(
           Arrays.asList("DD_API_KEY", "dd.api-key", "dd.profiling.api-key", "dd.profiling.apikey"));
 
   public static ConfigSetting of(String key, Object value, ConfigOrigin origin) {
-    return new ConfigSetting(key, value, origin);
+    return new ConfigSetting(key, value, origin, null);
   }
 
-  private ConfigSetting(String key, Object value, ConfigOrigin origin) {
+  public static ConfigSetting of(String key, Object value, ConfigOrigin origin, String configId) {
+    return new ConfigSetting(key, value, origin, configId);
+  }
+
+  private ConfigSetting(String key, Object value, ConfigOrigin origin, String configId) {
     this.key = key;
     this.value = CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
     this.origin = origin;
+    this.configId = configId;
   }
 
   public String normalizedKey() {
@@ -99,12 +105,15 @@ public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     ConfigSetting that = (ConfigSetting) o;
-    return key.equals(that.key) && Objects.equals(value, that.value) && origin == that.origin;
+    return key.equals(that.key)
+        && Objects.equals(value, that.value)
+        && origin == that.origin
+        && configId.equals(that.configId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(key, value, origin);
+    return Objects.hash(key, value, origin, configId);
   }
 
   @Override
@@ -117,6 +126,8 @@ public String toString() {
         + stringValue()
         + ", origin="
         + origin
+        + ", configId="
+        + configId
         + '}';
   }
 }

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

@@ -78,7 +78,12 @@ public String getString(String key, String defaultValue, String... aliases) {
       String value = source.get(key, aliases);
       if (value != null) {
         if (collectConfig) {
-          ConfigCollector.get().put(key, value, source.origin());
+          if (source instanceof StableConfigSource) {
+            String configId = ((StableConfigSource) source).getConfigId();
+            ConfigCollector.get().put(key, value, source.origin(), configId);
+          } else {
+            ConfigCollector.get().put(key, value, source.origin());
+          }
         }
         return value;
       }