diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 35cef1f7c6b..debd9cef7c5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -77,16 +77,14 @@ /dd-java-agent/agent-ci-visibility/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/cucumber/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/jacoco/ @DataDog/ci-app-libraries-java -/dd-java-agent/instrumentation/junit-4.10/ @DataDog/ci-app-libraries-java -/dd-java-agent/instrumentation/junit-5.3/ @DataDog/ci-app-libraries-java +/dd-java-agent/instrumentation/junit @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/scalatest/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/selenium/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries-java -/dd-java-agent/instrumentation/gradle-3.0/ @DataDog/ci-app-libraries-java -/dd-java-agent/instrumentation/gradle-8.3/ @DataDog/ci-app-libraries-java +/dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/gradle-testing/ @DataDog/ci-app-libraries-java -/dd-java-agent/instrumentation/maven-3.2.1/ @DataDog/ci-app-libraries-java +/dd-java-agent/instrumentation/maven @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/maven-surefire/ @DataDog/ci-app-libraries-java /dd-java-agent/instrumentation/weaver/ @DataDog/ci-app-libraries-java /dd-smoke-tests/gradle/ @DataDog/ci-app-libraries-java diff --git a/dd-java-agent/instrumentation/glassfish/build.gradle b/dd-java-agent/instrumentation/glassfish-3.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/glassfish/build.gradle rename to dd-java-agent/instrumentation/glassfish-3.0/build.gradle diff --git a/dd-java-agent/instrumentation/glassfish/gradle.lockfile b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/glassfish/gradle.lockfile rename to dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java b/dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/glassfish/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java rename to dd-java-agent/instrumentation/glassfish-3.0/src/main/java/datadog/trace/instrumentation/glassfish/GlassFishInstrumentation.java diff --git a/dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy b/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/GlassFishServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy rename to dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/GlassFishServerTest.groovy diff --git a/dd-java-agent/instrumentation/glassfish/src/test/groovy/TestServlets.java b/dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java similarity index 100% rename from dd-java-agent/instrumentation/glassfish/src/test/groovy/TestServlets.java rename to dd-java-agent/instrumentation/glassfish-3.0/src/test/groovy/TestServlets.java diff --git a/dd-java-agent/instrumentation/glassfish/src/test/resources/WEB-INF/web.xml b/dd-java-agent/instrumentation/glassfish-3.0/src/test/resources/WEB-INF/web.xml similarity index 100% rename from dd-java-agent/instrumentation/glassfish/src/test/resources/WEB-INF/web.xml rename to dd-java-agent/instrumentation/glassfish-3.0/src/test/resources/WEB-INF/web.xml diff --git a/dd-java-agent/instrumentation/glassfish/src/test/resources/error.jsp b/dd-java-agent/instrumentation/glassfish-3.0/src/test/resources/error.jsp similarity index 100% rename from dd-java-agent/instrumentation/glassfish/src/test/resources/error.jsp rename to dd-java-agent/instrumentation/glassfish-3.0/src/test/resources/error.jsp diff --git a/dd-java-agent/instrumentation/gradle-testing/build.gradle b/dd-java-agent/instrumentation/gradle-testing/build.gradle index b285fea59ee..174880b8a18 100644 --- a/dd-java-agent/instrumentation/gradle-testing/build.gradle +++ b/dd-java-agent/instrumentation/gradle-testing/build.gradle @@ -9,7 +9,7 @@ repositories { // gradle >= v5.1 dependencies { compileOnly gradleApi() - compileOnly project(":dd-java-agent:instrumentation:junit-4.10") + compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10") } forbiddenApisMain { diff --git a/dd-java-agent/instrumentation/gradle-3.0/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/build.gradle rename to dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle diff --git a/dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/gradle.lockfile rename to dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java rename to dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListener.java diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleBuildListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy rename to dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleProjectConfigurator.groovy diff --git a/dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy b/dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy similarity index 100% rename from dd-java-agent/instrumentation/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy rename to dd-java-agent/instrumentation/gradle/gradle-3.0/src/main/groovy/datadog/trace/instrumentation/gradle/legacy/GradleUtils.groovy diff --git a/dd-java-agent/instrumentation/gradle-8.3/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/build.gradle rename to dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle diff --git a/dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/gradle.lockfile rename to dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/AndroidGradleUtils.groovy diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListener.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_10.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityGradleListenerInjector_8_3.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPlugin.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityPluginExtension.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/CiVisibilityService.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_10_Instrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonInjectionUtils.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleDaemonLoggingInstrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleLauncherInstrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleServiceValidationInstrumentation.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/JavaCompilerPluginArgumentsProvider.java diff --git a/dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java b/dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java similarity index 100% rename from dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java rename to dd-java-agent/instrumentation/gradle/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/TracerArgumentsProvider.java diff --git a/dd-java-agent/instrumentation/jboss-logmanager/build.gradle b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jboss-logmanager/build.gradle rename to dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/build.gradle diff --git a/dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jboss-logmanager/gradle.lockfile rename to dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java rename to dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java diff --git a/dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jboss-logmanager/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java rename to dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java diff --git a/dd-java-agent/instrumentation/jboss-modules/build.gradle b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jboss-modules/build.gradle rename to dd-java-agent/instrumentation/jboss/jboss-modules-1.3/build.gradle diff --git a/dd-java-agent/instrumentation/jboss-modules/gradle.lockfile b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jboss-modules/gradle.lockfile rename to dd-java-agent/instrumentation/jboss/jboss-modules-1.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java rename to dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleInstrumentation.java diff --git a/dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jboss-modules/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java rename to dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/datadog/trace/instrumentation/jbossmodules/ModuleNameHelper.java diff --git a/dd-java-agent/instrumentation/jboss-modules/src/main/java/org/jboss/modules/ModuleLinkageHelper.java b/dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jboss-modules/src/main/java/org/jboss/modules/ModuleLinkageHelper.java rename to dd-java-agent/instrumentation/jboss/jboss-modules-1.3/src/main/java/org/jboss/modules/ModuleLinkageHelper.java diff --git a/dd-java-agent/instrumentation/junit-4.10/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/build.gradle rename to dd-java-agent/instrumentation/junit/junit-4.10/build.gradle diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/build.gradle similarity index 93% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/build.gradle index 71884399d8a..0e528111889 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/build.gradle @@ -11,7 +11,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-4.10') + implementation project(':dd-java-agent:instrumentation:junit:junit-4.10') compileOnly group: 'io.cucumber', name: 'cucumber-junit', version: '5.4.0' testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures') diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/TestSucceedCucumber.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/java/org/example/cucumber/calculator/ParameterTypes.java diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/empty_scenario_name.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/empty_scenario_name.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/empty_scenario_name.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/empty_scenario_name.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/name_with_brackets.feature b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/name_with_brackets.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/name_with_brackets.feature rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/org/example/cucumber/calculator/name_with_brackets.feature diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4.10/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-4.10/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/build.gradle similarity index 90% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/build.gradle index b29e570c575..7c176ad7fe3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/build.gradle @@ -11,7 +11,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-4.10') + implementation project(':dd-java-agent:instrumentation:junit:junit-4.10') compileOnly group: 'junit', name: 'junit', version: '4.13' testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures') diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/FailFastDescriptionComparator.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestOrdererInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4TestSorterInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/ReverseAlphanumeric.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfter.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterClass.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedAfterParam.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBefore.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeClass.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestFailedBeforeParam.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestOrderer.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestOrderer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestOrderer.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestOrderer.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSorter.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSorter.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSorter.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSorter.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeAfter.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeClassAfterClass.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/java/org/example/TestSucceedBeforeParamAfterParam.java diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle similarity index 93% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle index cf9775a506d..f5175b710e6 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle @@ -12,7 +12,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-4.10') + implementation project(':dd-java-agent:instrumentation:junit:junit-4.10') compileOnly group: 'org.scalameta', name: 'munit_2.13', version: '0.7.28' testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures') diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedAssumptionMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedThenSucceedMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedThenSucceedMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedThenSucceedMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestFailedThenSucceedMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSkippedSuiteMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnit.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSkipEfd.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSlow.scala b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSlow.scala similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSlow.scala rename to dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/src/test/scala/org/example/TestSucceedMUnitSlow.scala diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SuiteEventsInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnitLegacySuiteEventsInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/SkippedByDatadog.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TracingListener.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/FailureSuppressingNotifier.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/order/JUnit4FailFastClassOrderer.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/groovy/JUnit4Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/groovy/JUnit4Test.groovy diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/BaseTestInheritance.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/BaseTestInheritance.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/BaseTestInheritance.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/BaseTestInheritance.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestAssumption.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestAssumption.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestAssumption.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestAssumption.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestAssumptionAndSucceed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestDisableTestTrace.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestError.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestError.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestError.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestError.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailed.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedAndSucceed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedParameterized.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedParameterized.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedParameterized.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedParameterized.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteSetUpAssumption.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteSetup.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedSuiteTearDown.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestInheritance.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestInheritance.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestInheritance.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestInheritance.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestParameterized.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterized.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestParameterized.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestParameterizedJUnitParams.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSkipped.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSkipped.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSkipped.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSkipped.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSkippedClass.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSkippedClass.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSkippedClass.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSkippedClass.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceed.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedAndSkipped.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedExpectedException.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedLegacy.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSkipEfd.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSlow.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSlow.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSlow.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSlow.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSuite.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSuite.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedSuite.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedSuite.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedUnskippable.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedUnskippableSuite.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedVerySlow.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/java/org/example/TestSucceedWithCategories.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/kotlin/org/example/TestSucceedKotlin.kt b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/kotlin/org/example/TestSucceedKotlin.kt similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/kotlin/org/example/TestSucceedKotlin.kt rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/kotlin/org/example/TestSucceedKotlin.kt diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/kotlin/org/example/TestSucceedParameterizedKotlin.kt b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/kotlin/org/example/TestSucceedParameterizedKotlin.kt similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/kotlin/org/example/TestSucceedParameterizedKotlin.kt rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/kotlin/org/example/TestSucceedParameterizedKotlin.kt diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-categories-are-included-in-spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-class-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-class-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-class-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-very-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-very-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-error/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-error/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-error/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-error/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-inheritance/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-inheritance/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-inheritance/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-inheritance/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-skipping/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-legacy/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-legacy/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-legacy/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-legacy/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-multiple-successful-suites/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized-junit-params/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized-junit-params/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-impacted/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-impacted/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-kotlin/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-kotlin/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-runner/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-runner/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-runner/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-setup-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-teardown-failure/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl rename to dd-java-agent/instrumentation/junit/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/build.gradle rename to dd-java-agent/instrumentation/junit/junit-5.3/build.gradle diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/build.gradle similarity index 95% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/build.gradle index 17ffae6f100..afb4f69f529 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/build.gradle @@ -12,7 +12,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-5.3') + implementation project(':dd-java-agent:instrumentation:junit:junit-5.3') compileOnly group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '5.4.0' compileOnly group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0' diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/ParameterTypes.java diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skip_efd.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_slow.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-5.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle similarity index 97% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle index 65aa7bf93f0..399cfd48c4a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle @@ -30,7 +30,7 @@ ext { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-5.3') + implementation project(':dd-java-agent:instrumentation:junit:junit-5.3') compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: "$platformVersion" compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: "$jupiterVersion" diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/JUnit5BeforeAfterInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastClassOrderer.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/FailFastMethodOrderer.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5OrderUtils.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterAll.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedAfterEach.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeAll.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestFailedBeforeEach.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestParameterized.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedAnother.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeAllAfterAll.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/java/org/example/TestSucceedBeforeEachAfterEach.java diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/build.gradle similarity index 96% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/build.gradle index a63d01f4ffa..161be4b1d28 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/build.gradle @@ -14,7 +14,7 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') dependencies { - implementation project(':dd-java-agent:instrumentation:junit-5.3') + implementation project(':dd-java-agent:instrumentation:junit:junit-5.3') compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.7.2' compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2' diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/gradle.lockfile rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/gradle.lockfile diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SpockSkipInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockUtils.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5SpockParameterizedExecutionInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/execution/SpockParameterizedExecutionListener.java diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedParameterizedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedParameterizedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedParameterizedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedParameterizedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedParameterizedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedParameterizedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedParameterizedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedParameterizedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestFailedThenSucceedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestParameterizedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedAndFailedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedAndFailedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedAndFailedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedAndFailedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpock.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSkipEfd.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSlow.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSlow.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSlow.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockSlow.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippable.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockUnskippableSuite.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockVerySlow.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockVerySlow.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockVerySlow.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/groovy/org/example/TestSucceedSpockVerySlow.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/CompositeEngineListener.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/ExecutionRequestFactory.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5Instrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestDataFactory.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5NodeTestTaskContextInstrumentation.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestDescriptorHandle.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/TestTaskHandle.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/ThrowableCollectorFactoryWrapper.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/groovy/JUnit5Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/groovy/JUnit5Test.groovy diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/BaseTestInheritance.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/BaseTestInheritance.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/BaseTestInheritance.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/BaseTestInheritance.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumption.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumption.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumption.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumption.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionAndSucceed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestAssumptionLegacy.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestError.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestError.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestError.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestError.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFactory.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFactory.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFactory.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFactory.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailed.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedAndSucceed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedFactory.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedFactory.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedFactory.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedFactory.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedParameterized.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedParameterized.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedParameterized.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedParameterized.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedSuiteSetup.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedSuiteTearDown.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedTemplate.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedTemplate.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedTemplate.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedTemplate.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestInheritance.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestInheritance.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestInheritance.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestInheritance.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestParameterized.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestParameterized.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestParameterized.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestParameterized.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestRepeated.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestRepeated.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestRepeated.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestRepeated.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkipped.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkipped.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkipped.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkipped.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkippedClass.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkippedClass.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkippedClass.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkippedClass.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkippedNested.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkippedNested.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSkippedNested.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSkippedNested.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceed.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceed.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedAndSkipped.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedExpectedException.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedNested.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedNested.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedNested.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedNested.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedSkipEfd.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSlow.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedSlow.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedSlow.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedSlow.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedUnskippable.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedUnskippableSuite.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedVerySlow.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSucceedWithCategories.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestSuiteSetUpAssumption.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestTemplate.java b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestTemplate.java similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/java/org/example/TestTemplate.java rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/java/org/example/TestTemplate.java diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed-legacy/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-categories/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-categories/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-categories/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-categories/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-disabled-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-very-slow-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-very-slow-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-skip-new-test/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-skip-new-test/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-efd-skip-new-test/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-error/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-error/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-error/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-error/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-factory/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-factory/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-factory/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-factory/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed-then-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed-then-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-inheritance/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-inheritance/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-inheritance/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-inheritance/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-skipping/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-suite/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-atr/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-atr/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-efd/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-efd/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-known/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-known/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-repeated/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-repeated/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-repeated/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-repeated/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-factory/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-factory/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-factory/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-factory/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized-6/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized-6/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized-6/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized-6/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized-6/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-template/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-template/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-template/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-retry-template/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-class/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-class/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-class/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-is-not-retried/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-is-not-retried/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-nested-suites/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-skipped/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-impacted/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-impacted/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-multiple-suites/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-nested-suites/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-succeed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-teardown-failed/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/coverages.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-template/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/coverages.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-template/coverages.ftl diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl b/dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-template/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl rename to dd-java-agent/instrumentation/junit/junit-5.3/src/test/resources/test-template/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/build.gradle b/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/build.gradle rename to dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle diff --git a/dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/gradle.lockfile rename to dd-java-agent/instrumentation/maven/maven-3.2.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenExecutionListener.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenInstrumentation.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenLifecycleParticipant.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenProjectConfigurator.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenTestExecution.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/main/java/datadog/trace/instrumentation/maven3/MavenUtils.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenProjectConfiguratorTest.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/MavenUtilsTest.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/my-jdk-home/bin/java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/my-jdk-home/bin/java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/my-jdk-home/bin/java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/my-jdk-home/bin/java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathDependencies.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathDependencies.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathDependencies.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathDependencies.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathElements.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathElements.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathElements.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomAdditionalClasspathElements.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomJacoco.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomJacoco.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomJacoco.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomJacoco.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomToolchains.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomToolchains.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomToolchains.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/samplePomToolchains.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProject/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectArgLine/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireArgLine/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/main/java/dev.properties b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/main/java/dev.properties similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/main/java/dev.properties rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/main/java/dev.properties diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleProjectSurefireLateProcessingArgLine/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleToolchains.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleToolchains.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleToolchains.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/sampleToolchains.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/simple-agent.jar b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/simple-agent.jar similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/simple-agent.jar rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/datadog/trace/instrumentation/maven3/simple-agent.jar diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/src/test/java/com/example/TestFailed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/src/test/java/com/example/TestFailed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/src/test/java/com/example/TestFailed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_failed_tests_generates_spans/src/test/java/com/example/TestFailed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_incorrect_command_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_fork_generates_spans/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_no_tests_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_generates_spans/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-a/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/src/test/java/com/example/TestFailed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/src/test/java/com/example/TestFailed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/src/test/java/com/example/TestFailed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/module-b/src/test/java/com/example/TestFailed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-a/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/module-b/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/coverages.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/events.ftl diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/pom.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/pom.xml similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/pom.xml rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/pom.xml diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/it/java/com/example/ITSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/it/java/com/example/ITSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/it/java/com/example/ITSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/it/java/com/example/ITSucceed.java diff --git a/dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/test/java/com/example/TestSucceed.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/test/java/com/example/TestSucceed.java similarity index 100% rename from dd-java-agent/instrumentation/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/test/java/com/example/TestSucceed.java rename to dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/test_maven_build_with_unit_and_integration_tests_generates_spans/src/test/java/com/example/TestSucceed.java diff --git a/dd-java-agent/instrumentation/maven-surefire/build.gradle b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle similarity index 89% rename from dd-java-agent/instrumentation/maven-surefire/build.gradle rename to dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle index f540b7413b1..ab3efe89810 100644 --- a/dd-java-agent/instrumentation/maven-surefire/build.gradle +++ b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/build.gradle @@ -20,5 +20,5 @@ muzzle { dependencies { compileOnly group: 'org.apache.maven.surefire', name: 'surefire-junit4', version: '3.0.0' compileOnly group: 'org.apache.maven.surefire', name: 'surefire-junit47', version: '3.0.0' // parallel provider - implementation project(":dd-java-agent:instrumentation:junit-4.10") + implementation project(":dd-java-agent:instrumentation:junit:junit-4.10") } diff --git a/dd-java-agent/instrumentation/maven-surefire/gradle.lockfile b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/maven-surefire/gradle.lockfile rename to dd-java-agent/instrumentation/maven/maven-surefire-3.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/maven-surefire/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java b/dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/maven-surefire/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java rename to dd-java-agent/instrumentation/maven/maven-surefire-3.0/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java diff --git a/dd-java-agent/instrumentation/selenium/build.gradle b/dd-java-agent/instrumentation/selenium/build.gradle index 1e600435062..0b4a6f6537b 100644 --- a/dd-java-agent/instrumentation/selenium/build.gradle +++ b/dd-java-agent/instrumentation/selenium/build.gradle @@ -24,7 +24,7 @@ dependencies { compileOnly group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.141.59' testFixturesApi project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures') - testFixturesApi project(':dd-java-agent:instrumentation:junit-5.3') + testFixturesApi project(':dd-java-agent:instrumentation:junit:junit-5.3') testFixturesApi group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get() testFixturesApi group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: libs.versions.junit5.get() diff --git a/dd-java-agent/instrumentation/websphere-jmx/build.gradle b/dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/websphere-jmx/build.gradle rename to dd-java-agent/instrumentation/websphere-jmx-8.5/build.gradle diff --git a/dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/websphere-jmx/gradle.lockfile rename to dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile diff --git a/dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java b/dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/websphere-jmx/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java rename to dd-java-agent/instrumentation/websphere-jmx-8.5/src/main/java/datadog/trace/instrumentation/websphere_jmx/WebsphereSecurityInstrumentation.java diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index 9c4cb5e0555..eb3149d2397 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -43,7 +43,7 @@ dependencies { testImplementation group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-api', version: '1.2.6' testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3') - testRuntimeOnly project(':dd-java-agent:instrumentation:jboss-modules') + testRuntimeOnly project(':dd-java-agent:instrumentation:jboss:jboss-modules-1.3') testRuntimeOnly project(':dd-java-agent:instrumentation:undertow:undertow-2.0') testRuntimeOnly project(':dd-java-agent:instrumentation:undertow:undertow-2.2') testRuntimeOnly group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-spi', version: '1.2.6' diff --git a/settings.gradle.kts b/settings.gradle.kts index a19a7153cbb..b1d0c6a5f1c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -324,12 +324,12 @@ include( ":dd-java-agent:instrumentation:finatra-2.9", ":dd-java-agent:instrumentation:freemarker:freemarker-2.3.9", ":dd-java-agent:instrumentation:freemarker:freemarker-2.3.24", - ":dd-java-agent:instrumentation:glassfish", + ":dd-java-agent:instrumentation:glassfish-3.0", ":dd-java-agent:instrumentation:google-http-client", ":dd-java-agent:instrumentation:google-pubsub", ":dd-java-agent:instrumentation:graal:native-image", - ":dd-java-agent:instrumentation:gradle-3.0", - ":dd-java-agent:instrumentation:gradle-8.3", + ":dd-java-agent:instrumentation:gradle:gradle-3.0", + ":dd-java-agent:instrumentation:gradle:gradle-8.3", ":dd-java-agent:instrumentation:gradle-testing", ":dd-java-agent:instrumentation:graphql-java:graphql-java-14.0", ":dd-java-agent:instrumentation:graphql-java:graphql-java-20.0", @@ -393,8 +393,8 @@ include( ":dd-java-agent:instrumentation:jax-rs-client-2.0:connection-error-handling-resteasy", ":dd-java-agent:instrumentation:jax-ws-annotations-1", ":dd-java-agent:instrumentation:jax-ws-annotations-2", - ":dd-java-agent:instrumentation:jboss-logmanager", - ":dd-java-agent:instrumentation:jboss-modules", + ":dd-java-agent:instrumentation:jboss:jboss-logmanager-1.1", + ":dd-java-agent:instrumentation:jboss:jboss-modules-1.3", ":dd-java-agent:instrumentation:jdbc", ":dd-java-agent:instrumentation:jdbc:scalikejdbc", ":dd-java-agent:instrumentation:jedis:jedis-1.4", @@ -422,14 +422,14 @@ include( ":dd-java-agent:instrumentation:jose-jwt", ":dd-java-agent:instrumentation:org-json", ":dd-java-agent:instrumentation:jsp-2.3", - ":dd-java-agent:instrumentation:junit-4.10", - ":dd-java-agent:instrumentation:junit-4.10:cucumber-junit-4", - ":dd-java-agent:instrumentation:junit-4.10:junit-4.13", - ":dd-java-agent:instrumentation:junit-4.10:munit-junit-4", - ":dd-java-agent:instrumentation:junit-5.3", - ":dd-java-agent:instrumentation:junit-5.3:junit-5.8", - ":dd-java-agent:instrumentation:junit-5.3:cucumber-junit-5", - ":dd-java-agent:instrumentation:junit-5.3:spock-junit-5", + ":dd-java-agent:instrumentation:junit:junit-4.10", + ":dd-java-agent:instrumentation:junit:junit-4.10:cucumber-junit-4", + ":dd-java-agent:instrumentation:junit:junit-4.10:junit-4.13", + ":dd-java-agent:instrumentation:junit:junit-4.10:munit-junit-4", + ":dd-java-agent:instrumentation:junit:junit-5.3", + ":dd-java-agent:instrumentation:junit:junit-5.3:junit-5.8", + ":dd-java-agent:instrumentation:junit:junit-5.3:cucumber-junit-5", + ":dd-java-agent:instrumentation:junit:junit-5.3:spock-junit-5", ":dd-java-agent:instrumentation:kafka:kafka-clients-0.11", ":dd-java-agent:instrumentation:kafka:kafka-clients-3.8", ":dd-java-agent:instrumentation:kafka:kafka-common", @@ -446,8 +446,8 @@ include( ":dd-java-agent:instrumentation:log4j:log4j-1.2.4", ":dd-java-agent:instrumentation:log4j:log4j-2.0", ":dd-java-agent:instrumentation:logback-1.0", - ":dd-java-agent:instrumentation:maven-3.2.1", - ":dd-java-agent:instrumentation:maven-surefire", + ":dd-java-agent:instrumentation:maven:maven-3.2.1", + ":dd-java-agent:instrumentation:maven:maven-surefire-3.0", ":dd-java-agent:instrumentation:micronaut", ":dd-java-agent:instrumentation:micronaut:http-server-netty-2.0", ":dd-java-agent:instrumentation:micronaut:http-server-netty-3.0", @@ -600,7 +600,7 @@ include( ":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10", ":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11", ":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12", - ":dd-java-agent:instrumentation:websphere-jmx", + ":dd-java-agent:instrumentation:websphere-jmx-8.5", ":dd-java-agent:instrumentation:wildfly-9.0", ":dd-java-agent:instrumentation:zio:zio-2.0", )