Move spring-web-3.1 tests from separate :testing module to :javaagent (#15023)

Author: trask

instrumentation/spring/spring-web/spring-web-3.1/javaagent/build.gradle.kts

@@ -14,5 +14,9 @@ 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"))
+
+  latestDepTestLibrary("org.springframework:spring-web:5.+") // see spring-web-6.0 module
 }

…n/spring/web/SpringRestTemplateTest.java …ringweb/v3_1/SpringRestTemplateTest.javainstrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java renamed to instrumentation/spring/spring-web/spring-web-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringRestTemplateTest.java instrumentation/spring/spring-web/spring-web-3.1/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/web/SpringRestTemplateTest.java renamed to 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<HttpEntity<String>> {
+class SpringRestTemplateTest extends AbstractHttpClientTest<HttpEntity<String>> {
 
   @RegisterExtension
   static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();

instrumentation/spring/spring-web/spring-web-3.1/testing/build.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")