Skip to content

Rename Spring WebMVC common module #18788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 1 commit into from
May 22, 2026
Merged

Rename Spring WebMVC common module #18788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ targets:
target: ':instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library'
- type: gradle
path: ./
target: ':instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent'
target: ':instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:javaagent'
- type: gradle
path: ./
target: ':instrumentation:vertx:vertx-http-client:vertx-http-client-3.0:javaagent'
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ muzzle {
dependencies {
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))

implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent"))
implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:javaagent"))

compileOnly("org.springframework:spring-webmvc:3.1.0.RELEASE")
compileOnly("javax.servlet:javax.servlet-api:3.1.0")
Expand All @@ -28,7 +28,7 @@ dependencies {
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
testInstrumentation(project(":instrumentation:tomcat:tomcat-7.0:javaagent"))

testImplementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing"))
testImplementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:testing"))
testImplementation("com.google.guava:guava")

testLibrary("org.springframework.boot:spring-boot-starter-test:1.5.17.RELEASE")
Expand Down
2 changes: 1 addition & 1 deletion ...telemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.IsGrailsHandler;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1.IsGrailsHandler;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion ...io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v3_1;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.SpringWebMvcInstrumenterFactory;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1.SpringWebMvcInstrumenterFactory;
import org.springframework.web.servlet.ModelAndView;

public class SpringWebMvcSingletons {
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ muzzle {
dependencies {
bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))

implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent"))
implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:javaagent"))

compileOnly("org.springframework:spring-webmvc:6.0.0")
compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
Expand All @@ -28,7 +28,7 @@ dependencies {
testInstrumentation(project(":instrumentation:spring:spring-core-2.0:javaagent"))
testInstrumentation(project(":instrumentation:spring:spring-web:spring-web-6.0:javaagent"))

testImplementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing"))
testImplementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:testing"))

testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter-web:3.0.0")
Expand Down
2 changes: 1 addition & 1 deletion ...telemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.IsGrailsHandler;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1.IsGrailsHandler;
import jakarta.servlet.http.HttpServletRequest;
import javax.annotation.Nullable;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion ...io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.v6_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.SpringWebMvcInstrumenterFactory;
import io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1.SpringWebMvcInstrumenterFactory;
import org.springframework.web.servlet.ModelAndView;

class SpringWebMvcSingletons {
Expand Down
0 ...-webmvc-common/javaagent/build.gradle.kts → ...mvc-common-3.1/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...c/common/HandlerCodeAttributesGetter.java → ...mon/v3_1/HandlerCodeAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common;
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1;

import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
import java.lang.reflect.Method;
Expand Down
2 changes: 1 addition & 1 deletion ...spring/webmvc/common/IsGrailsHandler.java → ...g/webmvc/common/v3_1/IsGrailsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common;
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1;

public class IsGrailsHandler {

Expand Down
2 changes: 1 addition & 1 deletion ...mmon/ModelAndViewAttributesExtractor.java → ...v3_1/ModelAndViewAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common;
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.common.AttributesBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...common/ModelAndViewSpanNameExtractor.java → ...n/v3_1/ModelAndViewSpanNameExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common;
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1;

import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import org.springframework.web.servlet.ModelAndView;
Expand Down
2 changes: 1 addition & 1 deletion ...mmon/SpringWebMvcInstrumenterFactory.java → ...v3_1/SpringWebMvcInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common;
package io.opentelemetry.javaagent.instrumentation.spring.webmvc.common.v3_1;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
Expand Down
0 ...ng-webmvc-common/testing/build.gradle.kts → ...ebmvc-common-3.1/testing/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 ...mvc/boot/AbstractSpringBootBasedTest.java → ...mvc/boot/AbstractSpringBootBasedTest.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/spring/webmvc/boot/AppConfig.java → ...ntation/spring/webmvc/boot/AppConfig.java
View file
Open in desktop
File renamed without changes.
0 ...vc/boot/SavingAuthenticationProvider.java → ...vc/boot/SavingAuthenticationProvider.java
View file
Open in desktop
File renamed without changes.
0 ...entation/spring/webmvc/boot/TestBean.java → ...entation/spring/webmvc/boot/TestBean.java
View file
Open in desktop
File renamed without changes.
0 ...on/spring/webmvc/boot/TestController.java → ...on/spring/webmvc/boot/TestController.java
View file
Open in desktop
File renamed without changes.
0 ...n/spring/webmvc/boot/TestUserDetails.java → ...n/spring/webmvc/boot/TestUserDetails.java
View file
Open in desktop
File renamed without changes.
0 ...mvc/filter/AbstractServletFilterTest.java → ...mvc/filter/AbstractServletFilterTest.java
View file
Open in desktop
File renamed without changes.
0 ...ring/webmvc/filter/FilteredAppConfig.java → ...ring/webmvc/filter/FilteredAppConfig.java
View file
Open in desktop
File renamed without changes.
0 .../spring/webmvc/filter/TestController.java → .../spring/webmvc/filter/TestController.java
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,8 +683,8 @@ include(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:wildfly-testing
include(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:javaagent")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:javaagent")
include(":instrumentation:spring:spring-webmvc:spring-webmvc-common-3.1:testing")
include(":instrumentation:spring:spring-ws-2.0:javaagent")
include(":instrumentation:spring:spring-ws-2.0:testing")
include(":instrumentation:spring:starters:spring-boot-starter")
Expand Down
Loading