Support new addConfigurationByOrigin API on TelemetryService, and update tests accordingly

Author: mtoffl01

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

@@ -128,7 +128,7 @@ public String toString() {
         + stringValue()
         + ", origin="
         + origin
-        + ", seq_id="
+        + ", seqId="
         + seqId
         + '}';
   }

telemetry/src/main/java/datadog/telemetry/TelemetryRunnable.java

@@ -3,6 +3,7 @@
 import datadog.telemetry.metric.MetricPeriodicAction;
 import datadog.trace.api.Config;
 import datadog.trace.api.ConfigCollector;
+import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.ConfigSetting;
 import datadog.trace.api.time.SystemTimeSource;
 import datadog.trace.api.time.TimeSource;
@@ -141,9 +142,9 @@ private void mainLoopIteration() throws InterruptedException {
   }
 
   private void collectConfigChanges() {
-    Map<String, ConfigSetting> collectedConfig = ConfigCollector.get().collect();
+    Map<String, Map<ConfigOrigin, ConfigSetting>> collectedConfig = ConfigCollector.get().collect();
     if (!collectedConfig.isEmpty()) {
-      telemetryService.addConfiguration(collectedConfig);
+      telemetryService.addConfigurationByOrigin(collectedConfig);
     }
   }
 

telemetry/src/main/java/datadog/telemetry/TelemetryService.java

@@ -7,6 +7,7 @@
 import datadog.telemetry.api.Metric;
 import datadog.telemetry.api.RequestType;
 import datadog.telemetry.dependency.Dependency;
+import datadog.trace.api.ConfigOrigin;
 import datadog.trace.api.ConfigSetting;
 import datadog.trace.api.telemetry.Endpoint;
 import datadog.trace.api.telemetry.ProductChange;
@@ -94,6 +95,27 @@ public boolean addConfiguration(Map<String, ConfigSetting> configuration) {
     return true;
   }
 
+  /**
+   * Adds all configuration settings from the provided map, grouped by their origin.
+   *
+   * @param configuration a map of configuration keys to a map of origins and their corresponding
+   *     settings
+   * @return {@code true} if all settings were successfully added, {@code false} if the queue is
+   *     full
+   */
+  public boolean addConfigurationByOrigin(
+      Map<String, Map<ConfigOrigin, ConfigSetting>> configuration) {
+    for (Map<ConfigOrigin, ConfigSetting> settings : configuration.values()) {
+      for (ConfigSetting cs : settings.values()) {
+        extendedHeartbeatData.pushConfigSetting(cs);
+        if (!this.configurations.offer(cs)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   public boolean addDependency(Dependency dependency) {
     extendedHeartbeatData.pushDependency(dependency);
     return this.dependencies.offer(dependency);

telemetry/src/test/groovy/datadog/telemetry/TestTelemetryRouter.groovy

@@ -237,7 +237,7 @@ class TestTelemetryRouter extends TelemetryRouter {
       def expected = configuration == null ? null : []
       if (configuration != null) {
         for (ConfigSetting cs : configuration) {
-          expected.add([name: cs.normalizedKey(), value: cs.stringValue(), origin: cs.origin.value])
+          expected.add([name: cs.normalizedKey(), value: cs.stringValue(), origin: cs.origin.value, seqId: cs.seqId])
         }
       }
       assert this.payload['configuration'] == expected