From 2da0853312f8ddc768fa4b232091371cc9f0c501 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 3 Oct 2025 09:39:44 +0200 Subject: [PATCH 1/3] Regroup jdk related instrumentations --- .github/CODEOWNERS | 2 +- dd-java-agent/agent-iast/build.gradle | 2 +- .../apache-httpclient-4.0/build.gradle | 4 +- dd-java-agent/instrumentation/build.gradle | 3 +- .../java-completablefuture/build.gradle | 21 --- .../java-concurrent-25/gradle.lockfile | 162 ----------------- .../lambda-testing/gradle.lockfile | 165 ------------------ .../jdk-java-concurrent}/build.gradle | 0 .../jdk-java-concurrent}/gradle.lockfile | 0 .../jdk-java-concurrent-1.8}/build.gradle | 10 +- .../AsyncTaskInstrumentation.java | 0 ...bleFutureUniCompletionInstrumentation.java | 0 ...eUniCompletionSubclassInstrumentation.java | 0 ...syncPropagatingDisableInstrumentation.java | 0 .../ConcurrentInstrumentationNames.java | 0 .../TaskUnwrappingInstrumentation.java | 0 .../WrapRunnableAsNewTaskInstrumentation.java | 0 .../AbstractExecutorInstrumentation.java | 0 .../executor/JavaExecutorInstrumentation.java | 0 .../NonStandardExecutorInstrumentation.java | 0 ...jectedExecutionHandlerInstrumentation.java | 0 .../ThreadPoolExecutorInstrumentation.java | 0 .../JavaForkJoinPoolInstrumentation.java | 0 .../JavaForkJoinTaskInstrumentation.java | 0 .../JavaForkJoinWorkQueueInstrumentation.java | 0 .../runnable/ConsumerTaskInstrumentation.java | 0 .../RunnableFutureInstrumentation.java | 0 .../runnable/RunnableInstrumentation.java | 0 .../timer/JavaTimerInstrumentation.java | 0 .../timer/TimerTaskInstrumentation.java | 0 .../concurrent/CompletableFutureAdvice.java | 0 ...etableFuturePromiseForkJoinPoolTest.groovy | 0 ...CompletableFuturePromiseNoAsyncTest.groovy | 0 .../CompletableFuturePromiseTest.groovy | 0 ...pletableFuturePromiseThreadPoolTest.groovy | 0 .../test/groovy/CompletableFutureTest.groovy | 0 .../src/test/groovy/CrossedContextTest.groovy | 0 .../src/test/groovy/ExecutorLambdaTest.groovy | 0 .../test/groovy/QueueTimingForkedTest.groovy | 0 .../groovy/TaskUnwrappingForkedTest.groovy | 0 .../src/test/groovy/TestFanout.groovy | 0 .../groovy/executor/ContextLeakTest.groovy | 0 .../ExecutorInstrumentationTest.groovy | 0 .../NettyExecutorInstrumentationTest.groovy | 0 .../RecursiveThreadPoolPropagationTest.groovy | 0 .../executor/RejectedExecutionTest.groovy | 0 .../groovy/executor/ToBeIgnoredExecutor.java | 0 .../ForkJoinPoolPropagationTest.groovy | 0 .../FutureTaskContinuationTest.groovy | 0 .../runnable/ModuleInjectionTest.groovy | 0 .../timer/TimerTaskContinuationTest.groovy | 0 .../src/test/java/Fanout.java | 0 .../src/test/java/JavaAsyncChild.java | 0 .../src/test/java/LambdaGenerator.java | 0 .../executor/CustomThreadPoolExecutor.java | 0 .../executor/TypeAwareThreadPoolExecutor.java | 0 .../RecursiveThreadPoolExecution.java | 0 ...ThreadPoolMixedSubmissionAndExecution.java | 0 .../RecursiveThreadPoolSubmission.java | 0 .../ExecutingRejectedExecutionHandler.java | 0 .../SwallowingRejectedExecutionHandler.java | 0 .../src/test/java/forkjoin/LinearTask.java | 0 .../src/test/java/forkjoin/PeriodicTask.java | 0 .../test/java/runnable/CheckpointTask.java | 0 .../java/runnable/ComparableAsyncChild.java | 0 .../src/test/java/runnable/Descendant.java | 0 .../test/java/runnable/JavaAsyncChild.java | 0 .../test/java/runnable/SettableFuture.java | 0 .../jdk-java-concurrent-21.0}/build.gradle | 0 .../jdk-java-concurrent-21.0}/gradle.lockfile | 0 .../StructuredTaskScope21Instrumentation.java | 0 .../TaskRunnerInstrumentation.java | 0 .../groovy/StructuredConcurrencyTest.groovy | 0 .../src/test/groovy/VirtualThreadTest.groovy | 0 .../src/test/java/JavaAsyncChild.java | 0 .../jdk-java-concurrent-25.0}/build.gradle | 0 .../jdk-java-concurrent-25.0}/gradle.lockfile | 0 .../StructuredTaskScope25Instrumentation.java | 2 +- .../jdk-java-io-1.8}/build.gradle | 0 .../jdk-java-io-1.8}/gradle.lockfile | 0 .../java/lang/ByteBufferCallSite.java | 0 .../java/lang/FileCallSite.java | 0 .../java/lang/FileInputStreamCallSite.java | 0 .../java/lang/FileLoadedRaspHelper.java | 0 .../java/lang/FileOutputStreamCallSite.java | 0 .../java/lang/InputStreamInstrumentation.java | 0 .../java/lang/InputStreamReaderCallSite.java | 0 .../java/lang/ObjectInputStreamCallSite.java | 0 .../java/lang/PathCallSite.java | 0 .../java/lang/PathsCallSite.java | 0 .../java/lang/PrintWriterCallSite.java | 0 .../java/lang/StringReaderCallSite.java | 0 .../java/io/BaseIoCallSiteTest.groovy | 0 .../java/io/BaseIoRaspCallSiteTest.groovy | 0 .../java/io/ByteBufferTest.groovy | 0 .../java/io/FileCallSiteTest.groovy | 0 .../io/FileInputStreamCallSiteTest.groovy | 0 .../io/FileLoadedRaspHelperForkedTest.groovy | 0 .../io/FileOutputStreamCallSiteTest.groovy | 0 .../io/InputStreamInstrumentationTest.groovy | 0 .../io/InputStreamReaderCallSiteTest.groovy | 0 .../io/ObjectInputStreamCallSiteTest.groovy | 0 .../java/io/PathCallSiteTest.groovy | 0 .../java/io/PathsCallSiteTest.groovy | 0 .../java/io/PrintWriterCallSiteTest.groovy | 0 .../java/io/StringReaderCallSiteTest.groovy | 0 .../java/foo/bar/TestByteBufferSuite.java | 0 .../foo/bar/TestCustomInputStreamReader.java | 0 .../foo/bar/TestCustomObjectInputStream.java | 0 .../java/foo/bar/TestCustomStringReader.java | 0 .../foo/bar/TestFileInputStreamSuite.java | 0 .../foo/bar/TestFileOutputStreamSuite.java | 0 .../src/test/java/foo/bar/TestFileSuite.java | 0 .../foo/bar/TestInputStreamReaderSuite.java | 0 .../java/foo/bar/TestInputStreamSuite.java | 0 .../foo/bar/TestObjectInputStreamSuite.java | 0 .../src/test/java/foo/bar/TestPathSuite.java | 0 .../src/test/java/foo/bar/TestPathsSuite.java | 0 .../java/foo/bar/TestPrintWriterSuite.java | 0 .../java/foo/bar/TestStringReaderSuite.java | 0 .../jdk-java-lang-1.8}/build.gradle | 0 .../jdk-java-lang-1.8}/gradle.lockfile | 0 .../java/lang/ClassCallSite.java | 0 .../java/lang/ClassLoaderCallSite.java | 0 .../java/lang/LookupCallSite.java | 0 .../java/lang/MathCallSite.java | 0 .../java/lang/ProcessBuilderCallSite.java | 0 .../java/lang/ProcessImplInstrumentation.java | 0 .../java/lang/ProcessImplStartAdvice.java | 0 .../java/lang/RuntimeCallSite.java | 0 .../java/lang/RuntimeExecStringAdvice.java | 0 .../java/lang/RuntimeInstrumentation.java | 0 .../java/lang/StringBuilderCallSite.java | 0 .../java/lang/StringCallSite.java | 0 .../java/lang/StringExperimentalCallSite.java | 0 .../lang/StringFullDetectionCallSite.java | 0 .../CustomMBeanBuilderInstrumentation.java | 0 .../java/lang/ClassCallSiteTest.groovy | 0 .../java/lang/ClassLoaderCallSiteTest.groovy | 0 .../java/lang/LookupCallSiteTest.groovy | 0 .../java/lang/MathCallSiteTest.groovy | 0 .../lang/ProcessBuilderCallSiteTest.groovy | 0 ...nstrumentationExecCmdRaspForkedTest.groovy | 0 ...essImplInstrumentationSpecification.groovy | 0 .../java/lang/RuntimeCallSiteTest.groovy | 0 .../RuntimeInstrumentationForkedTest.groovy | 0 .../lang/StringBuilderCallSiteTest.groovy | 0 .../java/lang/StringCallSiteTest.groovy | 0 .../StringExperimentalCallSiteTest.groovy | 0 ...ringFullDetectionCallSiteForkedTest.groovy | 0 .../bar/TestAbstractStringBuilderSuite.java | 0 .../java/foo/bar/TestClassLoaderSuite.java | 0 .../src/test/java/foo/bar/TestClassSuite.java | 0 .../test/java/foo/bar/TestLookupSuite.java | 0 .../src/test/java/foo/bar/TestMathSuite.java | 0 .../java/foo/bar/TestProcessBuilderSuite.java | 0 .../test/java/foo/bar/TestRuntimeSuite.java | 0 .../java/foo/bar/TestStringBufferSuite.java | 0 .../java/foo/bar/TestStringBuilderSuite.java | 0 .../test/java/foo/bar/TestStringSuite.java | 0 .../jdk-java-lang-11.0}/build.gradle | 0 .../jdk-java-lang-11.0}/gradle.lockfile | 0 .../java/lang/jdk11/StringCallSite.java | 0 .../java/lang/jdk11/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK11Suite.java | 0 .../jdk-java-lang-15.0}/build.gradle | 0 .../jdk-java-lang-15.0}/gradle.lockfile | 0 .../java/lang/jdk15/StringCallSite.java | 0 .../java/lang/jdk15/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK15Suite.java | 0 .../jdk-java-lang-17.0}/build.gradle | 0 .../jdk-java-lang-17.0}/gradle.lockfile | 0 .../java/lang/jdk17/StringCallSite.java | 0 .../java/lang/jdk17/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK17Suite.java | 0 .../jdk-java-lang-9.0}/build.gradle | 0 .../jdk-java-lang-9.0}/gradle.lockfile | 0 .../java/lang/invoke/Lookup9CallSite.java | 0 .../invoke/StringConcatFactoryCallSite.java | 0 .../lang/invoke/Lookup9CallSiteTest.groovy | 0 .../StringConcatFactoryCallSiteTest.groovy | 0 .../test/java/foo/bar/TestLookup9Suite.java | 0 .../foo/bar/TestStringConcatFactorySuite.java | 0 .../jdk-java-net-1.8}/build.gradle | 0 .../jdk-java-net-1.8}/gradle.lockfile | 0 .../instrumentation/java/net/URICallSite.java | 0 .../instrumentation/java/net/URLCallSite.java | 0 .../java/net/URLDecoderCallSite.java | 0 .../java/net/URLEncoderCallSite.java | 0 .../java/net/URLSinkCallSite.java | 0 .../java/net/URICallSIteTest.groovy | 0 .../java/net/URLCallSiteTest.groovy | 0 .../java/net/URLDecoderCallSiteTest.groovy | 0 .../java/net/URLEncoderCallSiteTest.groovy | 0 .../java/net/URLSinkCallSiteTest.groovy | 0 .../java/foo/bar/TestURICallSiteSuite.java | 0 .../java/foo/bar/TestURLCallSiteSuite.java | 0 .../foo/bar/TestURLDecoderCallSiteSuite.java | 0 .../foo/bar/TestURLEncoderCallSiteSuite.java | 0 .../jdk-java-net-11.0}/build.gradle | 0 .../jdk-java-net-11.0}/gradle.lockfile | 0 .../httpclient/HttpClientInstrumentation.java | 0 .../HttpHeadersInstrumentation.java | 0 .../httpclient/BodyHandlerWrapper.java | 0 .../httpclient/CompletableFutureWrapper.java | 0 .../httpclient/HeadersAdvice.java | 0 .../httpclient/HttpHeadersInjectAdapter.java | 0 .../httpclient/JavaNetClientDecorator.java | 0 .../httpclient/ResponseConsumer.java | 0 .../httpclient/SendAdvice.java | 0 .../httpclient/SendAsyncAdvice.java | 0 .../httpclient/JavaHttpClientAsyncTest.groovy | 0 .../httpclient/JavaHttpClientTest.groovy | 0 .../jdk-java-nio-1.8}/build.gradle | 0 .../jdk-java-nio-1.8}/gradle.lockfile | 0 .../ByteBufferInstrumentation.java | 0 .../DirectByteBufferInstrumentation.java | 0 .../FileChannelImplInstrumentation.java | 0 .../AllocateDirectAdvice.java | 0 .../directbytebuffer/MemoryMappingAdvice.java | 0 .../NewDirectByteBufferAdvice.java | 0 .../DirectAllocationTrackingTest.groovy | 0 .../jdk-java-security-1.8}/build.gradle | 0 .../jdk-java-security-1.8}/gradle.lockfile | 0 .../WeakCipherInstrumentationCallSite.java | 0 .../WeakHashInstrumentationCallSite.java | 0 .../test/groovy/test/WeakCipherTest.groovy | 0 .../src/test/groovy/test/WeakHashTest.groovy | 0 .../src/test/java/foo/bar/TestSuite.java | 0 .../jdk-java-util-1.8}/build.gradle | 0 .../jdk-java-util-1.8}/gradle.lockfile | 0 .../java/util/RandomCallSite.java | 0 .../concurrent/ThreadLocalRandomCallSite.java | 0 .../java/util/RandomCallSiteTest.groovy | 0 .../ThreadLocalRandomCallSiteTest.groovy | 0 .../test/java/foo/bar/TestRandomSuite.java | 0 .../foo/bar/TestThreadLocalRandomSuite.java | 0 .../kafka/kafka-clients-0.11/build.gradle | 8 +- .../kafka/kafka-connect-0.11/build.gradle | 4 +- .../kotlin-coroutines/build.gradle | 2 +- .../okhttp/okhttp-2.2/build.gradle | 6 +- .../okhttp/okhttp-3.0/build.gradle | 2 +- .../instrumentation/org-json/build.gradle | 2 +- .../resilience4j-reactor-2.0/build.gradle | 2 +- .../instrumentation/scala/build.gradle | 2 +- .../instrumentation/slick/build.gradle | 4 +- settings.gradle.kts | 30 ++-- 247 files changed, 45 insertions(+), 388 deletions(-) delete mode 100644 dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle delete mode 100644 dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/gradle.lockfile delete mode 100644 dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-concurrent/lambda-testing => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/build.gradle (78%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/main/java/java/util/concurrent/CompletableFutureAdvice.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CompletableFutureTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/CrossedContextTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/lambda-testing => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/ExecutorLambdaTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/QueueTimingForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/TaskUnwrappingForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/TestFanout.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/ContextLeakTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/ExecutorInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/RejectedExecutionTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/executor/ToBeIgnoredExecutor.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/runnable/FutureTaskContinuationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/runnable/ModuleInjectionTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/groovy/timer/TimerTaskContinuationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/Fanout.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/lambda-testing => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/lambda-testing => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/LambdaGenerator.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/CustomThreadPoolExecutor.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/TypeAwareThreadPoolExecutor.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/forkjoin/LinearTask.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/forkjoin/PeriodicTask.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/runnable/CheckpointTask.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/runnable/ComparableAsyncChild.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/runnable/Descendant.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/runnable/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{java-concurrent => jdk/jdk-java-concurrent/jdk-java-concurrent-1.8}/src/test/java/runnable/SettableFuture.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/src/previewTest/groovy/StructuredConcurrencyTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/src/test/groovy/VirtualThreadTest.groovy (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-21 => jdk/jdk-java-concurrent/jdk-java-concurrent-21.0}/src/test/java/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-25 => jdk/jdk-java-concurrent/jdk-java-concurrent-25.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-completablefuture => jdk/jdk-java-concurrent/jdk-java-concurrent-25.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-concurrent/java-concurrent-25 => jdk/jdk-java-concurrent/jdk-java-concurrent-25.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java (95%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestByteBufferSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestCustomInputStreamReader.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestCustomObjectInputStream.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestCustomStringReader.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestFileInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestFileOutputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestFileSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestInputStreamReaderSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestObjectInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestPathSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestPathsSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestPrintWriterSuite.java (100%) rename dd-java-agent/instrumentation/{java-io => jdk/jdk-java-io-1.8}/src/test/java/foo/bar/TestStringReaderSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestClassLoaderSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestClassSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestLookupSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestMathSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestProcessBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestRuntimeSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestStringBufferSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestStringBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang => jdk/jdk-java-lang/jdk-java-lang-1.8}/src/test/java/foo/bar/TestStringSuite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-11 => jdk/jdk-java-lang/jdk-java-lang-11.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-11 => jdk/jdk-java-lang/jdk-java-lang-11.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-11 => jdk/jdk-java-lang/jdk-java-lang-11.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-11 => jdk/jdk-java-lang/jdk-java-lang-11.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-11 => jdk/jdk-java-lang/jdk-java-lang-11.0}/src/test/java/foo/bar/TestStringJDK11Suite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-15 => jdk/jdk-java-lang/jdk-java-lang-15.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-15 => jdk/jdk-java-lang/jdk-java-lang-15.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-15 => jdk/jdk-java-lang/jdk-java-lang-15.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-15 => jdk/jdk-java-lang/jdk-java-lang-15.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-15 => jdk/jdk-java-lang/jdk-java-lang-15.0}/src/test/java/foo/bar/TestStringJDK15Suite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-17 => jdk/jdk-java-lang/jdk-java-lang-17.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-17 => jdk/jdk-java-lang/jdk-java-lang-17.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-17 => jdk/jdk-java-lang/jdk-java-lang-17.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-17 => jdk/jdk-java-lang/jdk-java-lang-17.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-17 => jdk/jdk-java-lang/jdk-java-lang-17.0}/src/test/java/foo/bar/TestStringJDK17Suite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/test/java/foo/bar/TestLookup9Suite.java (100%) rename dd-java-agent/instrumentation/{java-lang/java-lang-9 => jdk/jdk-java-lang/jdk-java-lang-9.0}/src/test/java/foo/bar/TestStringConcatFactorySuite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/java/foo/bar/TestURICallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/java/foo/bar/TestURLCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{java-net => jdk/jdk-java-net/jdk-java-net-1.8}/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-net/jdk-java-net-11.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-net/jdk-java-net-11.0}/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-http-client => jdk/jdk-java-nio-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java (100%) rename dd-java-agent/instrumentation/{java-directbytebuffer => jdk/jdk-java-nio-1.8}/src/test/groovy/DirectAllocationTrackingTest.groovy (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/src/test/groovy/test/WeakCipherTest.groovy (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/src/test/groovy/test/WeakHashTest.groovy (100%) rename dd-java-agent/instrumentation/{java-security => jdk/jdk-java-security-1.8}/src/test/java/foo/bar/TestSuite.java (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/test/java/foo/bar/TestRandomSuite.java (100%) rename dd-java-agent/instrumentation/{java-util => jdk/jdk-java-util-1.8}/src/test/java/foo/bar/TestThreadLocalRandomSuite.java (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index debd9cef7c5..0d3a61f9e8e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -117,7 +117,7 @@ /dd-java-agent/agent-profiling/ @DataDog/profiling-java /dd-java-agent/agent-crashtracking/ @DataDog/profiling-java /dd-java-agent/instrumentation/exception-profiling/ @DataDog/profiling-java -/dd-java-agent/instrumentation/java-directbytebuffer/ @DataDog/profiling-java +/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-trace-api/src/main/java/datadog/trace/api/profiling @DataDog/profiling-java diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 7cf43c6ec2d..6a27564eb95 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -68,7 +68,7 @@ dependencies { jmh project(':dd-trace-core') jmh project(':dd-java-agent:agent-builder') jmh project(':dd-java-agent:instrumentation:iast-instrumenter') - jmh project(':dd-java-agent:instrumentation:java-lang') + jmh project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') compileOnly('org.jetbrains:annotations:24.0.0') errorprone('com.uber.nullaway:nullaway:0.10.15') diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index a387c17d067..8294fba4c8d 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -41,8 +41,8 @@ dependencies { iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')) - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang')) - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net')) + iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8')) + iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') v41IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.1' diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 84cc7db1424..8df88675447 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -83,8 +83,7 @@ subprojects { Project subProj -> compileOnly libs.autoservice.annotation // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation - testImplementation project(':dd-java-agent:instrumentation:java-concurrent') - testImplementation project(':dd-java-agent:instrumentation:java-concurrent:java-completablefuture') + testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') // FIXME: we should enable this, but currently this fails tests for google http client //testImplementation project(':dd-java-agent:instrumentation:http-url-connection') testImplementation project(':dd-java-agent:instrumentation:classloading') diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle b/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle deleted file mode 100644 index 3095b5712cf..00000000000 --- a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ - -muzzle { - pass { - coreJdk() - } -} - -ext { - skipSettingCompilerRelease = true -} -apply from: "${rootDir}/gradle/java.gradle" - -compileJava { - javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(8) - } -} - -dependencies { - testImplementation project(':dd-java-agent:instrumentation:trace-annotation') -} diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/gradle.lockfile deleted file mode 100644 index 668de5d586f..00000000000 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/gradle.lockfile +++ /dev/null @@ -1,162 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.78=testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.6=codenarc,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs -com.github.spotbugs:spotbugs:4.7.3=spotbugs -com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath -com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.9.1=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.thoughtworks.qdox:qdox:1.12.1=codenarc,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs -commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath -de.thetaphi:forbiddenapis:3.8=compileClasspath -info.picocli:picocli:4.6.3=testRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -io.sqreen:libsqreen:16.0.0=testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath -jaxen:jaxen:1.2.0=spotbugs -jline:jline:2.14.6=testRuntimeClasspath -junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath -junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:11.4=spotbugs -org.apache.ant:ant-antlr:1.10.14=codenarc -org.apache.ant:ant-antlr:1.10.15=testRuntimeClasspath -org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.ant:ant-junit:1.10.15=testRuntimeClasspath -org.apache.ant:ant-launcher:1.10.15=testRuntimeClasspath -org.apache.ant:ant:1.10.15=testCompileClasspath,testRuntimeClasspath -org.apache.bcel:bcel:6.5.0=spotbugs -org.apache.commons:commons-lang3:3.12.0=spotbugs -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor -org.codehaus.groovy:groovy-all:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-ant:3.0.23=codenarc -org.codehaus.groovy:groovy-ant:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-astbuilder:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-cli-picocli:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-console:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-datetime:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc -org.codehaus.groovy:groovy-docgenerator:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-groovysh:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jmx:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jsr223:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-macro:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-nio:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-servlet:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-sql:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-swing:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-templates:3.0.23=codenarc -org.codehaus.groovy:groovy-templates:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test-junit5:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-testng:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-xml:3.0.23=codenarc -org.codehaus.groovy:groovy-xml:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codenarc:CodeNarc:3.6.0=codenarc -org.dom4j:dom4j:2.1.3=spotbugs -org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath -org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.12.2=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.12.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.12.2=testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.12.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.12.2=testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.12.2=testRuntimeClasspath -org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=spotbugs -org.mockito:mockito-core:4.4.0=testRuntimeClasspath -org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-commons:9.8=testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-tree:9.4=spotbugs -org.ow2.asm:asm-tree:9.8=testRuntimeClasspath -org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm:9.4=spotbugs -org.ow2.asm:asm:9.8=testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-junit4:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.testng:testng:7.5.1=testRuntimeClasspath -org.webjars:jquery:3.5.1=testRuntimeClasspath -org.xmlresolver:xmlresolver:4.4.3=spotbugs -xml-apis:xml-apis:1.4.01=spotbugs -empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile b/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile deleted file mode 100644 index fe3ebbe8a30..00000000000 --- a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/gradle.lockfile +++ /dev/null @@ -1,165 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.javaparser:javaparser-core:3.25.6=codenarc,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs -com.github.spotbugs:spotbugs:4.7.3=spotbugs -com.github.stefanbirkner:system-rules:1.19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.9.1=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.thoughtworks.qdox:qdox:1.12.1=codenarc,latestDepTestRuntimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs -commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -de.thetaphi:forbiddenapis:3.8=compileClasspath -info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:16.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -jaxen:jaxen:1.2.0=spotbugs -jline:jline:2.14.6=latestDepTestRuntimeClasspath,testRuntimeClasspath -junit:junit-dep:4.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -net.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:11.4=spotbugs -org.apache.ant:ant-antlr:1.10.14=codenarc -org.apache.ant:ant-antlr:1.10.15=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.ant:ant-junit:1.10.15=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.apache.ant:ant-launcher:1.10.15=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.apache.ant:ant:1.10.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.bcel:bcel:6.5.0=spotbugs -org.apache.commons:commons-lang3:3.12.0=spotbugs -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apache.tomcat.embed:tomcat-embed-core:10.0.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:7.0.0=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:10.0.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -org.codehaus.groovy:groovy-all:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-ant:3.0.23=codenarc -org.codehaus.groovy:groovy-ant:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-astbuilder:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-cli-picocli:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-console:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-datetime:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc -org.codehaus.groovy:groovy-docgenerator:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc -org.codehaus.groovy:groovy-groovydoc:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-groovysh:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jmx:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-json:3.0.23=codenarc -org.codehaus.groovy:groovy-json:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-jsr223:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-macro:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-nio:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-servlet:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-sql:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-swing:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-templates:3.0.23=codenarc -org.codehaus.groovy:groovy-templates:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test-junit5:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-test:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-testng:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy-xml:3.0.23=codenarc -org.codehaus.groovy:groovy-xml:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy:3.0.23=codenarc -org.codehaus.groovy:groovy:3.0.24=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codenarc:CodeNarc:3.6.0=codenarc -org.dom4j:dom4j:2.1.3=spotbugs -org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.12.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.12.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.12.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.12.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.12.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=spotbugs -org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-commons:9.8=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm-tree:9.4=spotbugs -org.ow2.asm:asm-tree:9.8=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath -org.ow2.asm:asm:9.4=spotbugs -org.ow2.asm:asm:9.8=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-M6-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-junit4:2.4-M6-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:4.4.3=spotbugs -xml-apis:xml-apis:1.4.01=spotbugs -empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/java-concurrent/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/build.gradle diff --git a/dd-java-agent/instrumentation/java-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/build.gradle similarity index 78% rename from dd-java-agent/instrumentation/java-concurrent/lambda-testing/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/build.gradle index 64c8ae7167b..7a93b11113d 100644 --- a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/build.gradle +++ b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/build.gradle @@ -1,4 +1,8 @@ -// This is a separate project to allow for testing against various JDKs with existing tooling. +muzzle { + pass { + coreJdk() + } +} apply from: "${rootDir}/gradle/java.gradle" @@ -7,8 +11,12 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { testImplementation project(':dd-java-agent:instrumentation:trace-annotation') + + testImplementation libs.guava + testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.9.Final' testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.0' // Tomcat 10.1.+ seems to require Java 11. Limit to fix build. // TODO: Tomcat 10.0.10 has a copy of the JSR166 ThreadPoolExecutor so it needs special instrumentation latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '10.0.8' } + diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/java/util/concurrent/CompletableFutureAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/main/java/java/util/concurrent/CompletableFutureAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFutureTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/CompletableFutureTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/CrossedContextTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/groovy/ExecutorLambdaTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/groovy/ExecutorLambdaTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/QueueTimingForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/TaskUnwrappingForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/TestFanout.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TestFanout.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/groovy/TestFanout.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TestFanout.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ContextLeakTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ContextLeakTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ExecutorInstrumentationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RejectedExecutionTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/RejectedExecutionTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ToBeIgnoredExecutor.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/executor/ToBeIgnoredExecutor.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/runnable/FutureTaskContinuationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/runnable/FutureTaskContinuationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/runnable/ModuleInjectionTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/runnable/ModuleInjectionTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/groovy/timer/TimerTaskContinuationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/groovy/timer/TimerTaskContinuationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/java/Fanout.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/Fanout.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/src/test/java/Fanout.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/Fanout.java diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/java/JavaAsyncChild.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/java/LambdaGenerator.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/LambdaGenerator.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/lambda-testing/src/test/java/LambdaGenerator.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/LambdaGenerator.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/CustomThreadPoolExecutor.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/CustomThreadPoolExecutor.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/TypeAwareThreadPoolExecutor.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/TypeAwareThreadPoolExecutor.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/LinearTask.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/PeriodicTask.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/forkjoin/PeriodicTask.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/CheckpointTask.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/CheckpointTask.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/ComparableAsyncChild.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/ComparableAsyncChild.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/Descendant.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/Descendant.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/Descendant.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/JavaAsyncChild.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/JavaAsyncChild.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/SettableFuture.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/SettableFuture.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/src/test/java/runnable/SettableFuture.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/SettableFuture.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/previewTest/groovy/StructuredConcurrencyTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/previewTest/groovy/StructuredConcurrencyTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/test/groovy/VirtualThreadTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/test/groovy/VirtualThreadTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/java/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/src/test/java/JavaAsyncChild.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/java/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-concurrent/java-completablefuture/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java similarity index 95% rename from dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java index f39f3ba245c..7ecbd948926 100644 --- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent-25/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java +++ b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java @@ -16,7 +16,7 @@ // WARNING: // This instrumentation is tested using smoke tests as instrumented tests cannot run using Java 25. // Instrumented tests rely on Spock / Groovy which cannot run using Java 25 due to byte-code -// compatibility. Check dd-java-agent/instrumentation/java-concurrent/java-concurrent-25 for this +// compatibility. Check dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-ava-concurrent-25.0 for this // instrumentation test suite. /** diff --git a/dd-java-agent/instrumentation/java-io/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-io/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-io/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-io/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestByteBufferSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestByteBufferSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomInputStreamReader.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomInputStreamReader.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomObjectInputStream.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomObjectInputStream.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestCustomStringReader.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileInputStreamSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileInputStreamSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileOutputStreamSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileOutputStreamSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestFileSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamReaderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamReaderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestInputStreamSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestObjectInputStreamSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestObjectInputStreamSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPathSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPathSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPathsSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPathsSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPrintWriterSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestPrintWriterSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java diff --git a/dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestStringReaderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-io/src/test/java/foo/bar/TestStringReaderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-lang/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-lang/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-lang/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestClassLoaderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestClassLoaderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestClassSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestClassSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestLookupSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestLookupSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestMathSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestMathSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestProcessBuilderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestProcessBuilderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestRuntimeSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestRuntimeSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBufferSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringBuilderSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/src/test/java/foo/bar/TestStringSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-11/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-11/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-11/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-11/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-11/src/test/java/foo/bar/TestStringJDK11Suite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-11/src/test/java/foo/bar/TestStringJDK11Suite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-15/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-15/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-15/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-15/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-15/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-15/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-15/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-15/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-15/src/test/java/foo/bar/TestStringJDK15Suite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-15/src/test/java/foo/bar/TestStringJDK15Suite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-17/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-17/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-17/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-17/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-17/src/test/java/foo/bar/TestStringJDK17Suite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-17/src/test/java/foo/bar/TestStringJDK17Suite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/java/foo/bar/TestLookup9Suite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/java/foo/bar/TestLookup9Suite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java diff --git a/dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/java/foo/bar/TestStringConcatFactorySuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-lang/java-lang-9/src/test/java/foo/bar/TestStringConcatFactorySuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java diff --git a/dd-java-agent/instrumentation/java-net/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-net/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-net/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-net/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java diff --git a/dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURICallSiteSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURICallSiteSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java diff --git a/dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLCallSiteSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLCallSiteSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-net/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/java-http-client/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/build.gradle diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java diff --git a/dd-java-agent/instrumentation/java-http-client/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy diff --git a/dd-java-agent/instrumentation/java-http-client/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-http-client/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-http-client/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java diff --git a/dd-java-agent/instrumentation/java-directbytebuffer/src/test/groovy/DirectAllocationTrackingTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-directbytebuffer/src/test/groovy/DirectAllocationTrackingTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy diff --git a/dd-java-agent/instrumentation/java-security/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-security/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-security/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-security/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-security/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-security/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java diff --git a/dd-java-agent/instrumentation/java-security/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-security/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java diff --git a/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakCipherTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy diff --git a/dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakHashTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakHashTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-security/src/test/groovy/test/WeakHashTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakHashTest.groovy diff --git a/dd-java-agent/instrumentation/java-security/src/test/java/foo/bar/TestSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/java/foo/bar/TestSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-security/src/test/java/foo/bar/TestSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/java/foo/bar/TestSuite.java diff --git a/dd-java-agent/instrumentation/java-util/build.gradle b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/java-util/build.gradle rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/java-util/gradle.lockfile b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/java-util/gradle.lockfile rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/java-util/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java diff --git a/dd-java-agent/instrumentation/java-util/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java diff --git a/dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/java-util/src/test/java/foo/bar/TestRandomSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/test/java/foo/bar/TestRandomSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java diff --git a/dd-java-agent/instrumentation/java-util/src/test/java/foo/bar/TestThreadLocalRandomSuite.java b/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java similarity index 100% rename from dd-java-agent/instrumentation/java-util/src/test/java/foo/bar/TestThreadLocalRandomSuite.java rename to dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index d8bd22faa4c..2837823bae8 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -41,8 +41,8 @@ dependencies { // IAST testing dependencies testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:java-lang') - testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') + testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8') testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.4') @@ -58,8 +58,8 @@ dependencies { iastLatestDepTest3Implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+' iastLatestDepTest3Implementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+' iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java-lang') - iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java-io') + iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') + iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12') iastLatestDepTest3Implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.4') diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index 2eaeb7f74ed..1e053720b11 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -15,8 +15,8 @@ dependencies { testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:java-lang') - testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') + testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8') testImplementation libs.jackson.databind diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle index 678b0fd9caa..b91a654cfbf 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle @@ -39,7 +39,7 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) { } dependencies { - api project(':dd-java-agent:instrumentation:java-concurrent') + api project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') compileOnly libs.kotlin compileOnly libs.coroutines diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle index c21ff0254ac..5a5c177405b 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle @@ -31,16 +31,16 @@ dependencies { testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude module: 'okhttp' } - testImplementation(project(':dd-java-agent:instrumentation:java-concurrent')) { + testImplementation(project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')) { exclude module: 'okhttp' } - testImplementation(project(':dd-java-agent:instrumentation:java-concurrent:java-completablefuture')) { + testImplementation(project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')) { exclude module: 'okhttp' } testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0' testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) - testRuntimeOnly(project(':dd-java-agent:instrumentation:java-net')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)' } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle index faf845ae7d8..7622fd0bf5d 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle @@ -37,5 +37,5 @@ dependencies { latestDepTestImplementation group: 'com.squareup.okio', name: 'okio', version: '1.+' testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) - testRuntimeOnly(project(':dd-java-agent:instrumentation:java-net')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) } diff --git a/dd-java-agent/instrumentation/org-json/build.gradle b/dd-java-agent/instrumentation/org-json/build.gradle index ac7099b235e..6cb100ac6b2 100644 --- a/dd-java-agent/instrumentation/org-json/build.gradle +++ b/dd-java-agent/instrumentation/org-json/build.gradle @@ -31,7 +31,7 @@ dependencies { testImplementation group: 'org.json', name: 'json', version: '20230227' testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') //Needed for Reader + testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') //Needed for Reader latestDepTestImplementation group: 'org.json', name: 'json', version: '20250107' // TODO replace with + when APPSEC-58007 solved } diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index 9f979a71cd7..a102933cde4 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -46,5 +46,5 @@ dependencies { // Include other instruments that we rely on and that must not conflict with each other testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') - testImplementation project(':dd-java-agent:instrumentation:java-concurrent') + testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') } diff --git a/dd-java-agent/instrumentation/scala/build.gradle b/dd-java-agent/instrumentation/scala/build.gradle index 299f09eef6b..04c151da8f4 100644 --- a/dd-java-agent/instrumentation/scala/build.gradle +++ b/dd-java-agent/instrumentation/scala/build.gradle @@ -43,7 +43,7 @@ final testTasks = scalaVersions.collect { scalaLibrary -> handler.add(implementationConfiguration.name, scalaLibrary) handler.add(implementationConfiguration.name, libs.slf4j) if (javaConcatenation) { - handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:java-lang')) + handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8')) } } diff --git a/dd-java-agent/instrumentation/slick/build.gradle b/dd-java-agent/instrumentation/slick/build.gradle index a0ba86d95d2..cdcd158d409 100644 --- a/dd-java-agent/instrumentation/slick/build.gradle +++ b/dd-java-agent/instrumentation/slick/build.gradle @@ -25,8 +25,8 @@ dependencies { compileOnly libs.scala compileOnly group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0' - testImplementation project(':dd-java-agent:instrumentation:java-concurrent') - testImplementation project(':dd-java-agent:instrumentation:java-concurrent:java-completablefuture') + testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/settings.gradle.kts b/settings.gradle.kts index 40ea950f3c4..856a806546f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -363,22 +363,20 @@ include( ":dd-java-agent:instrumentation:jakarta-mail", ":dd-java-agent:instrumentation:jakarta-rs-annotations-3", ":dd-java-agent:instrumentation:jakarta-ws-annotations", - ":dd-java-agent:instrumentation:java-concurrent", - ":dd-java-agent:instrumentation:java-concurrent:java-completablefuture", - ":dd-java-agent:instrumentation:java-concurrent:java-concurrent-21", - ":dd-java-agent:instrumentation:java-concurrent:java-concurrent-25", - ":dd-java-agent:instrumentation:java-concurrent:lambda-testing", - ":dd-java-agent:instrumentation:java-directbytebuffer", - ":dd-java-agent:instrumentation:java-http-client", - ":dd-java-agent:instrumentation:java-io", - ":dd-java-agent:instrumentation:java-lang", - ":dd-java-agent:instrumentation:java-lang:java-lang-9", - ":dd-java-agent:instrumentation:java-lang:java-lang-11", - ":dd-java-agent:instrumentation:java-lang:java-lang-15", - ":dd-java-agent:instrumentation:java-lang:java-lang-17", - ":dd-java-agent:instrumentation:java-net", - ":dd-java-agent:instrumentation:java-security", - ":dd-java-agent:instrumentation:java-util", + ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-21.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-25.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-nio-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-io-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-9.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-11.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-15.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-17.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-11.0", + ":dd-java-agent:instrumentation:jdk:jdk-java-security-1.8", + ":dd-java-agent:instrumentation:jdk:jdk-java-util-1.8", ":dd-java-agent:instrumentation:javax-naming", ":dd-java-agent:instrumentation:javax-xml", ":dd-java-agent:instrumentation:javax-mail", From e7ad137c991656d4934175187039549269180bbc Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Fri, 3 Oct 2025 09:52:45 +0200 Subject: [PATCH 2/3] spotless --- .../StructuredTaskScope25Instrumentation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java index 7ecbd948926..4ce18ca4da0 100644 --- a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java +++ b/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java @@ -16,7 +16,8 @@ // WARNING: // This instrumentation is tested using smoke tests as instrumented tests cannot run using Java 25. // Instrumented tests rely on Spock / Groovy which cannot run using Java 25 due to byte-code -// compatibility. Check dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-ava-concurrent-25.0 for this +// compatibility. Check +// dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-ava-concurrent-25.0 for this // instrumentation test suite. /** From eaacced1104cc4100630b2124cc28735819fab76 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Mon, 6 Oct 2025 09:34:34 +0200 Subject: [PATCH 3/3] rename to java --- .github/CODEOWNERS | 2 +- dd-java-agent/agent-iast/build.gradle | 2 +- .../apache-httpclient-4.0/build.gradle | 4 +-- dd-java-agent/instrumentation/build.gradle | 2 +- .../java-concurrent}/build.gradle | 0 .../java-concurrent}/gradle.lockfile | 0 .../java-concurrent-1.8}/build.gradle | 0 .../AsyncTaskInstrumentation.java | 0 ...bleFutureUniCompletionInstrumentation.java | 0 ...eUniCompletionSubclassInstrumentation.java | 0 ...syncPropagatingDisableInstrumentation.java | 0 .../ConcurrentInstrumentationNames.java | 0 .../TaskUnwrappingInstrumentation.java | 0 .../WrapRunnableAsNewTaskInstrumentation.java | 0 .../AbstractExecutorInstrumentation.java | 0 .../executor/JavaExecutorInstrumentation.java | 0 .../NonStandardExecutorInstrumentation.java | 0 ...jectedExecutionHandlerInstrumentation.java | 0 .../ThreadPoolExecutorInstrumentation.java | 0 .../JavaForkJoinPoolInstrumentation.java | 0 .../JavaForkJoinTaskInstrumentation.java | 0 .../JavaForkJoinWorkQueueInstrumentation.java | 0 .../runnable/ConsumerTaskInstrumentation.java | 0 .../RunnableFutureInstrumentation.java | 0 .../runnable/RunnableInstrumentation.java | 0 .../timer/JavaTimerInstrumentation.java | 0 .../timer/TimerTaskInstrumentation.java | 0 .../concurrent/CompletableFutureAdvice.java | 0 ...etableFuturePromiseForkJoinPoolTest.groovy | 0 ...CompletableFuturePromiseNoAsyncTest.groovy | 0 .../CompletableFuturePromiseTest.groovy | 0 ...pletableFuturePromiseThreadPoolTest.groovy | 0 .../test/groovy/CompletableFutureTest.groovy | 0 .../src/test/groovy/CrossedContextTest.groovy | 0 .../src/test/groovy/ExecutorLambdaTest.groovy | 0 .../test/groovy/QueueTimingForkedTest.groovy | 0 .../groovy/TaskUnwrappingForkedTest.groovy | 0 .../src/test/groovy/TestFanout.groovy | 0 .../groovy/executor/ContextLeakTest.groovy | 0 .../ExecutorInstrumentationTest.groovy | 0 .../NettyExecutorInstrumentationTest.groovy | 0 .../RecursiveThreadPoolPropagationTest.groovy | 0 .../executor/RejectedExecutionTest.groovy | 0 .../groovy/executor/ToBeIgnoredExecutor.java | 0 .../ForkJoinPoolPropagationTest.groovy | 0 .../FutureTaskContinuationTest.groovy | 0 .../runnable/ModuleInjectionTest.groovy | 0 .../timer/TimerTaskContinuationTest.groovy | 0 .../src/test/java/Fanout.java | 0 .../src/test/java/JavaAsyncChild.java | 0 .../src/test/java/LambdaGenerator.java | 0 .../executor/CustomThreadPoolExecutor.java | 0 .../executor/TypeAwareThreadPoolExecutor.java | 0 .../RecursiveThreadPoolExecution.java | 0 ...ThreadPoolMixedSubmissionAndExecution.java | 0 .../RecursiveThreadPoolSubmission.java | 0 .../ExecutingRejectedExecutionHandler.java | 0 .../SwallowingRejectedExecutionHandler.java | 0 .../src/test/java/forkjoin/LinearTask.java | 0 .../src/test/java/forkjoin/PeriodicTask.java | 0 .../test/java/runnable/CheckpointTask.java | 0 .../java/runnable/ComparableAsyncChild.java | 0 .../src/test/java/runnable/Descendant.java | 0 .../test/java/runnable/JavaAsyncChild.java | 0 .../test/java/runnable/SettableFuture.java | 0 .../java-concurrent-21.0}/build.gradle | 0 .../java-concurrent-21.0}/gradle.lockfile | 0 .../StructuredTaskScope21Instrumentation.java | 0 .../TaskRunnerInstrumentation.java | 0 .../groovy/StructuredConcurrencyTest.groovy | 0 .../src/test/groovy/VirtualThreadTest.groovy | 0 .../src/test/java/JavaAsyncChild.java | 0 .../java-concurrent-25.0}/build.gradle | 0 .../java-concurrent-25.0}/gradle.lockfile | 0 .../StructuredTaskScope25Instrumentation.java | 2 +- .../java-io-1.8}/build.gradle | 0 .../java-io-1.8}/gradle.lockfile | 0 .../java/lang/ByteBufferCallSite.java | 0 .../java/lang/FileCallSite.java | 0 .../java/lang/FileInputStreamCallSite.java | 0 .../java/lang/FileLoadedRaspHelper.java | 0 .../java/lang/FileOutputStreamCallSite.java | 0 .../java/lang/InputStreamInstrumentation.java | 0 .../java/lang/InputStreamReaderCallSite.java | 0 .../java/lang/ObjectInputStreamCallSite.java | 0 .../java/lang/PathCallSite.java | 0 .../java/lang/PathsCallSite.java | 0 .../java/lang/PrintWriterCallSite.java | 0 .../java/lang/StringReaderCallSite.java | 0 .../java/io/BaseIoCallSiteTest.groovy | 0 .../java/io/BaseIoRaspCallSiteTest.groovy | 0 .../java/io/ByteBufferTest.groovy | 0 .../java/io/FileCallSiteTest.groovy | 0 .../io/FileInputStreamCallSiteTest.groovy | 0 .../io/FileLoadedRaspHelperForkedTest.groovy | 0 .../io/FileOutputStreamCallSiteTest.groovy | 0 .../io/InputStreamInstrumentationTest.groovy | 0 .../io/InputStreamReaderCallSiteTest.groovy | 0 .../io/ObjectInputStreamCallSiteTest.groovy | 0 .../java/io/PathCallSiteTest.groovy | 0 .../java/io/PathsCallSiteTest.groovy | 0 .../java/io/PrintWriterCallSiteTest.groovy | 0 .../java/io/StringReaderCallSiteTest.groovy | 0 .../java/foo/bar/TestByteBufferSuite.java | 0 .../foo/bar/TestCustomInputStreamReader.java | 0 .../foo/bar/TestCustomObjectInputStream.java | 0 .../java/foo/bar/TestCustomStringReader.java | 0 .../foo/bar/TestFileInputStreamSuite.java | 0 .../foo/bar/TestFileOutputStreamSuite.java | 0 .../src/test/java/foo/bar/TestFileSuite.java | 0 .../foo/bar/TestInputStreamReaderSuite.java | 0 .../java/foo/bar/TestInputStreamSuite.java | 0 .../foo/bar/TestObjectInputStreamSuite.java | 0 .../src/test/java/foo/bar/TestPathSuite.java | 0 .../src/test/java/foo/bar/TestPathsSuite.java | 0 .../java/foo/bar/TestPrintWriterSuite.java | 0 .../java/foo/bar/TestStringReaderSuite.java | 0 .../java-lang/java-lang-1.8}/build.gradle | 0 .../java-lang/java-lang-1.8}/gradle.lockfile | 0 .../java/lang/ClassCallSite.java | 0 .../java/lang/ClassLoaderCallSite.java | 0 .../java/lang/LookupCallSite.java | 0 .../java/lang/MathCallSite.java | 0 .../java/lang/ProcessBuilderCallSite.java | 0 .../java/lang/ProcessImplInstrumentation.java | 0 .../java/lang/ProcessImplStartAdvice.java | 0 .../java/lang/RuntimeCallSite.java | 0 .../java/lang/RuntimeExecStringAdvice.java | 0 .../java/lang/RuntimeInstrumentation.java | 0 .../java/lang/StringBuilderCallSite.java | 0 .../java/lang/StringCallSite.java | 0 .../java/lang/StringExperimentalCallSite.java | 0 .../lang/StringFullDetectionCallSite.java | 0 .../CustomMBeanBuilderInstrumentation.java | 0 .../java/lang/ClassCallSiteTest.groovy | 0 .../java/lang/ClassLoaderCallSiteTest.groovy | 0 .../java/lang/LookupCallSiteTest.groovy | 0 .../java/lang/MathCallSiteTest.groovy | 0 .../lang/ProcessBuilderCallSiteTest.groovy | 0 ...nstrumentationExecCmdRaspForkedTest.groovy | 0 ...essImplInstrumentationSpecification.groovy | 0 .../java/lang/RuntimeCallSiteTest.groovy | 0 .../RuntimeInstrumentationForkedTest.groovy | 0 .../lang/StringBuilderCallSiteTest.groovy | 0 .../java/lang/StringCallSiteTest.groovy | 0 .../StringExperimentalCallSiteTest.groovy | 0 ...ringFullDetectionCallSiteForkedTest.groovy | 0 .../bar/TestAbstractStringBuilderSuite.java | 0 .../java/foo/bar/TestClassLoaderSuite.java | 0 .../src/test/java/foo/bar/TestClassSuite.java | 0 .../test/java/foo/bar/TestLookupSuite.java | 0 .../src/test/java/foo/bar/TestMathSuite.java | 0 .../java/foo/bar/TestProcessBuilderSuite.java | 0 .../test/java/foo/bar/TestRuntimeSuite.java | 0 .../java/foo/bar/TestStringBufferSuite.java | 0 .../java/foo/bar/TestStringBuilderSuite.java | 0 .../test/java/foo/bar/TestStringSuite.java | 0 .../java-lang/java-lang-11.0}/build.gradle | 0 .../java-lang/java-lang-11.0}/gradle.lockfile | 0 .../java/lang/jdk11/StringCallSite.java | 0 .../java/lang/jdk11/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK11Suite.java | 0 .../java-lang/java-lang-15.0}/build.gradle | 0 .../java-lang/java-lang-15.0}/gradle.lockfile | 0 .../java/lang/jdk15/StringCallSite.java | 0 .../java/lang/jdk15/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK15Suite.java | 0 .../java-lang/java-lang-17.0}/build.gradle | 0 .../java-lang/java-lang-17.0}/gradle.lockfile | 0 .../java/lang/jdk17/StringCallSite.java | 0 .../java/lang/jdk17/StringCallSiteTest.groovy | 0 .../java/foo/bar/TestStringJDK17Suite.java | 0 .../java-lang/java-lang-9.0}/build.gradle | 0 .../java-lang/java-lang-9.0}/gradle.lockfile | 0 .../java/lang/invoke/Lookup9CallSite.java | 0 .../invoke/StringConcatFactoryCallSite.java | 0 .../lang/invoke/Lookup9CallSiteTest.groovy | 0 .../StringConcatFactoryCallSiteTest.groovy | 0 .../test/java/foo/bar/TestLookup9Suite.java | 0 .../foo/bar/TestStringConcatFactorySuite.java | 0 .../java-net/java-net-1.8}/build.gradle | 0 .../java-net/java-net-1.8}/gradle.lockfile | 0 .../instrumentation/java/net/URICallSite.java | 0 .../instrumentation/java/net/URLCallSite.java | 0 .../java/net/URLDecoderCallSite.java | 0 .../java/net/URLEncoderCallSite.java | 0 .../java/net/URLSinkCallSite.java | 0 .../java/net/URICallSIteTest.groovy | 0 .../java/net/URLCallSiteTest.groovy | 0 .../java/net/URLDecoderCallSiteTest.groovy | 0 .../java/net/URLEncoderCallSiteTest.groovy | 0 .../java/net/URLSinkCallSiteTest.groovy | 0 .../java/foo/bar/TestURICallSiteSuite.java | 0 .../java/foo/bar/TestURLCallSiteSuite.java | 0 .../foo/bar/TestURLDecoderCallSiteSuite.java | 0 .../foo/bar/TestURLEncoderCallSiteSuite.java | 0 .../java-net/java-net-11.0}/build.gradle | 0 .../java-net/java-net-11.0}/gradle.lockfile | 0 .../httpclient/HttpClientInstrumentation.java | 0 .../HttpHeadersInstrumentation.java | 0 .../httpclient/BodyHandlerWrapper.java | 0 .../httpclient/CompletableFutureWrapper.java | 0 .../httpclient/HeadersAdvice.java | 0 .../httpclient/HttpHeadersInjectAdapter.java | 0 .../httpclient/JavaNetClientDecorator.java | 0 .../httpclient/ResponseConsumer.java | 0 .../httpclient/SendAdvice.java | 0 .../httpclient/SendAsyncAdvice.java | 0 .../httpclient/JavaHttpClientAsyncTest.groovy | 0 .../httpclient/JavaHttpClientTest.groovy | 0 .../java-nio-1.8}/build.gradle | 0 .../java-nio-1.8}/gradle.lockfile | 0 .../ByteBufferInstrumentation.java | 0 .../DirectByteBufferInstrumentation.java | 0 .../FileChannelImplInstrumentation.java | 0 .../AllocateDirectAdvice.java | 0 .../directbytebuffer/MemoryMappingAdvice.java | 0 .../NewDirectByteBufferAdvice.java | 0 .../DirectAllocationTrackingTest.groovy | 0 .../java-security-1.8}/build.gradle | 0 .../java-security-1.8}/gradle.lockfile | 0 .../WeakCipherInstrumentationCallSite.java | 0 .../WeakHashInstrumentationCallSite.java | 0 .../test/groovy/test/WeakCipherTest.groovy | 0 .../src/test/groovy/test/WeakHashTest.groovy | 0 .../src/test/java/foo/bar/TestSuite.java | 0 .../java-util-1.8}/build.gradle | 0 .../java-util-1.8}/gradle.lockfile | 0 .../java/util/RandomCallSite.java | 0 .../concurrent/ThreadLocalRandomCallSite.java | 0 .../java/util/RandomCallSiteTest.groovy | 0 .../ThreadLocalRandomCallSiteTest.groovy | 0 .../test/java/foo/bar/TestRandomSuite.java | 0 .../foo/bar/TestThreadLocalRandomSuite.java | 0 .../kafka/kafka-clients-0.11/build.gradle | 8 +++--- .../kafka/kafka-connect-0.11/build.gradle | 4 +-- .../kotlin-coroutines/build.gradle | 2 +- .../okhttp/okhttp-2.2/build.gradle | 6 ++-- .../okhttp/okhttp-3.0/build.gradle | 2 +- .../instrumentation/org-json/build.gradle | 2 +- .../resilience4j-reactor-2.0/build.gradle | 2 +- .../instrumentation/scala/build.gradle | 2 +- .../instrumentation/slick/build.gradle | 4 +-- settings.gradle.kts | 28 +++++++++---------- 244 files changed, 36 insertions(+), 36 deletions(-) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent => java/java-concurrent}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent => java/java-concurrent}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/main/java/java/util/concurrent/CompletableFutureAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CompletableFutureTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/CrossedContextTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/ExecutorLambdaTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/QueueTimingForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/TaskUnwrappingForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/TestFanout.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/ContextLeakTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/ExecutorInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/RejectedExecutionTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/executor/ToBeIgnoredExecutor.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/runnable/FutureTaskContinuationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/runnable/ModuleInjectionTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/groovy/timer/TimerTaskContinuationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/Fanout.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/LambdaGenerator.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/CustomThreadPoolExecutor.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/TypeAwareThreadPoolExecutor.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/forkjoin/LinearTask.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/forkjoin/PeriodicTask.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/runnable/CheckpointTask.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/runnable/ComparableAsyncChild.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/runnable/Descendant.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/runnable/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-1.8 => java/java-concurrent/java-concurrent-1.8}/src/test/java/runnable/SettableFuture.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/src/previewTest/groovy/StructuredConcurrencyTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/src/test/groovy/VirtualThreadTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-21.0 => java/java-concurrent/java-concurrent-21.0}/src/test/java/JavaAsyncChild.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-25.0 => java/java-concurrent/java-concurrent-25.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-25.0 => java/java-concurrent/java-concurrent-25.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-concurrent/jdk-java-concurrent-25.0 => java/java-concurrent/java-concurrent-25.0}/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java (96%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestByteBufferSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestCustomInputStreamReader.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestCustomObjectInputStream.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestCustomStringReader.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestFileInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestFileOutputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestFileSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestInputStreamReaderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestObjectInputStreamSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestPathSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestPathsSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestPrintWriterSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-io-1.8 => java/java-io-1.8}/src/test/java/foo/bar/TestStringReaderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestClassLoaderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestClassSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestLookupSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestMathSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestProcessBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestRuntimeSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestStringBufferSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestStringBuilderSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-1.8 => java/java-lang/java-lang-1.8}/src/test/java/foo/bar/TestStringSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-11.0 => java/java-lang/java-lang-11.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-11.0 => java/java-lang/java-lang-11.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-11.0 => java/java-lang/java-lang-11.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-11.0 => java/java-lang/java-lang-11.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-11.0 => java/java-lang/java-lang-11.0}/src/test/java/foo/bar/TestStringJDK11Suite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-15.0 => java/java-lang/java-lang-15.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-15.0 => java/java-lang/java-lang-15.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-15.0 => java/java-lang/java-lang-15.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-15.0 => java/java-lang/java-lang-15.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-15.0 => java/java-lang/java-lang-15.0}/src/test/java/foo/bar/TestStringJDK15Suite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-17.0 => java/java-lang/java-lang-17.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-17.0 => java/java-lang/java-lang-17.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-17.0 => java/java-lang/java-lang-17.0}/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-17.0 => java/java-lang/java-lang-17.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-17.0 => java/java-lang/java-lang-17.0}/src/test/java/foo/bar/TestStringJDK17Suite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/test/java/foo/bar/TestLookup9Suite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-lang/jdk-java-lang-9.0 => java/java-lang/java-lang-9.0}/src/test/java/foo/bar/TestStringConcatFactorySuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/java/foo/bar/TestURICallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/java/foo/bar/TestURLCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-1.8 => java/java-net/java-net-1.8}/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-net/jdk-java-net-11.0 => java/java-net/java-net-11.0}/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-nio-1.8 => java/java-nio-1.8}/src/test/groovy/DirectAllocationTrackingTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/src/test/groovy/test/WeakCipherTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/src/test/groovy/test/WeakHashTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-security-1.8 => java/java-security-1.8}/src/test/java/foo/bar/TestSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/build.gradle (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/test/java/foo/bar/TestRandomSuite.java (100%) rename dd-java-agent/instrumentation/{jdk/jdk-java-util-1.8 => java/java-util-1.8}/src/test/java/foo/bar/TestThreadLocalRandomSuite.java (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0d3a61f9e8e..c786a9a9f95 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -117,7 +117,7 @@ /dd-java-agent/agent-profiling/ @DataDog/profiling-java /dd-java-agent/agent-crashtracking/ @DataDog/profiling-java /dd-java-agent/instrumentation/exception-profiling/ @DataDog/profiling-java -/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/ @DataDog/profiling-java +/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-trace-api/src/main/java/datadog/trace/api/profiling @DataDog/profiling-java diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 6a27564eb95..b46ffb331ed 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -68,7 +68,7 @@ dependencies { jmh project(':dd-trace-core') jmh project(':dd-java-agent:agent-builder') jmh project(':dd-java-agent:instrumentation:iast-instrumenter') - jmh project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') + jmh project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') compileOnly('org.jetbrains:annotations:24.0.0') errorprone('com.uber.nullaway:nullaway:0.10.15') diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index 8294fba4c8d..d10614b78a6 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -41,8 +41,8 @@ dependencies { iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')) - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8')) - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) + iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')) + iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')) iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') v41IastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.1' diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index 8df88675447..f9cba65eb2b 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -83,7 +83,7 @@ subprojects { Project subProj -> compileOnly libs.autoservice.annotation // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation - testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') // FIXME: we should enable this, but currently this fails tests for google http client //testImplementation project(':dd-java-agent:instrumentation:http-url-connection') testImplementation project(':dd-java-agent:instrumentation:classloading') diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/build.gradle rename to dd-java-agent/instrumentation/java/java-concurrent/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-concurrent/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/AsyncTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/completablefuture/CompletableFutureUniCompletionSubclassInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/AsyncPropagatingDisableInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/ConcurrentInstrumentationNames.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/TaskUnwrappingInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/WrapRunnableAsNewTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/AbstractExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/JavaExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/NonStandardExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/RejectedExecutionHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/forkjoin/JavaForkJoinWorkQueueInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/ConsumerTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/JavaTimerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/timer/TimerTaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/java/util/concurrent/CompletableFutureAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseForkJoinPoolTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseNoAsyncTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFuturePromiseThreadPoolTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CompletableFutureTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/CrossedContextTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/ExecutorLambdaTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/QueueTimingForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/TaskUnwrappingForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TestFanout.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/TestFanout.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/TestFanout.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/TestFanout.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ContextLeakTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ExecutorInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/RecursiveThreadPoolPropagationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/RejectedExecutionTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/ToBeIgnoredExecutor.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/forkjoin/ForkJoinPoolPropagationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/runnable/FutureTaskContinuationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/runnable/ModuleInjectionTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/Fanout.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/Fanout.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/Fanout.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/JavaAsyncChild.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/LambdaGenerator.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/LambdaGenerator.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/LambdaGenerator.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/CustomThreadPoolExecutor.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/TypeAwareThreadPoolExecutor.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/ExecutingRejectedExecutionHandler.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/rejectedexecutionhandler/SwallowingRejectedExecutionHandler.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/PeriodicTask.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/CheckpointTask.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/ComparableAsyncChild.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/Descendant.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/SettableFuture.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-1.8/src/test/java/runnable/SettableFuture.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/SettableFuture.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/build.gradle rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency21/StructuredTaskScope21Instrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/main/java/datadog/trace/instrumentation/java/concurrent/virtualthread/TaskRunnerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/previewTest/groovy/StructuredConcurrencyTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/groovy/VirtualThreadTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-21.0/src/test/java/JavaAsyncChild.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/src/test/java/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/build.gradle rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java rename to dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java index 4ce18ca4da0..af85ecc6a27 100644 --- a/dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/src/main/java/datadog/trace/instrumentation/java/concurrent/structuredconcurrency25/StructuredTaskScope25Instrumentation.java @@ -17,7 +17,7 @@ // This instrumentation is tested using smoke tests as instrumented tests cannot run using Java 25. // Instrumented tests rely on Spock / Groovy which cannot run using Java 25 due to byte-code // compatibility. Check -// dd-java-agent/instrumentation/jdk/jdk-java-concurrent/jdk-ava-concurrent-25.0 for this +// dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0 for this // instrumentation test suite. /** diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-io-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-io-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-io-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ByteBufferCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileInputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileLoadedRaspHelper.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/FileOutputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/InputStreamReaderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ObjectInputStreamCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PathsCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/PrintWriterCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringReaderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/BaseIoRaspCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ByteBufferTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileInputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileLoadedRaspHelperForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/FileOutputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/InputStreamReaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/ObjectInputStreamCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PathsCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/PrintWriterCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/groovy/datadog/trace/instrumentation/java/io/StringReaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestByteBufferSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomInputStreamReader.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomObjectInputStream.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestCustomStringReader.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileOutputStreamSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestFileSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestFileSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamReaderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestObjectInputStreamSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPathsSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestPrintWriterSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java b/dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java rename to dd-java-agent/instrumentation/java/java-io-1.8/src/test/java/foo/bar/TestStringReaderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ClassLoaderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/LookupCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/MathCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringBuilderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringExperimentalCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/management/CustomMBeanBuilderInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ClassLoaderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/LookupCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/MathCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessBuilderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationExecCmdRaspForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/ProcessImplInstrumentationSpecification.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/RuntimeInstrumentationForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringBuilderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringExperimentalCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/groovy/datadog/trace/instrumentation/java/lang/StringFullDetectionCallSiteForkedTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestAbstractStringBuilderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassLoaderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestClassSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestLookupSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestMathSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestProcessBuilderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestRuntimeSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBufferSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringBuilderSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/test/java/foo/bar/TestStringSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/build.gradle rename to dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk11/StringCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk11/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/src/test/java/foo/bar/TestStringJDK11Suite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/build.gradle rename to dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk15/StringCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk15/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/src/test/java/foo/bar/TestStringJDK15Suite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/build.gradle rename to dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/main/java/datadog/trace/instrumentation/java/lang/jdk17/StringCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/groovy/datadog/trace/instrumentation/java/lang/jdk17/StringCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/src/test/java/foo/bar/TestStringJDK17Suite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/build.gradle rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/main/java/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/Lookup9CallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestLookup9Suite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-lang/jdk-java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java rename to dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URICallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLDecoderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLEncoderCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/URLSinkCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URICallSIteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLDecoderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLSinkCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURICallSiteSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLDecoderCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java rename to dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/java/foo/bar/TestURLEncoderCallSiteSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/build.gradle rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpHeadersInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/HttpHeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/JavaNetClientDecorator.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/ResponseConsumer.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientAsyncTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-net/jdk-java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy rename to dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/groovy/datadog/trace/instrumentation/httpclient/JavaHttpClientTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-nio-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/ByteBufferInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/DirectByteBufferInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java/datadog/trace/instrumentation/directbytebuffer/FileChannelImplInstrumentation.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/AllocateDirectAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/MemoryMappingAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java b/dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/main/java11/datadog/trace/instrumentation/directbytebuffer/NewDirectByteBufferAdvice.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy b/dd-java-agent/instrumentation/java/java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy rename to dd-java-agent/instrumentation/java/java-nio-1.8/src/test/groovy/DirectAllocationTrackingTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-security-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-security-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-security-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java rename to dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakCipherInstrumentationCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java rename to dd-java-agent/instrumentation/java/java-security-1.8/src/main/java/datadog/trace/instrumentation/java/security/WeakHashInstrumentationCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy b/dd-java-agent/instrumentation/java/java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy rename to dd-java-agent/instrumentation/java/java-security-1.8/src/test/groovy/test/WeakCipherTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakHashTest.groovy b/dd-java-agent/instrumentation/java/java-security-1.8/src/test/groovy/test/WeakHashTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/groovy/test/WeakHashTest.groovy rename to dd-java-agent/instrumentation/java/java-security-1.8/src/test/groovy/test/WeakHashTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/java/foo/bar/TestSuite.java b/dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-security-1.8/src/test/java/foo/bar/TestSuite.java rename to dd-java-agent/instrumentation/java/java-security-1.8/src/test/java/foo/bar/TestSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-util-1.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/build.gradle rename to dd-java-agent/instrumentation/java/java-util-1.8/build.gradle diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/gradle.lockfile rename to dd-java-agent/instrumentation/java/java-util-1.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java rename to dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/RandomCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java rename to dd-java-agent/instrumentation/java/java-util-1.8/src/main/java/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/RandomCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy rename to dd-java-agent/instrumentation/java/java-util-1.8/src/test/groovy/datadog/trace/instrumentation/java/util/concurrent/ThreadLocalRandomCallSiteTest.groovy diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java rename to dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestRandomSuite.java diff --git a/dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java b/dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java similarity index 100% rename from dd-java-agent/instrumentation/jdk/jdk-java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java rename to dd-java-agent/instrumentation/java/java-util-1.8/src/test/java/foo/bar/TestThreadLocalRandomSuite.java diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index 2837823bae8..7d2e93d7d48 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -41,8 +41,8 @@ dependencies { // IAST testing dependencies testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') - testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8') testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.4') @@ -58,8 +58,8 @@ dependencies { iastLatestDepTest3Implementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+' iastLatestDepTest3Implementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+' iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') - iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') + iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') + iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12') iastLatestDepTest3Implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.4') diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index 1e053720b11..276f9e6c24d 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -15,8 +15,8 @@ dependencies { testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8') - testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8') + testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8') testImplementation libs.jackson.databind diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle index b91a654cfbf..1a8fbbb2e1f 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle +++ b/dd-java-agent/instrumentation/kotlin-coroutines/build.gradle @@ -39,7 +39,7 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) { } dependencies { - api project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') + api project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') compileOnly libs.kotlin compileOnly libs.coroutines diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle index 5a5c177405b..9ed60d87cc8 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle @@ -31,16 +31,16 @@ dependencies { testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude module: 'okhttp' } - testImplementation(project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')) { + testImplementation(project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')) { exclude module: 'okhttp' } - testImplementation(project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8')) { + testImplementation(project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')) { exclude module: 'okhttp' } testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0' testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) - testRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')) latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)' } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle index 7622fd0bf5d..4de2fd042be 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle @@ -37,5 +37,5 @@ dependencies { latestDepTestImplementation group: 'com.squareup.okio', name: 'okio', version: '1.+' testRuntimeOnly(project(':dd-java-agent:instrumentation:iast-instrumenter')) - testRuntimeOnly(project(':dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')) } diff --git a/dd-java-agent/instrumentation/org-json/build.gradle b/dd-java-agent/instrumentation/org-json/build.gradle index 6cb100ac6b2..8abd99278d5 100644 --- a/dd-java-agent/instrumentation/org-json/build.gradle +++ b/dd-java-agent/instrumentation/org-json/build.gradle @@ -31,7 +31,7 @@ dependencies { testImplementation group: 'org.json', name: 'json', version: '20230227' testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') - testRuntimeOnly project(':dd-java-agent:instrumentation:jdk:jdk-java-io-1.8') //Needed for Reader + testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-io-1.8') //Needed for Reader latestDepTestImplementation group: 'org.json', name: 'json', version: '20250107' // TODO replace with + when APPSEC-58007 solved } diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index a102933cde4..f1b2a563449 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -46,5 +46,5 @@ dependencies { // Include other instruments that we rely on and that must not conflict with each other testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') - testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') } diff --git a/dd-java-agent/instrumentation/scala/build.gradle b/dd-java-agent/instrumentation/scala/build.gradle index 04c151da8f4..b943ca9ef62 100644 --- a/dd-java-agent/instrumentation/scala/build.gradle +++ b/dd-java-agent/instrumentation/scala/build.gradle @@ -43,7 +43,7 @@ final testTasks = scalaVersions.collect { scalaLibrary -> handler.add(implementationConfiguration.name, scalaLibrary) handler.add(implementationConfiguration.name, libs.slf4j) if (javaConcatenation) { - handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8')) + handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')) } } diff --git a/dd-java-agent/instrumentation/slick/build.gradle b/dd-java-agent/instrumentation/slick/build.gradle index cdcd158d409..b0cc41c282e 100644 --- a/dd-java-agent/instrumentation/slick/build.gradle +++ b/dd-java-agent/instrumentation/slick/build.gradle @@ -25,8 +25,8 @@ dependencies { compileOnly libs.scala compileOnly group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0' - testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') - testImplementation project(':dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') + testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/settings.gradle.kts b/settings.gradle.kts index 856a806546f..13b77888abb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -363,20 +363,20 @@ include( ":dd-java-agent:instrumentation:jakarta-mail", ":dd-java-agent:instrumentation:jakarta-rs-annotations-3", ":dd-java-agent:instrumentation:jakarta-ws-annotations", - ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-21.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-concurrent:jdk-java-concurrent-25.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-nio-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-io-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-9.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-11.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-15.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-lang:jdk-java-lang-17.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-net:jdk-java-net-11.0", - ":dd-java-agent:instrumentation:jdk:jdk-java-security-1.8", - ":dd-java-agent:instrumentation:jdk:jdk-java-util-1.8", + ":dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8", + ":dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-21.0", + ":dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-25.0", + ":dd-java-agent:instrumentation:java:java-nio-1.8", + ":dd-java-agent:instrumentation:java:java-io-1.8", + ":dd-java-agent:instrumentation:java:java-lang:java-lang-1.8", + ":dd-java-agent:instrumentation:java:java-lang:java-lang-9.0", + ":dd-java-agent:instrumentation:java:java-lang:java-lang-11.0", + ":dd-java-agent:instrumentation:java:java-lang:java-lang-15.0", + ":dd-java-agent:instrumentation:java:java-lang:java-lang-17.0", + ":dd-java-agent:instrumentation:java:java-net:java-net-1.8", + ":dd-java-agent:instrumentation:java:java-net:java-net-11.0", + ":dd-java-agent:instrumentation:java:java-security-1.8", + ":dd-java-agent:instrumentation:java:java-util-1.8", ":dd-java-agent:instrumentation:javax-naming", ":dd-java-agent:instrumentation:javax-xml", ":dd-java-agent:instrumentation:javax-mail",