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 ec57e007fc4e..66cc73b3ab6b 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/javaagent/instrumentation/spring/webflux/v5_0/server/IpcSingleThreadNettyCustomizer.java similarity index 85% 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/javaagent/instrumentation/spring/webflux/v5_0/server/IpcSingleThreadNettyCustomizer.java index 9426fde4a4ca..2a5583fcfe6a 100644 --- 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/javaagent/instrumentation/spring/webflux/v5_0/server/IpcSingleThreadNettyCustomizer.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.spring.webflux; +package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server; import org.springframework.boot.web.embedded.netty.NettyServerCustomizer; import reactor.ipc.netty.http.server.HttpServerOptions; diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringThreadedSpringWebfluxTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringThreadedSpringWebfluxTest.java index f31600f3bc2e..0c4a15017a1e 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringThreadedSpringWebfluxTest.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringThreadedSpringWebfluxTest.java @@ -5,7 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server; -import io.opentelemetry.instrumentation.spring.webflux.IpcSingleThreadNettyCustomizer; import io.opentelemetry.instrumentation.spring.webflux.server.SingleThreadNettyCustomizer; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; diff --git a/settings.gradle.kts b/settings.gradle.kts index 0e4cda313a8d..5555accaaf8b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -557,7 +557,6 @@ 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") 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")