From a5470c7dfc094dc7c51380abd3fe233db71c1282 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 16 Oct 2025 20:39:38 -0700 Subject: [PATCH 1/2] Move spring-web-3.1 tests from separate :testing module to :javaagent module Consolidates test structure to match spring-web-6.0 pattern where tests live in the javaagent module rather than a separate testing module. Changes: - Moved SpringRestTemplateTest from :testing to :javaagent/src/test - Updated package from io.opentelemetry.javaagent.instrumentation.spring.web to io.opentelemetry.javaagent.instrumentation.springweb.v3_1 to match the javaagent module's package structure - Changed class visibility from public to package-private - Removed :testing module from settings.gradle.kts - Deleted instrumentation/spring/spring-web/spring-web-3.1/testing directory All 30 tests pass successfully in their new location. --- .../spring-web/spring-web-3.1/javaagent/build.gradle.kts | 4 +++- .../springweb/v3_1}/SpringRestTemplateTest.java | 4 ++-- .../spring-web/spring-web-3.1/testing/build.gradle.kts | 9 --------- settings.gradle.kts | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) rename instrumentation/spring/spring-web/spring-web-3.1/{testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web => javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1}/SpringRestTemplateTest.java (95%) delete mode 100644 instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts diff --git a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts index 6f70616f40d7..f6f83f8ef04e 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts @@ -14,5 +14,7 @@ muzzle { } dependencies { - compileOnly("org.springframework:spring-web:3.1.0.RELEASE") + library("org.springframework:spring-web:3.1.0.RELEASE") + + testInstrumentation(project(":instrumentation:http-url-connection:javaagent")) } diff --git a/instrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringRestTemplateTest.java similarity index 95% rename from instrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java rename to instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringRestTemplateTest.java index 384f04d641e8..30a5b6c0964a 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java +++ b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringRestTemplateTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.spring.web; +package io.opentelemetry.javaagent.instrumentation.springweb.v3_1; import static java.util.Collections.singletonList; @@ -23,7 +23,7 @@ import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; -public class SpringRestTemplateTest extends AbstractHttpClientTest> { +class SpringRestTemplateTest extends AbstractHttpClientTest> { @RegisterExtension static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent(); diff --git a/instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts b/instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts deleted file mode 100644 index 365561e2fd1a..000000000000 --- a/instrumentation/spring/spring-web/spring-web-3.1/testing/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id("otel.javaagent-testing") -} - -dependencies { - testImplementation("org.springframework:spring-web:4.3.7.RELEASE") - - testInstrumentation(project(":instrumentation:http-url-connection:javaagent")) -} diff --git a/settings.gradle.kts b/settings.gradle.kts index a961f5e4a209..593700b40dda 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -593,7 +593,6 @@ include(":instrumentation:spring:spring-security-config-6.0:javaagent") include(":instrumentation:spring:spring-security-config-6.0:library") include(":instrumentation:spring:spring-web:spring-web-3.1:javaagent") include(":instrumentation:spring:spring-web:spring-web-3.1:library") -include(":instrumentation:spring:spring-web:spring-web-3.1:testing") include(":instrumentation:spring:spring-web:spring-web-6.0:javaagent") include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:javaagent") include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:testing") From a3613e27fcdd8ded21ebd0e4ecd49e6e3fab2073 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 17 Oct 2025 09:08:38 -0700 Subject: [PATCH 2/2] fix --- .../spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts index f6f83f8ef04e..e30a83d7f5b9 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts @@ -17,4 +17,6 @@ dependencies { library("org.springframework:spring-web:3.1.0.RELEASE") testInstrumentation(project(":instrumentation:http-url-connection:javaagent")) + + latestDepTestLibrary("org.springframework:spring-web:5.+") // see spring-web-6.0 module }