nits, and add error field to ConfigSetting

Author: mtoffl01

dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java

@@ -563,7 +563,8 @@ private void setAppSecActivation(final AppSecFeatures.Asm asm) {
     } else {
       newState = asm.enabled;
       // Report AppSec activation change via telemetry when modified via remote config
-      ConfigCollector.get().put(APPSEC_ENABLED, asm.enabled, ConfigOrigin.REMOTE);
+      ConfigCollector.get()
+          .put(APPSEC_ENABLED, asm.enabled, ConfigOrigin.REMOTE); // TODO: Report seq id?
     }
     if (AppSecSystem.isActive() != newState) {
       log.info("AppSec {} (runtime)", newState ? "enabled" : "disabled");

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

@@ -5217,6 +5217,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;
@@ -5240,6 +5241,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/ConfigSetting.java

@@ -12,6 +12,7 @@ public final class ConfigSetting {
   public final Object value;
   public final ConfigOrigin origin;
   public final int seqId;
+  public final boolean error;
 
   public static final int DEFAULT_SEQ_ID = 1;
   private static final int ABSENT_SEQ_ID = 0;
@@ -21,18 +22,24 @@ public final class ConfigSetting {
           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, ABSENT_SEQ_ID);
+    return new ConfigSetting(key, value, origin, ABSENT_SEQ_ID, false);
   }
 
   public static ConfigSetting of(String key, Object value, ConfigOrigin origin, int seqId) {
-    return new ConfigSetting(key, value, origin, seqId);
+    return new ConfigSetting(key, value, origin, seqId, false);
   }
 
-  private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId) {
+  public static ConfigSetting of(
+      String key, Object value, ConfigOrigin origin, int seqId, boolean error) {
+    return new ConfigSetting(key, value, origin, seqId, error);
+  }
+
+  private ConfigSetting(String key, Object value, ConfigOrigin origin, int seqId, boolean error) {
     this.key = key;
     this.value = CONFIG_FILTER_LIST.contains(key) ? "<hidden>" : value;
     this.origin = origin;
     this.seqId = seqId;
+    this.error = error;
   }
 
   public String normalizedKey() {
@@ -111,7 +118,8 @@ public boolean equals(Object o) {
     return key.equals(that.key)
         && Objects.equals(value, that.value)
         && origin == that.origin
-        && seqId == that.seqId;
+        && seqId == that.seqId
+        && error == that.error;
   }
 
   @Override
@@ -132,5 +140,6 @@ public String toString() {
         + ", seqId="
         + seqId
         + '}';
+    // whether to write errors
   }
 }

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

@@ -261,7 +261,8 @@ public Set<String> getSet(String key, Set<String> defaultValue) {
     String list = getString(key);
     if (null == list) {
       if (collectConfig) {
-        ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+        ConfigCollector.get()
+            .put(key, defaultValue, ConfigOrigin.DEFAULT, ConfigSetting.DEFAULT_SEQ_ID);
       }
       return defaultValue;
     } else {
@@ -394,7 +395,8 @@ public BitSet getIntegerRange(final String key, final BitSet defaultValue, Strin
       log.warn("Invalid configuration for {}", key, e);
     }
     if (collectConfig) {
-      ConfigCollector.get().put(key, defaultValue, ConfigOrigin.DEFAULT);
+      ConfigCollector.get()
+          .put(key, defaultValue, ConfigOrigin.DEFAULT, ConfigSetting.DEFAULT_SEQ_ID);
     }
     return defaultValue;
   }

telemetry/src/test/groovy/datadog/telemetry/TelemetryRequestBodySpecification.groovy

@@ -102,7 +102,7 @@ class TelemetryRequestBodySpecification extends DDSpecification {
     req.endConfiguration()
 
     then:
-    drainToString(req) == ',"configuration":[{"name":"this_is_a_key","value":"value","origin":"remote_config"}]'
+    drainToString(req) == ',"configuration":[{"name":"this_is_a_key","value":"value","origin":"remote_config","seq_id":0}]'
   }
 
   def 'add debug flag'() {