Set http.route in spring-autoconfigure webmvc instrumentation #6414
Conversation
👍 to bumping the min version for spring-webmvc library instrumentation do you want to merge this PR first, or make that change here? |
|
I could do this in this PR, I don't mind either way |
| default Integer statusCode(REQUEST request, RESPONSE response, @Nullable Throwable error) { | ||
| return statusCode(request, response); | ||
| } |
There was a problem hiding this comment.
I wanted the Spring/Servlet status code to be properly reflected in the span status, so I added this method. I'll deprecate the previous one in the next PR.
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.instrumentation.spring.webmvc.v5_3; |
There was a problem hiding this comment.
I also changed the package name, in accordance with #932
There was a problem hiding this comment.
I had to think through this (#932 (comment)), but I agree
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
| import org.springframework.context.ConfigurableApplicationContext; | ||
|
|
||
| class WebMvcHttpServerTest extends AbstractHttpServerTest<ConfigurableApplicationContext> { |
...rary/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java
Outdated
Show resolved
Hide resolved
| // we can't retrieve the handler mappings from the DispatcherServlet in the onRefresh listener, | ||
| // because it loads them just after the application context refreshed event is processed | ||
| // to work around this, we're setting a boolean flag that'll cause this filter to load the | ||
| // mappings the next time it attempts to set the http.route | ||
| final class WebContextRefreshListener implements ApplicationListener<ContextRefreshedEvent> { |
There was a problem hiding this comment.
just curious if this gets hit in the integration tests (I'm ok if not)
There was a problem hiding this comment.
It does; it has to be hit if the http.route is to be present in generated spans.
...rary/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v5_3/HttpRouteSupport.java
Outdated
Show resolved
Hide resolved
mateuszrzeszutek
force-pushed
the
spring-autoconfigure-http-route
branch
from
f76c42f to
1fa1664
Compare
…elemetry#6414) * Set http.route in spring-autoconfigure webmvc instrumentation * Bump spring-webmvc library instrumentation version to 5.3 * nit: protected -> private * Remove duplicated test (already covered by HttpSpanStatusExtractorTest) * Move the README to the correct module * fix link * fix more links * liiiiiiinks * fix tests * remove not needed weakref
…elemetry#6414) * Set http.route in spring-autoconfigure webmvc instrumentation * Bump spring-webmvc library instrumentation version to 5.3 * nit: protected -> private * Remove duplicated test (already covered by HttpSpanStatusExtractorTest) * Move the README to the correct module * fix link * fix more links * liiiiiiinks * fix tests * remove not needed weakref
…elemetry#6414) * Set http.route in spring-autoconfigure webmvc instrumentation * Bump spring-webmvc library instrumentation version to 5.3 * nit: protected -> private * Remove duplicated test (already covered by HttpSpanStatusExtractorTest) * Move the README to the correct module * fix link * fix more links * liiiiiiinks * fix tests * remove not needed weakref
Resolves #3479
I think this feature should be integrated into the
spring-webmvclibrary instrumentation; it'd require bumping the minimum version to 5.3 though. I think we should do that, having the route is super useful, and the webmvc library instrumentation is probably only used in autoconfigure anyway.