fix

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/EmbeddedConfigFile.java

@@ -13,7 +13,6 @@
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.MutablePropertySources;
@@ -87,8 +86,8 @@ static Map<String, Object> convertFlatPropsToNested(Map<String, String> flatProp
         boolean isLast = (i == parts.length - 1);
 
         // Check if this part contains an array index like "list[0]"
-        Matcher matcher = getArrayMatcher(part, isLast);
-        if (matcher != null) {
+        Matcher matcher = ARRAY_PATTERN.matcher(part);
+        if (matcher.matches()) {
           String arrayName = matcher.group(1);
           int index = Integer.parseInt(matcher.group(2));
 
@@ -127,12 +126,4 @@ static Map<String, Object> convertFlatPropsToNested(Map<String, String> flatProp
     return result;
   }
 
-  @Nullable
-  private static Matcher getArrayMatcher(String part, boolean isLast) {
-    if (!isLast) {
-      return null;
-    }
-    Matcher matcher = ARRAY_PATTERN.matcher(part);
-    return matcher.matches() ? matcher : null;
-  }
 }

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/EmbeddedConfigFileTest.java

@@ -17,7 +17,7 @@ class EmbeddedConfigFileTest {
   @Test
   void convertFlatPropsToNested_simpleProperties() {
     Map<String, String> flatProps = new HashMap<>();
-    flatProps.put("resource.service[0].name", "my-service");
+    flatProps.put("resource.service.name", "my-service");
     flatProps.put("traces.exporter", "otlp");
 
     Map<String, Object> result = EmbeddedConfigFile.convertFlatPropsToNested(flatProps);
@@ -33,12 +33,12 @@ void convertFlatPropsToNested_simpleProperties() {
                         @SuppressWarnings("unchecked")
                         Map<String, Object> resourceMap = (Map<String, Object>) resource;
                         assertThat(resourceMap)
-                            .containsOnlyKeys("service[0]")
+                            .containsOnlyKeys("service")
                             .satisfies(
                                 m -> {
                                   @SuppressWarnings("unchecked")
                                   Map<String, Object> serviceMap =
-                                      (Map<String, Object>) m.get("service[0]");
+                                      (Map<String, Object>) m.get("service");
                                   assertThat(serviceMap).containsEntry("name", "my-service");
                                 });
                       });