From 5f70b521b7570e1292ac1614cc9b0c95613deb3a Mon Sep 17 00:00:00 2001 From: Sergei Malafeev Date: Tue, 30 Jun 2020 21:34:59 +0800 Subject: [PATCH] #560 Consolidate src/main/java8 and src/main/java9 into src/main/java (#617) Signed-off-by: Sergei Malafeev --- gradle/java.gradle | 2 -- .../auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java | 0 .../awssdk/v2_2/TracingExecutionInterceptor.java | 0 .../instrumentation/cassandra/v4_0/CassandraClientAdvice.java | 0 .../cassandra/v4_0/CassandraClientDecorator.java | 0 .../instrumentation/cassandra/v4_0/CompletionStageFunction.java | 0 .../auto/instrumentation/cassandra/v4_0/TracingCqlSession.java | 0 .../instrumentation/lettuce/v4_0/InstrumentationPoints.java | 0 .../lettuce/v4_0/LettuceAsyncCommandsAdvice.java | 0 .../instrumentation/lettuce/v4_0/LettuceClientDecorator.java | 0 .../instrumentation/lettuce/v4_0/RedisConnectionAdvice.java | 0 .../instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java | 0 .../instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java | 0 .../lettuce/v5_0/LettuceAsyncCommandsAdvice.java | 0 .../instrumentation/lettuce/v5_0/LettuceClientDecorator.java | 0 .../lettuce/v5_0/LettuceInstrumentationUtil.java | 0 .../lettuce/v5_0/rx/LettuceFluxCreationAdvice.java | 0 .../lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java | 0 .../lettuce/v5_0/rx/LettuceMonoCreationAdvice.java | 0 .../lettuce/v5_0/rx/LettuceMonoDualConsumer.java | 0 .../auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java | 0 .../auto/instrumentation/play/v2_3/PlayAdvice.java | 0 .../auto/instrumentation/play/v2_3/PlayHeaders.java | 0 .../auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java | 0 .../auto/instrumentation/play/v2_3/RequestCompleteCallback.java | 0 .../auto/instrumentation/play/v2_4/PlayAdvice.java | 0 .../auto/instrumentation/play/v2_4/PlayHeaders.java | 0 .../auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java | 0 .../auto/instrumentation/play/v2_4/RequestCompleteCallback.java | 0 .../auto/instrumentation/play/v2_6/PlayAdvice.java | 0 .../auto/instrumentation/play/v2_6/PlayHeaders.java | 0 .../auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java | 0 .../auto/instrumentation/play/v2_6/RequestCompleteCallback.java | 0 .../auto/instrumentation/ratpack/ActionWrapper.java | 0 .../auto/instrumentation/ratpack/BlockWrapper.java | 0 .../auto/instrumentation/ratpack/ErrorHandlerAdvice.java | 0 .../auto/instrumentation/ratpack/RatpackServerDecorator.java | 0 .../auto/instrumentation/ratpack/ServerRegistryAdvice.java | 0 .../auto/instrumentation/ratpack/TracingHandler.java | 0 .../instrumentation/reactor/FluxAndMonoSubscribeAdvice.java | 0 .../auto/instrumentation/reactor/ReactorCoreAdviceUtils.java | 0 .../auto/instrumentation/reactor/ReactorHooksAdvice.java | 0 .../auto/instrumentation/reactor/TracingPublishers.java | 0 .../auto/instrumentation/reactor/TracingSubscriber.java | 0 .../springwebflux/client/HttpHeadersInjectAdapter.java | 0 .../springwebflux/client/SpringWebfluxHttpClientDecorator.java | 0 .../springwebflux/client/WebClientFilterAdvice.java | 0 .../springwebflux/client/WebClientTracingFilter.java | 0 .../auto/instrumentation/springwebflux/server/AdviceUtils.java | 0 .../springwebflux/server/DispatcherHandlerAdvice.java | 0 .../springwebflux/server/HandlerAdapterAdvice.java | 0 .../springwebflux/server/RouteOnSuccessOrError.java | 0 .../springwebflux/server/RouterFunctionAdvice.java | 0 .../springwebflux/server/SpringWebfluxHttpServerDecorator.java | 0 .../io/opentelemetry/smoketest/moduleapp/ModuleApplication.java | 0 .../java9-modules/src/main/{java9 => java}/module-info.java | 0 56 files changed, 2 deletions(-) rename instrumentation/akka-http-10.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java (100%) rename instrumentation/aws-sdk/aws-sdk-2.2/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java (100%) rename instrumentation/cassandra/cassandra-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java (100%) rename instrumentation/cassandra/cassandra-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java (100%) rename instrumentation/cassandra/cassandra-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java (100%) rename instrumentation/cassandra/cassandra-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java (100%) rename instrumentation/lettuce/lettuce-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java (100%) rename instrumentation/lettuce/lettuce-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java (100%) rename instrumentation/lettuce/lettuce-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java (100%) rename instrumentation/lettuce/lettuce-4.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java (100%) rename instrumentation/lettuce/lettuce-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java (100%) rename instrumentation/lettuce/lettuce-5.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java (100%) rename instrumentation/play/play-2.3/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java (100%) rename instrumentation/play/play-2.3/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java (100%) rename instrumentation/play/play-2.3/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java (100%) rename instrumentation/play/play-2.3/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java (100%) rename instrumentation/play/play-2.4/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java (100%) rename instrumentation/play/play-2.4/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java (100%) rename instrumentation/play/play-2.4/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java (100%) rename instrumentation/play/play-2.4/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java (100%) rename instrumentation/play/play-2.6/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java (100%) rename instrumentation/play/play-2.6/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java (100%) rename instrumentation/play/play-2.6/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java (100%) rename instrumentation/play/play-2.6/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java (100%) rename instrumentation/ratpack-1.5/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java (100%) rename instrumentation/reactor-3.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java (100%) rename instrumentation/reactor-3.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java (100%) rename instrumentation/reactor-3.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java (100%) rename instrumentation/reactor-3.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java (100%) rename instrumentation/reactor-3.1/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java (100%) rename instrumentation/spring-webflux-5.0/src/main/{java8 => java}/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java (100%) rename smoke-tests/java9-modules/src/main/{java9 => java}/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java (100%) rename smoke-tests/java9-modules/src/main/{java9 => java}/module-info.java (100%) diff --git a/gradle/java.gradle b/gradle/java.gradle index fa0686a550..0ce8e4b5d8 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -39,8 +39,6 @@ sourceSets { main { java { srcDir 'src/main/java' - srcDir 'src/main/java8' - srcDir 'src/main/java9' } } } diff --git a/instrumentation/akka-http-10.0/src/main/java8/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java b/instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java similarity index 100% rename from instrumentation/akka-http-10.0/src/main/java8/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java rename to instrumentation/akka-http-10.0/src/main/java/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java b/instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java similarity index 100% rename from instrumentation/aws-sdk/aws-sdk-2.2/src/main/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java rename to instrumentation/aws-sdk/aws-sdk-2.2/src/main/java/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java diff --git a/instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java similarity index 100% rename from instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java rename to instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java diff --git a/instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java similarity index 100% rename from instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java rename to instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java diff --git a/instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java similarity index 100% rename from instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java rename to instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java diff --git a/instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java b/instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java similarity index 100% rename from instrumentation/cassandra/cassandra-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java rename to instrumentation/cassandra/cassandra-4.0/src/main/java/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java diff --git a/instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java similarity index 100% rename from instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java rename to instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java diff --git a/instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java rename to instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java diff --git a/instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java similarity index 100% rename from instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java rename to instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java diff --git a/instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java b/instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-4.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java rename to instrumentation/lettuce/lettuce-4.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java diff --git a/instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java b/instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java rename to instrumentation/lettuce/lettuce-5.0/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java diff --git a/instrumentation/lettuce/lettuce-5.1/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java b/instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java similarity index 100% rename from instrumentation/lettuce/lettuce-5.1/src/main/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java rename to instrumentation/lettuce/lettuce-5.1/src/main/java/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java diff --git a/instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java similarity index 100% rename from instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java rename to instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java diff --git a/instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java similarity index 100% rename from instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java rename to instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java diff --git a/instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java similarity index 100% rename from instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java rename to instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java diff --git a/instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java b/instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java similarity index 100% rename from instrumentation/play/play-2.3/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java rename to instrumentation/play/play-2.3/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java diff --git a/instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java similarity index 100% rename from instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java rename to instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java diff --git a/instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java similarity index 100% rename from instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java rename to instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java diff --git a/instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java similarity index 100% rename from instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java rename to instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java diff --git a/instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java b/instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java similarity index 100% rename from instrumentation/play/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java rename to instrumentation/play/play-2.4/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java diff --git a/instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java similarity index 100% rename from instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java rename to instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java diff --git a/instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java similarity index 100% rename from instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java rename to instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java diff --git a/instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java similarity index 100% rename from instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java rename to instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java diff --git a/instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java b/instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java similarity index 100% rename from instrumentation/play/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java rename to instrumentation/play/play-2.6/src/main/java/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java diff --git a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java b/instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java similarity index 100% rename from instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java rename to instrumentation/ratpack-1.5/src/main/java/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java diff --git a/instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java b/instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java similarity index 100% rename from instrumentation/spring-webflux-5.0/src/main/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java rename to instrumentation/spring-webflux-5.0/src/main/java/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java diff --git a/smoke-tests/java9-modules/src/main/java9/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java b/smoke-tests/java9-modules/src/main/java/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java similarity index 100% rename from smoke-tests/java9-modules/src/main/java9/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java rename to smoke-tests/java9-modules/src/main/java/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java diff --git a/smoke-tests/java9-modules/src/main/java9/module-info.java b/smoke-tests/java9-modules/src/main/java/module-info.java similarity index 100% rename from smoke-tests/java9-modules/src/main/java9/module-info.java rename to smoke-tests/java9-modules/src/main/java/module-info.java