Support reading configurations from files #8338
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package datadog.trace.bootstrap.config.provider; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Paths; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
| import java.util.stream.Stream; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class StableConfigParser { | ||
| private static final Logger log = LoggerFactory.getLogger(StableConfigParser.class); | ||
| // Match config_id:<value> | ||
| private static final Pattern idPattern = Pattern.compile("^config_id\\s*:(.*)$"); | ||
| // Match 'apm_configuration_default:' | ||
| private static final Pattern apmConfigPattern = Pattern.compile("^apm_configuration_default:$"); | ||
| // Match indented (2 spaces) key-value pairs, either with double quotes or without | ||
| private static final Pattern keyValPattern = | ||
| Pattern.compile("^\\s{2}([^:]+):\\s*(\"[^\"]*\"|[^\"\\n]*)$");; | ||
|
|
||
| public static StableConfigSource.StableConfig parse(String filePath) throws IOException { | ||
| File file = new File(filePath); | ||
| if (!file.exists()) { | ||
| log.debug("Stable configuration file not available at specified path: {}", file); | ||
| return StableConfigSource.StableConfig.EMPTY; | ||
| } | ||
| Map<String, String> configMap = new HashMap<>(); | ||
| String[] configId = new String[1]; | ||
| try (Stream<String> lines = Files.lines(Paths.get(filePath))) { | ||
mtoffl01 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| int apmConfigNotFound = -1, apmConfigStarted = 0, apmConfigComplete = 1; | ||
| int[] apmConfigFound = {apmConfigNotFound}; | ||
| lines.forEach( | ||
| line -> { | ||
| Matcher matcher = idPattern.matcher(line); | ||
|
There was a problem hiding this comment. Is there only one configId per file? If so then we can store this in a There was a problem hiding this comment. Is there expected to only be one config_id per file? — Theoretically yes, but neither the spec nor the tests specify how to handle multiple the scenario where multiple config_ids are present. I'm reaching out to the channel now to see if we want to standardize on this behavior. |
||
| if (matcher.find()) { | ||
| // Do not allow duplicate config_id keys | ||
| if (configId[0] != null) { | ||
| throw new RuntimeException("Duplicate config_id keys found; file may be malformed"); | ||
| } | ||
| configId[0] = trimQuotes(matcher.group(1).trim()); | ||
| return; // go to next line | ||
| } | ||
| // TODO: Do not allow duplicate apm_configuration_default keys; and/or return early once | ||
| // apmConfigFound[0] == apmConfigComplete | ||
| if (apmConfigFound[0] == apmConfigNotFound | ||
| && apmConfigPattern.matcher(line).matches()) { | ||
| apmConfigFound[0] = apmConfigStarted; | ||
| return; // go to next line | ||
| } | ||
| if (apmConfigFound[0] == apmConfigStarted) { | ||
| Matcher keyValueMatcher = keyValPattern.matcher(line); | ||
| if (keyValueMatcher.matches()) { | ||
| configMap.put( | ||
| keyValueMatcher.group(1).trim(), | ||
| trimQuotes(keyValueMatcher.group(2).trim())); // Store key-value pair in map | ||
| } else { | ||
| // If we encounter a non-indented or non-key-value line, stop processing | ||
| apmConfigFound[0] = apmConfigComplete; | ||
| } | ||
| } | ||
| }); | ||
|
There was a problem hiding this comment. It's a shame that the Java 8 stream API doesn't have the It's possible to mimic those with a custom but TBH I think the approach taken here is fine given the limited API available to us in Java 8 |
||
| return new StableConfigSource.StableConfig(configId[0], configMap); | ||
| } | ||
| } | ||
|
|
||
| private static String trimQuotes(String value) { | ||
| if (value.length() > 1 && (value.startsWith("'") && value.endsWith("'")) | ||
| || (value.startsWith("\"") && value.endsWith("\""))) { | ||
| return value.substring(1, value.length() - 1); | ||
mtoffl01 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return value; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package datadog.trace.bootstrap.config.provider; | ||
|
|
||
| import static datadog.trace.util.Strings.propertyNameToEnvironmentVariableName; | ||
|
|
||
| import datadog.trace.api.ConfigOrigin; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public final class StableConfigSource extends ConfigProvider.Source { | ||
| private static final Logger log = LoggerFactory.getLogger(StableConfigSource.class); | ||
|
|
||
| public static final String USER_STABLE_CONFIG_PATH = | ||
| "/etc/datadog-agent/application_monitoring.yaml"; | ||
| public static final String MANAGED_STABLE_CONFIG_PATH = | ||
| "/etc/datadog-agent/managed/datadog-agent/stable/application_monitoring.yaml"; | ||
| public static final StableConfigSource USER = | ||
| new StableConfigSource(USER_STABLE_CONFIG_PATH, ConfigOrigin.USER_STABLE_CONFIG); | ||
| public static final StableConfigSource MANAGED = | ||
| new StableConfigSource( | ||
| StableConfigSource.MANAGED_STABLE_CONFIG_PATH, ConfigOrigin.MANAGED_STABLE_CONFIG); | ||
|
|
||
| private final ConfigOrigin fileOrigin; | ||
|
|
||
| private final StableConfig config; | ||
|
|
||
| StableConfigSource(String file, ConfigOrigin origin) { | ||
| this.fileOrigin = origin; | ||
| StableConfig cfg; | ||
| try { | ||
| cfg = StableConfigParser.parse(file); | ||
| } catch (Throwable e) { | ||
| log.debug("Stable configuration file not readable at specified path: {}", file); | ||
| cfg = StableConfig.EMPTY; | ||
| } | ||
| this.config = cfg; | ||
| } | ||
|
|
||
| @Override | ||
| public String get(String key) { | ||
| if (this.config == StableConfig.EMPTY) { | ||
| return null; | ||
| } | ||
| return this.config.get(propertyNameToEnvironmentVariableName(key)); | ||
mtoffl01 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| @Override | ||
| public ConfigOrigin origin() { | ||
| return fileOrigin; | ||
| } | ||
|
|
||
| public Set<String> getKeys() { | ||
| return this.config.getKeys(); | ||
| } | ||
|
|
||
| public String getConfigId() { | ||
| return this.config.getConfigId(); | ||
| } | ||
|
|
||
| public static class StableConfig { | ||
| public static final StableConfig EMPTY = new StableConfig(null, Collections.emptyMap()); | ||
| private final Map<String, String> apmConfiguration; | ||
| private final String configId; | ||
|
|
||
| StableConfig(String configId, Map<String, String> configMap) { | ||
| this.configId = configId; | ||
| this.apmConfiguration = configMap; | ||
| } | ||
|
|
||
| public String get(String key) { | ||
| return this.apmConfiguration.get(key); | ||
| } | ||
|
|
||
| public Set<String> getKeys() { | ||
| return this.apmConfiguration.keySet(); | ||
| } | ||
|
|
||
| public String getConfigId() { | ||
| return this.configId; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.