Skip to content

Rename Spring common testing packages#18839

Merged
laurit merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-spring-testing-packages
May 25, 2026
Merged

Rename Spring common testing packages#18839
laurit merged 1 commit into
open-telemetry:mainfrom
trask:package-name-cleanup-spring-testing-packages

Conversation

@trask

@trask trask commented May 22, 2026

Copy link
Copy Markdown
Member

@trask trask marked this pull request as ready for review May 22, 2026 21:29
@trask trask requested a review from a team as a code owner May 22, 2026 21:29
Copilot AI review requested due to automatic review settings May 22, 2026 21:29

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Aligns Spring common testing packages with their module/version naming to support the broader “package and module name alignment” effort (ref. #18428). This is a mechanical refactor that updates package declarations and corresponding imports for shared test helpers.

Changes:

  • Renamed Spring WebMVC common 3.1 testing packages to include v3_1 (e.g., ...spring.webmvc.v3_1.boot/filter).
  • Renamed Spring Cloud Gateway common testing package from ...spring.gateway.common to ...spring.cloud.gateway.common.
  • Updated downstream test imports (Spring WebMVC 3.1/6.0 and Spring Cloud Gateway tests) to reference the new package names.

Reviewed changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated no comments.

Show a summary per file
File Description
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/filter/TestController.java Update package to ...spring.webmvc.v3_1.filter.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/filter/FilteredAppConfig.java Update package to ...spring.webmvc.v3_1.filter.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/filter/AbstractServletFilterTest.java Update package to ...spring.webmvc.v3_1.filter.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/TestUserDetails.java Update package to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/TestController.java Update package to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/TestBean.java Update package and static import to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/SavingAuthenticationProvider.java Update package to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/AppConfig.java Update package to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v3_1/boot/AbstractSpringBootBasedTest.java Update package to ...spring.webmvc.v3_1.boot.
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java Update imports to new WebMVC common testing packages.
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java Update imports to new WebMVC common testing packages.
instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SecurityConfig.java Update import to new SavingAuthenticationProvider package.
instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/filter/ServletFilterTest.java Update imports to new WebMVC common testing packages.
instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/boot/SpringBootBasedTest.java Update imports to new WebMVC common testing packages.
instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/boot/SecurityConfig.java Update import to new SavingAuthenticationProvider package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/webmvc/v4_3/Gateway43MvcRouteMappingTest.java Update import to new gateway common testing package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webflux-4.3/testing/src/test/java/io/opentelemetry/instrumentation/spring/gateway/v4_3/Gateway43TestApplication.java Update import to new gateway common testing package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webflux-4.3/testing/src/test/java/io/opentelemetry/instrumentation/spring/gateway/v4_3/Gateway43RouteMappingTest.java Update import to new gateway common testing package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/cloud/gateway/common/GatewayTestApplication.java Rename common gateway testing package to ...spring.cloud.gateway.common.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/cloud/gateway/common/AbstractRouteMappingTest.java Rename common gateway testing package to ...spring.cloud.gateway.common.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/src/test/java/io/opentelemetry/instrumentation/spring/gateway/v2_2/Gateway22TestApplication.java Update import to new gateway common testing package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.2/testing/src/test/java/io/opentelemetry/instrumentation/spring/gateway/v2_2/Gateway22RouteMappingTest.java Update import to new gateway common testing package.
instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/cloud/gateway/v2_0/GatewayRouteMappingTest.java Update import to new gateway common testing package.

@laurit laurit merged commit c5d6b76 into open-telemetry:main May 25, 2026
186 of 188 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants