#560 Consolidate src/main/java8 and src/main/java9 into src/main/java (#617)

Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
2020-06-30 21:34:59 +08:00 · 2020-06-30 21:34:59 +08:00 · 5f70b521b7
parent 77654a44bc
commit 5f70b521b7
56 changed files with 0 additions and 2 deletions
--- 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'
    }
  }
 }
--- a/instrumentation/akka-http-10.0/src/main/java8/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java
+++ b/instrumentation/akka-http-10.0/src/main/java8/io/opentelemetry/auto/instrumentation/akkahttp/AkkaHttpServerHeaders.java
--- 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/java8/io/opentelemetry/auto/instrumentation/awssdk/v2_2/TracingExecutionInterceptor.java
--- 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/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CassandraClientDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/CompletionStageFunction.java
--- 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/java8/io/opentelemetry/auto/instrumentation/cassandra/v4_0/TracingCqlSession.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/InstrumentationPoints.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceAsyncCommandsAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/LettuceClientDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v4_0/RedisConnectionAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/ConnectionFutureAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncBiFunction.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceAsyncCommandsAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceClientDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/LettuceInstrumentationUtil.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxCreationAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceFluxTerminationRunnable.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoCreationAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_0/rx/LettuceMonoDualConsumer.java
--- 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/java8/io/opentelemetry/auto/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHeaders.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_3/PlayHttpServerDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_3/RequestCompleteCallback.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHeaders.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_4/PlayHttpServerDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_4/RequestCompleteCallback.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHeaders.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_6/PlayHttpServerDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/play/v2_6/RequestCompleteCallback.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ActionWrapper.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/BlockWrapper.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ErrorHandlerAdvice.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/RatpackServerDecorator.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/ServerRegistryAdvice.java
--- a/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java
+++ b/instrumentation/ratpack-1.5/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java
--- a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java
+++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java
--- a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java
+++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java
--- a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java
+++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java
--- a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java
+++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java
--- a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java
+++ b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/HttpHeadersInjectAdapter.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/SpringWebfluxHttpClientDecorator.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientFilterAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/client/WebClientTracingFilter.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/AdviceUtils.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/HandlerAdapterAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouteOnSuccessOrError.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/RouterFunctionAdvice.java
--- 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/java8/io/opentelemetry/auto/instrumentation/springwebflux/server/SpringWebfluxHttpServerDecorator.java
--- a/smoke-tests/java9-modules/src/main/java9/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java
+++ b/smoke-tests/java9-modules/src/main/java9/io/opentelemetry/smoketest/moduleapp/ModuleApplication.java
--- a/smoke-tests/java9-modules/src/main/java9/module-info.java
+++ b/smoke-tests/java9-modules/src/main/java9/module-info.java