open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support empty values in config maps (#4037) 

* Support empty values in config maps

* Rename method
This commit is contained in:
Trask Stalnaker 2021-09-02 00:00:29 -07:00 committed by GitHub
parent d185377399
commit ec99db5e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/config/ConfigValueParsers.java
View File

@ -55,15 +55,15 @@ final class ConfigValueParsers {
}
static List<String> parseList(@SuppressWarnings("unused") String propertyName, String value) {
return Collections.unmodifiableList(filterBlanksAndNulls(value.split(",")));
return Collections.unmodifiableList(filterBlanks(value.split(",")));
}
static Map<String, String> parseMap(String propertyName, String value) {
return parseList(propertyName, value).stream()
.map(keyValuePair -> filterBlanksAndNulls(keyValuePair.split("=", 2)))
.map(keyValuePair -> trim(keyValuePair.split("=", 2)))
.map(
splitKeyValuePairs -> {
if (splitKeyValuePairs.size() != 2) {
if (splitKeyValuePairs.size() != 2 || splitKeyValuePairs.get(0).isEmpty()) {
throw new ConfigParsingException(
"Invalid map property: " + propertyName + "=" + value);
}
@ -77,13 +77,17 @@ final class ConfigValueParsers {
Map.Entry::getKey, Map.Entry::getValue, (first, next) -> next, LinkedHashMap::new));
}
private static List<String> filterBlanksAndNulls(String[] values) {
private static List<String> filterBlanks(String[] values) {
return Arrays.stream(values)
.map(String::trim)
.filter(s -> !s.isEmpty())
.collect(Collectors.toList());
}
private static List<String> trim(String[] values) {
return Arrays.stream(values).map(String::trim).collect(Collectors.toList());
}
static Duration parseDuration(String propertyName, String value) {
String unitString = getUnitString(value);
String numberString = value.substring(0, value.length() - unitString.length());

8
javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesAdapterTest.java
View File

@ -31,6 +31,7 @@ class ConfigPropertiesAdapterTest {
properties.put("double", "5.4");
properties.put("list", "cat,dog,bear");
properties.put("map", "cat=meow,dog=bark,bear=growl");
properties.put("mapWithEmptyValue", "cat=meow,dog=,bear=growl");
properties.put("duration", "1s");
ConfigProperties config = createConfig(properties);
@ -41,6 +42,8 @@ class ConfigPropertiesAdapterTest {
assertThat(config.getCommaSeparatedValues("list")).containsExactly("cat", "dog", "bear");
assertThat(config.getCommaSeparatedMap("map"))
.containsExactly(entry("cat", "meow"), entry("dog", "bark"), entry("bear", "growl"));
assertThat(config.getCommaSeparatedMap("mapWithEmptyValue"))
.containsExactly(entry("cat", "meow"), entry("dog", ""), entry("bear", "growl"));
assertThat(config.getDuration("duration")).isEqualTo(Duration.ofSeconds(1));
}
@ -131,11 +134,6 @@ class ConfigPropertiesAdapterTest {
@Test
void invalidMap() {
assertThatThrownBy(
() ->
createConfig(Collections.singletonMap("map", "a=1,b=")).getCommaSeparatedMap("map"))
.isInstanceOf(ConfigurationException.class)
.hasMessage("Invalid map property: map=a=1,b=");
assertThatThrownBy(
() ->
createConfig(Collections.singletonMap("map", "a=1,b")).getCommaSeparatedMap("map"))