apply all changes from PR #9327, accomodated to master

Author: mtoffl01

dd-smoke-tests/log-injection/src/main/java/datadog/smoketest/loginjection/BaseApplication.java

@@ -44,7 +44,8 @@ public void run() throws InterruptedException {
   }
 
   private static Object getLogInjectionEnabled() {
-    ConfigSetting configSetting = ConfigCollector.get().collect().get(LOGS_INJECTION_ENABLED);
+    ConfigSetting configSetting =
+        ConfigCollector.get().getAppliedConfigSetting(LOGS_INJECTION_ENABLED);
     if (configSetting == null) {
       return null;
     }

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

@@ -5219,6 +5219,7 @@ private static boolean isWindowsOS() {
   private static String getEnv(String name) {
     String value = EnvironmentVariables.get(name);
     if (value != null) {
+      // TODO: Report seqID?
       ConfigCollector.get().put(name, value, ConfigOrigin.ENV);
     }
     return value;
@@ -5242,6 +5243,7 @@ private static String getProp(String name) {
   private static String getProp(String name, String def) {
     String value = SystemProperties.getOrDefault(name, def);
     if (value != null) {
+      // TODO: report seqId?
       ConfigCollector.get().put(name, value, ConfigOrigin.JVM_PROP);
     }
     return value;

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

@@ -16,42 +16,52 @@ public class ConfigCollector {
   private static final AtomicReferenceFieldUpdater<ConfigCollector, Map> COLLECTED_UPDATER =
       AtomicReferenceFieldUpdater.newUpdater(ConfigCollector.class, Map.class, "collected");
 
-  private volatile Map<String, ConfigSetting> collected = new ConcurrentHashMap<>();
+  private volatile Map<ConfigOrigin, Map<String, ConfigSetting>> collected =
+      new ConcurrentHashMap<>();
 
   public static ConfigCollector get() {
     return INSTANCE;
   }
 
   public void put(String key, Object value, ConfigOrigin origin) {
     ConfigSetting setting = ConfigSetting.of(key, value, origin);
-    collected.put(key, setting);
+    Map<String, ConfigSetting> configMap =
+        collected.computeIfAbsent(origin, k -> new ConcurrentHashMap<>());
+    configMap.put(key, setting); // replaces any previous value for this key at origin
+  }
+
+  public void put(String key, Object value, ConfigOrigin origin, int seqId) {
+    ConfigSetting setting = ConfigSetting.of(key, value, origin, seqId);
+    Map<String, ConfigSetting> configMap =
+        collected.computeIfAbsent(origin, k -> new ConcurrentHashMap<>());
+    configMap.put(key, setting); // replaces any previous value for this key at origin
   }
 
   public void putAll(Map<String, Object> keysAndValues, ConfigOrigin origin) {
-    // attempt merge+replace to avoid collector seeing partial update
-    Map<String, ConfigSetting> merged =
-        new ConcurrentHashMap<>(keysAndValues.size() + collected.size());
     for (Map.Entry<String, Object> entry : keysAndValues.entrySet()) {
-      ConfigSetting setting = ConfigSetting.of(entry.getKey(), entry.getValue(), origin);
-      merged.put(entry.getKey(), setting);
-    }
-    while (true) {
-      Map<String, ConfigSetting> current = collected;
-      current.forEach(merged::putIfAbsent);
-      if (COLLECTED_UPDATER.compareAndSet(this, current, merged)) {
-        break; // success
-      }
-      // roll back to original update before next attempt
-      merged.keySet().retainAll(keysAndValues.keySet());
+      put(entry.getKey(), entry.getValue(), origin);
     }
   }
 
   @SuppressWarnings("unchecked")
-  public Map<String, ConfigSetting> collect() {
+  public Map<ConfigOrigin, Map<String, ConfigSetting>> collect() {
     if (!collected.isEmpty()) {
       return COLLECTED_UPDATER.getAndSet(this, new ConcurrentHashMap<>());
     } else {
       return Collections.emptyMap();
     }
   }
+
+  public ConfigSetting getAppliedConfigSetting(String key) {
+    ConfigSetting best = null;
+    for (Map<String, ConfigSetting> configMap : collected.values()) {
+      ConfigSetting setting = configMap.get(key);
+      if (setting != null) {
+        if (best == null || setting.seqId > best.seqId) {
+          best = setting;
+        }
+      }
+    }
+    return best;
+  }
 }

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

@@ -11,19 +11,28 @@ public final class ConfigSetting {
   public final String key;
   public final Object value;
   public final ConfigOrigin origin;
+  public final int seqId;
+
+  public static final int DEFAULT_SEQ_ID = 1;
+  private static final int ABSENT_SEQ_ID = 0;
 
   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, ABSENT_SEQ_ID);
+  }
+
+  public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId) {
+    return new ConfigSetting(key, value, origin, seqId);
   }
 
-  private ConfigSetting(String key, Object value, ConfigOrigin origin) {
+  private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId) {
     this.key = key;
     this.value = CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
     this.origin = origin;
+    this.seqId = seqId;
   }
 
   public String normalizedKey() {
@@ -99,12 +108,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
+        && seqId == that.seqId;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(key, value, origin);
+    return Objects.hash(key, value, origin, seqId);
   }
 
   @Override
@@ -117,6 +129,8 @@ public String toString() {
         + stringValue()
         + ", origin="
         + origin
+        + ", seqId="
+        + seqId
         + '}';
   }
 }