Skip to content

Use normalized key when building getMap error message in DefaultConfigProperties #8643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thswlsqls wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Draft

Use normalized key when building getMap error message in DefaultConfigProperties #8643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...rc/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,10 @@ public Map<String, String> getMap(String name) {
String[] split = entry.split("=", 2);
if (split.length != 2 || StringUtils.isNullOrEmpty(split[0])) {
throw new ConfigurationException(
"Invalid map property: " + name + "=" + config.get(name));
"Invalid map property: "
+ name
+ "="
+ config.get(ConfigUtil.normalizePropertyKey(name)));
}
return filterBlanksAndNulls(split);
})
Expand Down
10 changes: 10 additions & 0 deletions ...i/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,16 @@ void invalidMap() {
.hasMessage("Invalid map property: map=a=1,=b");
}

@Test
void invalidMapWithHyphenatedName() {
assertThatThrownBy(
() ->
DefaultConfigProperties.createFromMap(Collections.singletonMap("test-map", "a=1,b"))
.getMap("test-map"))
.isInstanceOf(ConfigurationException.class)
.hasMessage("Invalid map property: test-map=a=1,b");
}

@Test
void invalidDuration() {
assertThatThrownBy(
Expand Down
Loading