From 041b755d677629e77a20144ba12ceff0efd0fe2c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 18 May 2026 10:27:23 -0700 Subject: [PATCH] Rename Spring WebMVC common module --- .fossa.yml | 2 +- .../spring-webmvc-3.1/javaagent/build.gradle.kts | 4 ++-- .../spring/webmvc/v3_1/HandlerAdapterInstrumentation.java | 2 +- .../spring/webmvc/v3_1/SpringWebMvcSingletons.java | 2 +- .../spring-webmvc-6.0/javaagent/build.gradle.kts | 4 ++-- .../spring/webmvc/v6_0/HandlerAdapterInstrumentation.java | 2 +- .../spring/webmvc/v6_0/SpringWebMvcSingletons.java | 2 +- .../javaagent/build.gradle.kts | 0 .../webmvc/common/v3_1}/HandlerCodeAttributesGetter.java | 2 +- .../spring/webmvc/common/v3_1}/IsGrailsHandler.java | 2 +- .../webmvc/common/v3_1}/ModelAndViewAttributesExtractor.java | 2 +- .../webmvc/common/v3_1}/ModelAndViewSpanNameExtractor.java | 2 +- .../webmvc/common/v3_1}/SpringWebMvcInstrumenterFactory.java | 2 +- .../testing/build.gradle.kts | 0 .../spring/webmvc/boot/AbstractSpringBootBasedTest.java | 0 .../instrumentation/spring/webmvc/boot/AppConfig.java | 0 .../spring/webmvc/boot/SavingAuthenticationProvider.java | 0 .../instrumentation/spring/webmvc/boot/TestBean.java | 0 .../instrumentation/spring/webmvc/boot/TestController.java | 0 .../instrumentation/spring/webmvc/boot/TestUserDetails.java | 0 .../spring/webmvc/filter/AbstractServletFilterTest.java | 0 .../spring/webmvc/filter/FilteredAppConfig.java | 0 .../instrumentation/spring/webmvc/filter/TestController.java | 0 settings.gradle.kts | 4 ++-- 24 files changed, 16 insertions(+), 16 deletions(-) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/javaagent/build.gradle.kts (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common => spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1}/HandlerCodeAttributesGetter.java (99%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common => spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1}/IsGrailsHandler.java (97%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common => spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1}/ModelAndViewAttributesExtractor.java (99%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common => spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1}/ModelAndViewSpanNameExtractor.java (98%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common => spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1}/SpringWebMvcInstrumenterFactory.java (99%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/build.gradle.kts (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java (100%) rename instrumentation/spring/spring-webmvc/{spring-webmvc-common => spring-webmvc-common-3.1}/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java (100%) diff --git a/.fossa.yml b/.fossa.yml index c81719c2e8c3..4db18bd7d6ac 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -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' diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts index f1f559ef82dc..ad5888d70ffe 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts @@ -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") @@ -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") diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java index 06b1a68568a4..b73b663d6489 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/HandlerAdapterInstrumentation.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java index 83d7bb5b09aa..c876d99fb40f 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/SpringWebMvcSingletons.java @@ -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 { diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts index 1a7d81e81124..8ce0823ea078 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts @@ -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") @@ -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") diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java index 6749bf87052b..d1f34d18bb1d 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/HandlerAdapterInstrumentation.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java index 562ace5d8785..e393e5c585d8 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/SpringWebMvcSingletons.java @@ -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 { diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/build.gradle.kts rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/build.gradle.kts diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/HandlerCodeAttributesGetter.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/HandlerCodeAttributesGetter.java similarity index 99% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/HandlerCodeAttributesGetter.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/HandlerCodeAttributesGetter.java index f44994d740d9..9b70241f3a38 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/HandlerCodeAttributesGetter.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/HandlerCodeAttributesGetter.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/IsGrailsHandler.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/IsGrailsHandler.java similarity index 97% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/IsGrailsHandler.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/IsGrailsHandler.java index ba5d7d48f8bc..8e25ecb8cfa0 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/IsGrailsHandler.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/IsGrailsHandler.java @@ -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 { diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewAttributesExtractor.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewAttributesExtractor.java similarity index 99% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewAttributesExtractor.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewAttributesExtractor.java index 5fdf16c24cfc..f967e2939826 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewAttributesExtractor.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewAttributesExtractor.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewSpanNameExtractor.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewSpanNameExtractor.java similarity index 98% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewSpanNameExtractor.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewSpanNameExtractor.java index ff7b17694212..29ab2adaf7aa 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/ModelAndViewSpanNameExtractor.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/ModelAndViewSpanNameExtractor.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/SpringWebMvcInstrumenterFactory.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/SpringWebMvcInstrumenterFactory.java similarity index 99% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/SpringWebMvcInstrumenterFactory.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/SpringWebMvcInstrumenterFactory.java index e32f2365ee03..aea3f0266987 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/SpringWebMvcInstrumenterFactory.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/common/v3_1/SpringWebMvcInstrumenterFactory.java @@ -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; diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/build.gradle.kts similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/build.gradle.kts rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/build.gradle.kts diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AppConfig.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/SavingAuthenticationProvider.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestUserDetails.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java similarity index 100% rename from instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java rename to instrumentation/spring/spring-webmvc/spring-webmvc-common-3.1/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/TestController.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 0be5f7a233a4..3bab55b1a1ae 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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")