Fix

Author: jeanbisutti

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/properties/SpringConfigProperties.java

@@ -66,7 +66,7 @@ public static ConfigProperties create(
   @Nullable
   @Override
   public String getString(String name) {
-    String normalizedName = ConfigUtil.normalizePropertyKey(name);
+    String normalizedName = ConfigUtil.normalizeEnvironmentVariableKey(name);
     String value = environment.getProperty(normalizedName, String.class);
     if (value == null && normalizedName.equals("otel.exporter.otlp.protocol")) {
       // SDK autoconfigure module defaults to `grpc`, but this module aligns with recommendation
@@ -80,38 +80,39 @@ public String getString(String name) {
   @Override
   public Boolean getBoolean(String name) {
     return or(
-        environment.getProperty(ConfigUtil.normalizePropertyKey(name), Boolean.class),
+        environment.getProperty(ConfigUtil.normalizeEnvironmentVariableKey(name), Boolean.class),
         otelSdkProperties.getBoolean(name));
   }
 
   @Nullable
   @Override
   public Integer getInt(String name) {
     return or(
-        environment.getProperty(ConfigUtil.normalizePropertyKey(name), Integer.class),
+        environment.getProperty(ConfigUtil.normalizeEnvironmentVariableKey(name), Integer.class),
         otelSdkProperties.getInt(name));
   }
 
   @Nullable
   @Override
   public Long getLong(String name) {
     return or(
-        environment.getProperty(ConfigUtil.normalizePropertyKey(name), Long.class),
+        environment.getProperty(ConfigUtil.normalizeEnvironmentVariableKey(name), Long.class),
         otelSdkProperties.getLong(name));
   }
 
   @Nullable
   @Override
   public Double getDouble(String name) {
     return or(
-        environment.getProperty(ConfigUtil.normalizePropertyKey(name), Double.class),
+        environment.getProperty(ConfigUtil.normalizeEnvironmentVariableKey(name), Double.class),
         otelSdkProperties.getDouble(name));
   }
 
   @SuppressWarnings("unchecked")
   @Override
   public List<String> getList(String name) {
-    String normalizedName = ConfigUtil.normalizePropertyKey(name);
+
+    String normalizedName = ConfigUtil.normalizeEnvironmentVariableKey(name);
 
     if (normalizedName.equals("otel.propagators")) {
       return propagationProperties.getPropagators();
@@ -136,7 +137,7 @@ public Duration getDuration(String name) {
   public Map<String, String> getMap(String name) {
     Map<String, String> otelSdkMap = otelSdkProperties.getMap(name);
 
-    String normalizedName = ConfigUtil.normalizePropertyKey(name);
+    String normalizedName = ConfigUtil.normalizeEnvironmentVariableKey(name);
     // maps from config properties are not supported by Environment, so we have to fake it
     switch (normalizedName) {
       case "otel.resource.attributes":

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

@@ -110,8 +110,12 @@ AutoConfigurationCustomizerProvider customizerUsingPropertyDefinedInaSpringFile(
       return customizer ->
           customizer.addResourceCustomizer(
               (resource, config) -> {
-                String propValue = config.getString("APPLICATION-PROP");
-                assertThat(propValue).isNotEmpty();
+                String valueForKeyDeclaredZsEnvVariable = config.getString("APPLICATION_PROP");
+                assertThat(valueForKeyDeclaredZsEnvVariable).isNotEmpty();
+
+                String valueForKeyWithDash = config.getString("application.prop-with-dash");
+                assertThat(valueForKeyWithDash).isNotEmpty();
+
                 return resource;
               });
     }

smoke-tests-otel-starter/spring-boot-common/src/main/resources/application.yaml

@@ -21,6 +21,7 @@ otel:
 
 application:
   prop: propValue
+  prop-with-dash: provWithDashValue
 
 spring:
   kafka: