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

Add hyphen normalization to ConfigProperties (#4564)

This commit is contained in:
Mateusz Rzeszutek 2022-06-30 16:26:29 +02:00 committed by GitHub
parent 160b30a16a
commit 4c0cbba5d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/DefaultConfigProperties.java
View File

@ -50,14 +50,11 @@ final class DefaultConfigProperties implements ConfigProperties {
Map<String, String> environmentVariables,
Map<String, String> defaultProperties) {
Map<String, String> config = new HashMap<>();
defaultProperties.forEach(
(name, value) -> config.put(name.toLowerCase(Locale.ROOT).replace('-', '.'), value));
defaultProperties.forEach((name, value) -> config.put(normalize(name), value));
environmentVariables.forEach(
(name, value) -> config.put(name.toLowerCase(Locale.ROOT).replace('_', '.'), value));
systemProperties.forEach(
(key, value) ->
config.put(
key.toString().toLowerCase(Locale.ROOT).replace('-', '.'), value.toString()));
(key, value) -> config.put(normalize(key.toString()), value.toString()));
this.config = config;
}
@ -65,13 +62,13 @@ final class DefaultConfigProperties implements ConfigProperties {
@Override
@Nullable
public String getString(String name) {
return config.get(name);
return config.get(normalize(name));
}
@Override
@Nullable
public Boolean getBoolean(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null || value.isEmpty()) {
return null;
}
@ -82,7 +79,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Nullable
@SuppressWarnings("UnusedException")
public Integer getInt(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null || value.isEmpty()) {
return null;
}
@ -97,7 +94,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Nullable
@SuppressWarnings("UnusedException")
public Long getLong(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null || value.isEmpty()) {
return null;
}
@ -112,7 +109,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Nullable
@SuppressWarnings("UnusedException")
public Double getDouble(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null || value.isEmpty()) {
return null;
}
@ -127,7 +124,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Nullable
@SuppressWarnings("UnusedException")
public Duration getDuration(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null || value.isEmpty()) {
return null;
}
@ -156,7 +153,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Override
public List<String> getList(String name) {
String value = config.get(name);
String value = config.get(normalize(name));
if (value == null) {
return Collections.emptyList();
}
@ -170,7 +167,7 @@ final class DefaultConfigProperties implements ConfigProperties {
* @throws ConfigurationException if {@code name} contains duplicate entries
*/
static Set<String> getSet(ConfigProperties config, String name) {
List<String> list = config.getList(name);
List<String> list = config.getList(normalize(name));
Set<String> set = new HashSet<>(list);
if (set.size() != list.size()) {
String duplicates =
@ -188,7 +185,7 @@ final class DefaultConfigProperties implements ConfigProperties {
@Override
public Map<String, String> getMap(String name) {
return getList(name).stream()
return getList(normalize(name)).stream()
.map(keyValuePair -> filterBlanksAndNulls(keyValuePair.split("=", 2)))
.map(
splitKeyValuePairs -> {
@ -255,4 +252,8 @@ final class DefaultConfigProperties implements ConfigProperties {
// Pull everything after the last digit.
return rawValue.substring(lastDigitIndex + 1);
}
private static String normalize(String propertyName) {
return propertyName.toLowerCase(Locale.ROOT).replace('-', '.');
}
}

103
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/ConfigPropertiesTest.java
View File

@ -27,47 +27,62 @@ class ConfigPropertiesTest {
Map<String, String> properties = makeTestProps();
ConfigProperties config = DefaultConfigProperties.createForTest(properties);
assertThat(config.getString("string")).isEqualTo("str");
assertThat(config.getInt("int")).isEqualTo(10);
assertThat(config.getLong("long")).isEqualTo(20);
assertThat(config.getDouble("double")).isEqualTo(5.4);
assertThat(config.getList("list")).containsExactly("cat", "dog", "bear");
assertThat(config.getMap("map"))
assertThat(config.getString("test.string")).isEqualTo("str");
assertThat(config.getInt("test.int")).isEqualTo(10);
assertThat(config.getLong("test.long")).isEqualTo(20);
assertThat(config.getDouble("test.double")).isEqualTo(5.4);
assertThat(config.getList("test.list")).containsExactly("cat", "dog", "bear");
assertThat(config.getMap("test.map"))
.containsExactly(entry("cat", "meow"), entry("dog", "bark"), entry("bear", "growl"));
assertThat(config.getDuration("duration")).isEqualTo(Duration.ofSeconds(1));
assertThat(config.getDuration("test.duration")).isEqualTo(Duration.ofSeconds(1));
}
@Test
void allValidUsingHyphens() {
Map<String, String> properties = makeTestProps();
ConfigProperties config = DefaultConfigProperties.createForTest(properties);
assertThat(config.getString("test-string")).isEqualTo("str");
assertThat(config.getInt("test-int")).isEqualTo(10);
assertThat(config.getLong("test-long")).isEqualTo(20);
assertThat(config.getDouble("test-double")).isEqualTo(5.4);
assertThat(config.getList("test-list")).containsExactly("cat", "dog", "bear");
assertThat(config.getMap("test-map"))
.containsExactly(entry("cat", "meow"), entry("dog", "bark"), entry("bear", "growl"));
assertThat(config.getDuration("test-duration")).isEqualTo(Duration.ofSeconds(1));
}
@Test
void allMissing() {
ConfigProperties config = DefaultConfigProperties.createForTest(emptyMap());
assertThat(config.getString("string")).isNull();
assertThat(config.getInt("int")).isNull();
assertThat(config.getLong("long")).isNull();
assertThat(config.getDouble("double")).isNull();
assertThat(config.getList("list")).isEmpty();
assertThat(config.getMap("map")).isEmpty();
assertThat(config.getDuration("duration")).isNull();
assertThat(config.getString("test.string")).isNull();
assertThat(config.getInt("test.int")).isNull();
assertThat(config.getLong("test.long")).isNull();
assertThat(config.getDouble("test.double")).isNull();
assertThat(config.getList("test.list")).isEmpty();
assertThat(config.getMap("test.map")).isEmpty();
assertThat(config.getDuration("test.duration")).isNull();
}
@Test
void allEmpty() {
Map<String, String> properties = new HashMap<>();
properties.put("string", "");
properties.put("int", "");
properties.put("long", "");
properties.put("double", "");
properties.put("list", "");
properties.put("map", "");
properties.put("duration", "");
properties.put("test.string", "");
properties.put("test.int", "");
properties.put("test.long", "");
properties.put("test.double", "");
properties.put("test.list", "");
properties.put("test.map", "");
properties.put("test.duration", "");
ConfigProperties config = DefaultConfigProperties.createForTest(properties);
assertThat(config.getString("string")).isEmpty();
assertThat(config.getInt("int")).isNull();
assertThat(config.getLong("long")).isNull();
assertThat(config.getDouble("double")).isNull();
assertThat(config.getList("list")).isEmpty();
assertThat(config.getMap("map")).isEmpty();
assertThat(config.getDuration("duration")).isNull();
assertThat(config.getString("test.string")).isEmpty();
assertThat(config.getInt("test.int")).isNull();
assertThat(config.getLong("test.long")).isNull();
assertThat(config.getDouble("test.double")).isNull();
assertThat(config.getList("test.list")).isEmpty();
assertThat(config.getMap("test.map")).isEmpty();
assertThat(config.getDuration("test.duration")).isNull();
}
@Test
@ -222,15 +237,15 @@ class ConfigPropertiesTest {
Map<String, String> map = makeTestProps();
ConfigProperties properties = DefaultConfigProperties.get(map);
assertThat(properties.getBoolean("boolean", false)).isTrue();
assertThat(properties.getString("string", "nah")).isEqualTo("str");
assertThat(properties.getDouble("double", 65.535)).isEqualTo(5.4);
assertThat(properties.getInt("int", 21)).isEqualTo(10);
assertThat(properties.getLong("long", 123L)).isEqualTo(20L);
assertThat(properties.getDuration("duration", Duration.ofDays(13)))
assertThat(properties.getBoolean("test.boolean", false)).isTrue();
assertThat(properties.getString("test.string", "nah")).isEqualTo("str");
assertThat(properties.getDouble("test.double", 65.535)).isEqualTo(5.4);
assertThat(properties.getInt("test.int", 21)).isEqualTo(10);
assertThat(properties.getLong("test.long", 123L)).isEqualTo(20L);
assertThat(properties.getDuration("test.duration", Duration.ofDays(13)))
.isEqualTo(Duration.ofSeconds(1));
assertThat(properties.getList("list", emptyList())).containsExactly("cat", "dog", "bear");
assertThat(properties.getMap("map", emptyMap())).containsAllEntriesOf(expectedMap);
assertThat(properties.getList("test.list", emptyList())).containsExactly("cat", "dog", "bear");
assertThat(properties.getMap("test.map", emptyMap())).containsAllEntriesOf(expectedMap);
}
@Test
@ -260,14 +275,14 @@ class ConfigPropertiesTest {
private static Map<String, String> makeTestProps() {
Map<String, String> properties = new HashMap<>();
properties.put("string", "str");
properties.put("int", "10");
properties.put("long", "20");
properties.put("double", "5.4");
properties.put("boolean", "true");
properties.put("list", "cat,dog,bear");
properties.put("map", "cat=meow,dog=bark,bear=growl");
properties.put("duration", "1s");
properties.put("test.string", "str");
properties.put("test.int", "10");
properties.put("test.long", "20");
properties.put("test.double", "5.4");
properties.put("test.boolean", "true");
properties.put("test.list", "cat,dog,bear");
properties.put("test.map", "cat=meow,dog=bark,bear=growl");
properties.put("test.duration", "1s");
return properties;
}
}