Internal span name is being overridden by opentelemetry-javaagent

[shaykeren]

Describe the bug

using spring-petclinic application and run testInitCreationForm test (WebMvcTest) I found out that the span name I created in the test was overridden with the name "GET /owners/new"

Running WebMvcTest test using the following configuration:
JAVA_TOOL_OPTIONS: -javaagent:/opentelemetry-javaagent.jar
-Dotel.exporter.otlp.traces.endpoint=ObservabilityURL
-Dotel.javaagent.experimental.field-injection.enabled=false
-Dotel.traces.exporter=otlp
-Dotel.metrics.exporter=none
-Dotel.instrumentation.experimental.span-suppression-strategy=none
-Dotel.service.name=spring-petclinic

using opentelemetry-javaagent - version: 1.32.0

Steps to reproduce

1. use spring-petclinic repository
2. modify test name "testInitCreationForm" and add @WithSpan() annotation

@WithSpan()
@Test
void testInitCreationForm() throws Exception {
       mockMvc.perform(get("/owners/new"))
	.andExpect(status().isOk())
	.andExpect(model().attributeExists("owner"))
	.andExpect(view().name("owners/createOrUpdateOwnerForm"));
}

3. run test with the following configuration:
   test using the following configuration:
   JAVA_TOOL_OPTIONS: -javaagent:/opentelemetry-javaagent.jar
   -Dotel.exporter.otlp.traces.endpoint=ObservabilityURL
   -Dotel.javaagent.experimental.field-injection.enabled=false
   -Dotel.traces.exporter=otlp
   -Dotel.metrics.exporter=none
   -Dotel.instrumentation.experimental.span-suppression-strategy=none
   -Dotel.service.name=spring-petclinic

And observe the following trace:
the span name was overridden with the name "GET /owners/new"

Expected behavior

my span name should not be changed

Actual behavior

span name changed to: GET /owners/new

Javaagent or library instrumentation version

1.32.0

Environment

:: Built with Spring Boot :: 3.2.0
Java 17.0.7
macos

Additional context

No response

[laurit]

My guess is that the issue is in

opentelemetry-java-instrumentation/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRoute.java

Line 100 in 9e208c8

Span serverSpan = LocalRootSpan.fromContextOrNull(context);

we update the name on the root span regardless of whether it is a server or internal span. I guess we could change it to update only server spans.

[doppleware]

Hey guys anything we can do to help with this one?

[trask]

@laurit submitted a fix for this already (linked above). If you are able to build a snapshot from the PR branch and verify it resolves your issue that could be helpful.

[doppleware]

Hey - I can confirm this works, thank you :) Is it possible to merge it to a stable release as well on the next minor/patch?