Fix build (merge conflict)
Resolves
MODIFY
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java
@@ -117,7 +117,7 @@ class TestWebSpringBootApp {
return controller(
INDEXED_CHILD,
() -> {
- INDEXED_CHILD.collectSpanAttributes(name -> "id".equals(name) ? id : null);
+ INDEXED_CHILD.collectSpanAttributes(name -> name.equals("id") ? id : null);
return INDEXED_CHILD.getBody();
});
}

Fix build (merge conflict) (#7559)

Resolves #7558