Clean up stableconfig stuff

Author: ygree

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

@@ -1,8 +1,8 @@
 package datadog.trace.bootstrap.config.provider;
 
-import datadog.trace.bootstrap.config.provider.stableconfigyaml.Rule;
-import datadog.trace.bootstrap.config.provider.stableconfigyaml.Selector;
-import datadog.trace.bootstrap.config.provider.stableconfigyaml.StableConfigYaml;
+import datadog.trace.bootstrap.config.provider.stableconfig.Rule;
+import datadog.trace.bootstrap.config.provider.stableconfig.Selector;
+import datadog.trace.bootstrap.config.provider.stableconfig.StableConfig;
 import datadog.yaml.YamlParser;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -42,15 +42,14 @@ public static StableConfigSource.StableConfig parse(String filePath) throws IOEx
       String content = new String(Files.readAllBytes(Paths.get(filePath)), StandardCharsets.UTF_8);
       String processedContent = processTemplate(content);
       Object parsedYaml = YamlParser.parse(processedContent);
-      StableConfigYaml data = new StableConfigYaml(parsedYaml);
+      StableConfig data = new StableConfig(parsedYaml);
 
-      String configId = data.getConfig_id();
-      Map<String, Object> configMap = data.getApm_configuration_default();
-      List<Rule> rules = data.getApm_configuration_rules();
+      String configId = data.getConfigId();
+      Map<String, Object> configMap = data.getApmConfigurationDefault();
+      List<Rule> rules = data.getApmConfigurationRules();
 
       if (!rules.isEmpty()) {
         for (Rule rule : rules) {
-          // Use the first matching rule
           if (doesRuleMatch(rule)) {
             // Merge configs found in apm_configuration_rules with those found in
             // apm_configuration_default
@@ -62,8 +61,7 @@ public static StableConfigSource.StableConfig parse(String filePath) throws IOEx
       }
       // If configs were found in apm_configuration_default, use them
       if (!configMap.isEmpty()) {
-        return new StableConfigSource.StableConfig(
-            configId, new LinkedHashMap<String, Object>(configMap));
+        return new StableConfigSource.StableConfig(configId, new LinkedHashMap<>(configMap));
       }
 
       // If there's a configId but no configMap, use configId but return an empty map
@@ -72,10 +70,7 @@ public static StableConfigSource.StableConfig parse(String filePath) throws IOEx
       }
 
     } catch (IOException e) {
-      log.debug(
-          "Stable configuration file either not found or not readable at filepath {}. Error: {}",
-          filePath,
-          e.getMessage());
+      log.debug("Failed to read the stable configuration file: {}", filePath, e);
     }
     return StableConfigSource.StableConfig.EMPTY;
   }

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/stableconfigyaml/Rule.java renamed to internal-api/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Rule.java

@@ -1,6 +1,7 @@
-package datadog.trace.bootstrap.config.provider.stableconfigyaml;
+package datadog.trace.bootstrap.config.provider.stableconfig;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -9,13 +10,13 @@
 
 // Rule represents a set of selectors and their corresponding configurations found in stable
 // configuration files
-public class Rule {
-  private List<Selector> selectors;
-  private Map<String, Object> configuration;
+public final class Rule {
+  private final List<Selector> selectors;
+  private final Map<String, Object> configuration;
 
   public Rule() {
-    this.selectors = new ArrayList<>();
-    this.configuration = new LinkedHashMap<>();
+    this.selectors = Collections.unmodifiableList(new ArrayList<>());
+    this.configuration = Collections.unmodifiableMap(new LinkedHashMap<>());
   }
 
   public Rule(List<Selector> selectors, Map<String, Object> configuration) {
@@ -26,9 +27,10 @@ public Rule(List<Selector> selectors, Map<String, Object> configuration) {
   public Rule(Object yaml) {
     Map map = (Map) yaml;
     selectors =
-        ((List<Object>) map.get("selectors"))
-            .stream().filter(Objects::nonNull).map(Selector::new).collect(Collectors.toList());
-    configuration = (Map<String, Object>) map.get("configuration");
+        Collections.unmodifiableList(
+            ((List<Object>) map.get("selectors"))
+                .stream().filter(Objects::nonNull).map(Selector::new).collect(Collectors.toList()));
+    configuration = Collections.unmodifiableMap((Map<String, Object>) map.get("configuration"));
   }
 
   public List<Selector> getSelectors() {

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/stableconfigyaml/Selector.java renamed to internal-api/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java

@@ -1,13 +1,14 @@
-package datadog.trace.bootstrap.config.provider.stableconfigyaml;
+package datadog.trace.bootstrap.config.provider.stableconfig;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-public class Selector {
-  private String origin;
-  private String key;
-  private List<String> matches;
-  private String operator;
+public final class Selector {
+  private final String origin;
+  private final String key;
+  private final List<String> matches;
+  private final String operator;
 
   public Selector(String origin, String key, List<String> matches, String operator) {
     this.origin = origin;
@@ -20,39 +21,23 @@ public Selector(Object yaml) {
     Map map = (Map) yaml;
     origin = (String) map.get("origin");
     key = (String) map.get("key");
-    matches = (List<String>) map.get("matches");
+    matches = Collections.unmodifiableList((List<String>) map.get("matches"));
     operator = (String) map.get("operator");
   }
 
   public String getOrigin() {
     return origin;
   }
 
-  public void setOrigin(String origin) {
-    this.origin = origin;
-  }
-
   public String getKey() {
     return key;
   }
 
-  public void setKey(String key) {
-    this.key = key;
-  }
-
   public List<String> getMatches() {
     return matches;
   }
 
-  public void setMatches(List<String> matches) {
-    this.matches = matches;
-  }
-
   public String getOperator() {
     return operator;
   }
-
-  public void setOperator(String operator) {
-    this.operator = operator;
-  }
 }

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

@@ -0,0 +1,45 @@
+package datadog.trace.bootstrap.config.provider.stableconfig;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public final class StableConfig {
+  private final String configId;
+  private final Map<String, Object> apmConfigurationDefault;
+  private final List<Rule> apmConfigurationRules;
+
+  public StableConfig(Object yaml) {
+    Map<Object, Object> map = (Map<Object, Object>) yaml;
+    this.configId = String.valueOf(map.get("config_id"));
+    this.apmConfigurationDefault =
+        Collections.unmodifiableMap(
+            (Map<String, Object>)
+                map.getOrDefault("apm_configuration_default", new LinkedHashMap<>()));
+    this.apmConfigurationRules =
+        Collections.unmodifiableList(
+            ((List<Object>) map.getOrDefault("apm_configuration_rules", new ArrayList<>()))
+                .stream().map(Rule::new).collect(Collectors.toList()));
+  }
+
+  public StableConfig(String configId, Map<String, Object> apmConfigurationDefault) {
+    this.configId = configId;
+    this.apmConfigurationDefault = apmConfigurationDefault;
+    this.apmConfigurationRules = new ArrayList<>();
+  }
+
+  public String getConfigId() {
+    return configId;
+  }
+
+  public Map<String, Object> getApmConfigurationDefault() {
+    return apmConfigurationDefault;
+  }
+
+  public List<Rule> getApmConfigurationRules() {
+    return apmConfigurationRules;
+  }
+}