Skip to content

Commit 7cac55a

Browse files
committed
introduce getAppliedConfigSetting helper fn to ConfigCollector
1 parent 8dbe370 commit 7cac55a

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void run() throws InterruptedException {
4444
}
4545

4646
private static Object getLogInjectionEnabled() {
47-
ConfigSetting configSetting = ConfigCollector.get().collect().get(LOGS_INJECTION_ENABLED);
47+
ConfigSetting configSetting =
48+
ConfigCollector.get().getAppliedConfigSetting(LOGS_INJECTION_ENABLED);
4849
if (configSetting == null) {
4950
return null;
5051
}

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ public Map<ConfigOrigin, Map<String, ConfigSetting>> collect() {
5151
return Collections.emptyMap();
5252
}
5353
}
54-
}
5554

56-
// public ConfigSetting getAppliedConfigSetting(String key) {}
55+
public ConfigSetting getAppliedConfigSetting(String key) {
56+
ConfigSetting best = null;
57+
for (Map<String, ConfigSetting> configMap : collected.values()) {
58+
ConfigSetting setting = configMap.get(key);
59+
if (setting != null) {
60+
if (best == null || setting.seqId > best.seqId) {
61+
best = setting;
62+
}
63+
}
64+
}
65+
return best;
66+
}
67+
}

0 commit comments

Comments
 (0)