diff --git a/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java b/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java index f8818c015bd..7de128cadbb 100644 --- a/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java +++ b/sdk-extensions/autoconfigure-spi/src/main/java/io/opentelemetry/sdk/autoconfigure/spi/internal/DefaultConfigProperties.java @@ -226,7 +226,10 @@ public Map 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); }) diff --git a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java index 4a119e600cc..9cac000cebc 100644 --- a/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java +++ b/sdk-extensions/autoconfigure-spi/src/test/java/io/opentelemetry/sdk/autoconfigure/spi/internal/ConfigPropertiesTest.java @@ -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(