diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts index a1c07695dcb8..f4624db0b53f 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts @@ -52,8 +52,6 @@ dependencies { testInstrumentation(project(":instrumentation:reactor:reactor-3.1:javaagent")) testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent")) - testImplementation(project(":instrumentation:spring:spring-webflux:spring-webflux-5.0:testing")) - testImplementation(project(":instrumentation:spring:spring-webflux:spring-webflux-5.3:testing")) testLibrary("org.springframework.boot:spring-boot-starter-webflux:2.0.0.RELEASE") diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/IpcSingleThreadNettyCustomizer.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/webflux/IpcSingleThreadNettyCustomizer.java similarity index 100% rename from instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/IpcSingleThreadNettyCustomizer.java rename to instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/instrumentation/spring/webflux/IpcSingleThreadNettyCustomizer.java diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts deleted file mode 100644 index 42b60973aa11..000000000000 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id("otel.java-conventions") -} - -dependencies { - implementation(project(":testing-common")) - - compileOnly("org.springframework:spring-webflux:5.0.0.RELEASE") - compileOnly("org.springframework.boot:spring-boot-starter-reactor-netty:2.0.0.RELEASE") - compileOnly("org.springframework.boot:spring-boot:2.0.0.RELEASE") -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 593700b40dda..6064599d2fec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -595,7 +595,6 @@ 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-6.0:javaagent") include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:javaagent") -include(":instrumentation:spring:spring-webflux:spring-webflux-5.0:testing") include(":instrumentation:spring:spring-webflux:spring-webflux-5.3:library") include(":instrumentation:spring:spring-webflux:spring-webflux-5.3:testing") include(":instrumentation:spring:spring-webmvc:spring-webmvc-3.1:javaagent")