From 4959aa735fb19f1904d95301e7837df39f7c7a41 Mon Sep 17 00:00:00 2001 From: dengliming Date: Thu, 10 Sep 2020 07:41:25 +0800 Subject: [PATCH] Rename spring instrumentation modules (#1125) --- .../spring-boot-autoconfigure.gradle | 6 +++--- .../{spring-web-3.1-library => library}/README.md | 0 .../spring-web-3.1-library.gradle | 1 - .../spring/httpclients/HttpHeadersInjectAdapter.java | 0 .../spring/httpclients/RestTemplateInterceptor.java | 0 .../spring/httpclients/RestTemplateTracer.java | 0 .../spring-webflux-5.0-auto.gradle | 2 +- .../spring/webflux/client/WebClientFilterAdvice.java | 0 .../webflux/client/WebClientFilterInstrumentation.java | 0 .../webflux/server/AbstractWebfluxInstrumentation.java | 0 .../auto/spring/webflux/server/AdviceUtils.java | 0 .../spring/webflux/server/DispatcherHandlerAdvice.java | 0 .../server/DispatcherHandlerInstrumentation.java | 0 .../spring/webflux/server/HandlerAdapterAdvice.java | 0 .../webflux/server/HandlerAdapterInstrumentation.java | 0 .../spring/webflux/server/RouteOnSuccessOrError.java | 0 .../spring/webflux/server/RouterFunctionAdvice.java | 0 .../webflux/server/RouterFunctionInstrumentation.java | 0 .../server/SpringWebfluxHttpServerDecorator.java | 0 .../test/groovy/SingleThreadedSpringWebfluxTest.groovy | 0 .../src/test/groovy/SpringWebfluxTest.groovy | 0 .../groovy/client/SpringWebfluxHttpClientTest.groovy | 0 .../src/test/groovy/server/EchoHandler.groovy | 0 .../src/test/groovy/server/EchoHandlerFunction.groovy | 0 .../src/test/groovy/server/FooModel.groovy | 0 .../groovy/server/SpringWebFluxTestApplication.groovy | 0 .../src/test/groovy/server/TestController.groovy | 0 .../src/test/java/server/RedirectComponent.java | 0 .../src/test/resources/logback.xml | 0 .../{spring-webflux-5.0-library => library}/README.md | 0 .../spring-webflux-5.0-library.gradle | 0 .../webflux/client/HttpHeadersInjectAdapter.java | 0 .../webflux/client/SpringWebfluxHttpClientTracer.java | 0 .../spring/webflux/client/WebClientTracingFilter.java | 0 .../spring-webmvc-3.1-auto.gradle | 0 .../springwebmvc/DispatcherServletInstrumentation.java | 0 .../springwebmvc/HandlerAdapterInstrumentation.java | 0 .../springwebmvc/HandlerMappingResourceNameFilter.java | 0 .../auto/springwebmvc/SpringWebMvcTracer.java | 0 .../WebApplicationContextInstrumentation.java | 0 .../src/test/groovy/test/boot/AppConfig.groovy | 0 .../src/test/groovy/test/boot/AuthServerConfig.groovy | 0 .../test/boot/SavingAuthenticationProvider.groovy | 0 .../src/test/groovy/test/boot/SecurityConfig.groovy | 0 .../test/groovy/test/boot/SpringBootBasedTest.groovy | 0 .../src/test/groovy/test/boot/TestController.groovy | 0 .../test/groovy/test/filter/FilteredAppConfig.groovy | 0 .../test/groovy/test/filter/ServletFilterTest.groovy | 0 .../src/test/groovy/test/filter/TestController.groovy | 0 .../src/test/resources/logback.xml | 0 .../{spring-webmvc-3.1-library => library}/README.md | 0 .../spring-webmvc-3.1-library.gradle | 0 .../spring/webmvc/SpringWebMvcServerTracer.java | 0 .../spring/webmvc/WebMvcTracingFilter.java | 0 settings.gradle | 10 +++++----- 55 files changed, 9 insertions(+), 10 deletions(-) rename instrumentation/spring/spring-web-3.1/{spring-web-3.1-library => library}/README.md (100%) rename instrumentation/spring/spring-web-3.1/{spring-web-3.1-library => library}/spring-web-3.1-library.gradle (79%) rename instrumentation/spring/spring-web-3.1/{spring-web-3.1-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java (100%) rename instrumentation/spring/spring-web-3.1/{spring-web-3.1-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptor.java (100%) rename instrumentation/spring/spring-web-3.1/{spring-web-3.1-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/spring-webflux-5.0-auto.gradle (98%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterAdvice.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterInstrumentation.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AbstractWebfluxInstrumentation.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AdviceUtils.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerAdvice.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerInstrumentation.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterAdvice.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterInstrumentation.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouteOnSuccessOrError.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionAdvice.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionInstrumentation.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/SpringWebfluxHttpServerDecorator.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/SpringWebfluxTest.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/server/EchoHandler.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/server/EchoHandlerFunction.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/server/FooModel.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/server/SpringWebFluxTestApplication.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/groovy/server/TestController.groovy (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/java/server/RedirectComponent.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-auto => auto}/src/test/resources/logback.xml (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-library => library}/README.md (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-library => library}/spring-webflux-5.0-library.gradle (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java (100%) rename instrumentation/spring/spring-webflux-5.0/{spring-webflux-5.0-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/spring-webmvc-3.1-auto.gradle (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/DispatcherServletInstrumentation.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerAdapterInstrumentation.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerMappingResourceNameFilter.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/SpringWebMvcTracer.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/WebApplicationContextInstrumentation.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/AppConfig.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/AuthServerConfig.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/SavingAuthenticationProvider.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/SecurityConfig.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/SpringBootBasedTest.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/boot/TestController.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/filter/FilteredAppConfig.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/filter/ServletFilterTest.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/groovy/test/filter/TestController.groovy (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-auto => auto}/src/test/resources/logback.xml (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-library => library}/README.md (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-library => library}/spring-webmvc-3.1-library.gradle (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java (100%) rename instrumentation/spring/spring-webmvc-3.1/{spring-webmvc-3.1-library => library}/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/WebMvcTracingFilter.java (100%) diff --git a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle index b6c4ba902d..4fb1120f0a 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle +++ b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle @@ -17,9 +17,9 @@ dependencies { compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot - implementation project(':instrumentation:spring:spring-web-3.1:spring-web-3.1-library') - implementation project(':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library') - implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library') + implementation project(':instrumentation:spring:spring-web-3.1:library') + implementation project(':instrumentation:spring:spring-webmvc-3.1:library') + implementation project(':instrumentation:spring:spring-webflux-5.0:library') compileOnly deps.opentelemetryAutoAnnotations compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.30.2' diff --git a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/README.md b/instrumentation/spring/spring-web-3.1/library/README.md similarity index 100% rename from instrumentation/spring/spring-web-3.1/spring-web-3.1-library/README.md rename to instrumentation/spring/spring-web-3.1/library/README.md diff --git a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/spring-web-3.1-library.gradle b/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle similarity index 79% rename from instrumentation/spring/spring-web-3.1/spring-web-3.1-library/spring-web-3.1-library.gradle rename to instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle index 24d8690e0a..ac1217e564 100644 --- a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/spring-web-3.1-library.gradle +++ b/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle @@ -1,5 +1,4 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" -archivesBaseName = "spring-web-3.1" dependencies { compileOnly "org.springframework:spring-web:3.1.0.RELEASE" diff --git a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java rename to instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/HttpHeadersInjectAdapter.java diff --git a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptor.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptor.java similarity index 100% rename from instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptor.java rename to instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptor.java diff --git a/instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java b/instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java similarity index 100% rename from instrumentation/spring/spring-web-3.1/spring-web-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java rename to instrumentation/spring/spring-web-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateTracer.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/spring-webflux-5.0-auto.gradle b/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle similarity index 98% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/spring-webflux-5.0-auto.gradle rename to instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle index b494e2cd44..64553ab947 100644 --- a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/spring-webflux-5.0-auto.gradle +++ b/instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle @@ -42,7 +42,7 @@ muzzle { } dependencies { - implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library') + implementation project(':instrumentation:spring:spring-webflux-5.0:library') compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE' compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE' diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterAdvice.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterAdvice.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterAdvice.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterAdvice.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterInstrumentation.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterInstrumentation.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/client/WebClientFilterInstrumentation.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AbstractWebfluxInstrumentation.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AbstractWebfluxInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AbstractWebfluxInstrumentation.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AbstractWebfluxInstrumentation.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AdviceUtils.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AdviceUtils.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AdviceUtils.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/AdviceUtils.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerAdvice.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerAdvice.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerAdvice.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerAdvice.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerInstrumentation.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerInstrumentation.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/DispatcherHandlerInstrumentation.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterAdvice.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterAdvice.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterAdvice.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterAdvice.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterInstrumentation.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/HandlerAdapterInstrumentation.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouteOnSuccessOrError.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouteOnSuccessOrError.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouteOnSuccessOrError.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouteOnSuccessOrError.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionAdvice.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionAdvice.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionAdvice.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionAdvice.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionInstrumentation.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionInstrumentation.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/RouterFunctionInstrumentation.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/SpringWebfluxHttpServerDecorator.java b/instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/SpringWebfluxHttpServerDecorator.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/SpringWebfluxHttpServerDecorator.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/main/java/io/opentelemetry/instrumentation/auto/spring/webflux/server/SpringWebfluxHttpServerDecorator.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/SingleThreadedSpringWebfluxTest.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/SpringWebfluxTest.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/SpringWebfluxTest.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/SpringWebfluxTest.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/SpringWebfluxTest.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/EchoHandler.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/EchoHandler.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/EchoHandler.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/EchoHandler.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/EchoHandlerFunction.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/EchoHandlerFunction.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/EchoHandlerFunction.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/EchoHandlerFunction.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/FooModel.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/FooModel.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/FooModel.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/FooModel.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/SpringWebFluxTestApplication.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/SpringWebFluxTestApplication.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/SpringWebFluxTestApplication.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/SpringWebFluxTestApplication.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/TestController.groovy b/instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/TestController.groovy similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/groovy/server/TestController.groovy rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/groovy/server/TestController.groovy diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/java/server/RedirectComponent.java b/instrumentation/spring/spring-webflux-5.0/auto/src/test/java/server/RedirectComponent.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/java/server/RedirectComponent.java rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/java/server/RedirectComponent.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/resources/logback.xml b/instrumentation/spring/spring-webflux-5.0/auto/src/test/resources/logback.xml similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-auto/src/test/resources/logback.xml rename to instrumentation/spring/spring-webflux-5.0/auto/src/test/resources/logback.xml diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/README.md b/instrumentation/spring/spring-webflux-5.0/library/README.md similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/README.md rename to instrumentation/spring/spring-webflux-5.0/library/README.md diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/spring-webflux-5.0-library.gradle b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/spring-webflux-5.0-library.gradle rename to instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java rename to instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/HttpHeadersInjectAdapter.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java rename to instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/SpringWebfluxHttpClientTracer.java diff --git a/instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java b/instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java similarity index 100% rename from instrumentation/spring/spring-webflux-5.0/spring-webflux-5.0-library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java rename to instrumentation/spring/spring-webflux-5.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webflux/client/WebClientTracingFilter.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/spring-webmvc-3.1-auto.gradle b/instrumentation/spring/spring-webmvc-3.1/auto/spring-webmvc-3.1-auto.gradle similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/spring-webmvc-3.1-auto.gradle rename to instrumentation/spring/spring-webmvc-3.1/auto/spring-webmvc-3.1-auto.gradle diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/DispatcherServletInstrumentation.java b/instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/DispatcherServletInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/DispatcherServletInstrumentation.java rename to instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/DispatcherServletInstrumentation.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerAdapterInstrumentation.java b/instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerAdapterInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerAdapterInstrumentation.java rename to instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerAdapterInstrumentation.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerMappingResourceNameFilter.java b/instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerMappingResourceNameFilter.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerMappingResourceNameFilter.java rename to instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/HandlerMappingResourceNameFilter.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/SpringWebMvcTracer.java b/instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/SpringWebMvcTracer.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/SpringWebMvcTracer.java rename to instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/SpringWebMvcTracer.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/WebApplicationContextInstrumentation.java b/instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/WebApplicationContextInstrumentation.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/WebApplicationContextInstrumentation.java rename to instrumentation/spring/spring-webmvc-3.1/auto/src/main/java/io/opentelemetry/instrumentation/auto/springwebmvc/WebApplicationContextInstrumentation.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/AppConfig.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/AppConfig.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/AppConfig.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/AppConfig.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/AuthServerConfig.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/AuthServerConfig.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/AuthServerConfig.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/AuthServerConfig.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SavingAuthenticationProvider.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SavingAuthenticationProvider.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SavingAuthenticationProvider.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SavingAuthenticationProvider.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SecurityConfig.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SecurityConfig.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SecurityConfig.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SecurityConfig.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SpringBootBasedTest.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/SpringBootBasedTest.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/SpringBootBasedTest.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/TestController.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/TestController.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/boot/TestController.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/boot/TestController.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/FilteredAppConfig.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/FilteredAppConfig.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/FilteredAppConfig.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/FilteredAppConfig.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/ServletFilterTest.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/ServletFilterTest.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/ServletFilterTest.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/ServletFilterTest.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/TestController.groovy b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/TestController.groovy similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/groovy/test/filter/TestController.groovy rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/groovy/test/filter/TestController.groovy diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/resources/logback.xml b/instrumentation/spring/spring-webmvc-3.1/auto/src/test/resources/logback.xml similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-auto/src/test/resources/logback.xml rename to instrumentation/spring/spring-webmvc-3.1/auto/src/test/resources/logback.xml diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/README.md b/instrumentation/spring/spring-webmvc-3.1/library/README.md similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/README.md rename to instrumentation/spring/spring-webmvc-3.1/library/README.md diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/spring-webmvc-3.1-library.gradle b/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/spring-webmvc-3.1-library.gradle rename to instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java rename to instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/SpringWebMvcServerTracer.java diff --git a/instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/WebMvcTracingFilter.java b/instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/WebMvcTracingFilter.java similarity index 100% rename from instrumentation/spring/spring-webmvc-3.1/spring-webmvc-3.1-library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/WebMvcTracingFilter.java rename to instrumentation/spring/spring-webmvc-3.1/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/WebMvcTracingFilter.java diff --git a/settings.gradle b/settings.gradle index cab67c69f7..c8a02af93f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -159,11 +159,11 @@ include ':instrumentation:servlet:servlet-3.0' include ':instrumentation:spark-web-framework-2.3' include ':instrumentation:spring:spring-data-1.8' include ':instrumentation:spring:spring-scheduling-3.1' -include ':instrumentation:spring:spring-web-3.1:spring-web-3.1-library' -include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-auto' -include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library' -include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-auto' -include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library' +include ':instrumentation:spring:spring-web-3.1:library' +include ':instrumentation:spring:spring-webmvc-3.1:auto' +include ':instrumentation:spring:spring-webmvc-3.1:library' +include ':instrumentation:spring:spring-webflux-5.0:auto' +include ':instrumentation:spring:spring-webflux-5.0:library' include ':instrumentation:spring:spring-boot-autoconfigure' include ':instrumentation:spring:starters:spring-starter' include ':instrumentation:spring:starters:jaeger-exporter-starter'