Rename Spring WebMVC common module#18788
Merged
trask merged 1 commit intoMay 22, 2026
Merged
Conversation
51ad046 to
041b755
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Renames the Spring WebMVC “common” javaagent/testing module to a version-aligned spring-webmvc-common-3.1 module and updates downstream Spring WebMVC instrumentations to depend on the renamed module and its new package namespace.
Changes:
- Renamed Gradle project includes and updated dependent module build files to reference
spring-webmvc-common-3.1(javaagent + testing). - Moved Spring WebMVC shared javaagent helper classes into a versioned package (
...spring.webmvc.common.v3_1) and updated imports in Spring WebMVC 3.1 and 6.0 instrumentations. - Added/relocated shared Spring Boot / servlet-filter test fixtures into the new
spring-webmvc-common-3.1:testingmodule and updated FOSSA target.
Reviewed changes
Copilot reviewed 13 out of 24 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| settings.gradle.kts | Switches included projects from spring-webmvc-common to spring-webmvc-common-3.1. |
| .fossa.yml | Updates the Gradle target to the renamed spring-webmvc-common-3.1:javaagent project. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/build.gradle.kts | Defines the new renamed common javaagent subproject and its compileOnly Spring WebMVC dependency. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/SpringWebMvcInstrumenterFactory.java | Moves factory into the versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewSpanNameExtractor.java | Moves extractor into the versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewAttributesExtractor.java | Moves extractor into the versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/IsGrailsHandler.java | Moves helper into the versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/HandlerCodeAttributesGetter.java | Moves getter into the versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/build.gradle.kts | Adds the new renamed shared testing subproject and its compileOnly Spring Boot deps. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java | Adds shared controller fixture for filter-based tests. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java | Adds shared Spring Boot config for filter-based tests. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java | Adds shared abstract test base for servlet filter scenarios. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java | Adds shared abstract Spring Boot-based test base (incl. deferred result case). |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java | Adds shared Spring Boot app config fixture. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java | Adds shared controller fixture for Spring Boot-based tests. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java | Adds shared async helper bean for deferred-result testing. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java | Adds shared auth provider fixture for security-related tests. |
| instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java | Adds shared UserDetails fixture for security-related tests. |
| instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts | Updates dependency coordinates to spring-webmvc-common-3.1 (javaagent + testing). |
| instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java | Updates import to the new versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java | Updates import to the new versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts | Updates dependency coordinates to spring-webmvc-common-3.1 (javaagent + testing). |
| instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java | Updates import to the new versioned common package. |
| instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java | Updates import to the new versioned common package. |
steverao
reviewed
May 20, 2026
steverao
left a comment
Contributor
There was a problem hiding this comment.
Adding v3_1 directory for testing module together?
laurit
approved these changes
May 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of