From 6444ad2c3853dc7b6811c715448eb508767d89a9 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 16 Sep 2025 14:28:28 +0200 Subject: [PATCH 1/3] move tibco bw modules --- .../{tibcobw-5 => tibco-businessworks-5.14}/build.gradle | 2 +- .../{tibcobw-5 => tibco-businessworks-5.14}/gradle.lockfile | 0 .../src/main/java/com/tibco/pe/core/DDJobMate.java | 0 .../tibcobw5/AbstractTibcoInstrumentation.java | 0 .../trace/instrumentation/tibcobw5/ActivityHelper.java | 0 .../trace/instrumentation/tibcobw5/JobInstrumentation.java | 0 .../instrumentation/tibcobw5/JobPoolInstrumentation.java | 0 .../trace/instrumentation/tibcobw5/TaskInstrumentation.java | 0 .../instrumentation/tibcobw5/ThreadPoolInstrumentation.java | 0 .../trace/instrumentation/tibcobw5/TibcoDecorator.java | 0 .../{tibcobw-6 => tibco-businessworks-6.5}/build.gradle | 2 +- .../{tibcobw-6 => tibco-businessworks-6.5}/gradle.lockfile | 0 .../tibcobw6/AbstractTibcoInstrumentation.java | 0 .../instrumentation/tibcobw6/BehaviorInstrumentation.java | 0 .../tibcobw6/CallbackHandlerInstrumentation.java | 0 .../trace/instrumentation/tibcobw6/IgnoreHelper.java | 0 .../tibcobw6/JmsMessageGetterInstrumentation.java | 0 .../instrumentation/tibcobw6/ProcessInstrumentation.java | 0 .../trace/instrumentation/tibcobw6/TibcoDecorator.java | 0 .../build.gradle | 0 .../gradle.lockfile | 0 .../jms/shared/api/receive/JMSMessageCallBackHandler.java | 0 .../tibco/bx/core/behaviors/activity/BxEmptyBehavior.java | 0 .../tibco/bx/core/behaviors/activity/BxFlowBehavior.java | 0 .../tibco/bx/core/behaviors/activity/BxPickBehavior.java | 0 .../tibco/bx/core/behaviors/activity/BxScopeBehavior.java | 0 .../src/main/java/com/tibco/pe/PEVersion.java | 0 .../src/main/java/com/tibco/pe/core/ActivityGroup.java | 0 .../src/main/java/com/tibco/pe/core/Job.java | 0 .../src/main/java/com/tibco/pe/core/JobPool.java | 0 .../src/main/java/com/tibco/pe/core/ProcessGroup.java | 0 .../src/main/java/com/tibco/pe/core/Task.java | 0 .../src/main/java/com/tibco/pe/core/Workflow.java | 0 .../src/main/java/com/tibco/pe/plugin/Activity.java | 0 .../src/main/java/com/tibco/pe/plugin/Component.java | 0 .../src/main/java/com/tibco/pe/plugin/ProcessContext.java | 0 .../src/main/java/com/tibco/pvm/api/PmAttributed.java | 0 .../src/main/java/com/tibco/pvm/api/PmModelObject.java | 0 .../src/main/java/com/tibco/pvm/api/PmModule.java | 0 .../src/main/java/com/tibco/pvm/api/PmProcess.java | 0 .../src/main/java/com/tibco/pvm/api/PmProcessInstance.java | 0 .../src/main/java/com/tibco/pvm/api/PmTask.java | 0 .../src/main/java/com/tibco/pvm/api/PmWorkUnit.java | 0 .../main/java/com/tibco/pvm/api/behavior/PmBehavior.java | 0 .../src/main/java/com/tibco/pvm/api/event/PmEvent.java | 0 .../src/main/java/com/tibco/pvm/api/session/PmContext.java | 0 .../main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java | 0 .../main/java/com/tibco/pvm/api/util/attr/PmAttribute.java | 0 settings.gradle.kts | 6 +++--- 49 files changed, 5 insertions(+), 5 deletions(-) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/build.gradle (76%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/com/tibco/pe/core/DDJobMate.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-5 => tibco-businessworks-5.14}/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/build.gradle (76%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-6 => tibco-businessworks-6.5}/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/build.gradle (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/bw/jms/shared/api/receive/JMSMessageCallBackHandler.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/bx/core/behaviors/activity/BxEmptyBehavior.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/bx/core/behaviors/activity/BxFlowBehavior.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/bx/core/behaviors/activity/BxPickBehavior.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/bx/core/behaviors/activity/BxScopeBehavior.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/PEVersion.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/ActivityGroup.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/Job.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/JobPool.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/ProcessGroup.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/Task.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/core/Workflow.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/plugin/Activity.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/plugin/Component.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pe/plugin/ProcessContext.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmAttributed.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmModelObject.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmModule.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmProcess.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmProcessInstance.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmTask.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/PmWorkUnit.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/event/PmEvent.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/session/PmContext.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java (100%) rename dd-java-agent/instrumentation/tibco-businessworks/{tibcobw-stubs => tibco-businessworks-stubs}/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java (100%) diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle similarity index 76% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/build.gradle rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle index 497ed6fe0c3..1aec568bfae 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/build.gradle +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/build.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibcobw-stubs') + compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs') } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/gradle.lockfile rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/gradle.lockfile diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/com/tibco/pe/core/DDJobMate.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/com/tibco/pe/core/DDJobMate.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/com/tibco/pe/core/DDJobMate.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/AbstractTibcoInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ActivityHelper.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/JobPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/ThreadPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-5/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TibcoDecorator.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle similarity index 76% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/build.gradle rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle index 497ed6fe0c3..1aec568bfae 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/build.gradle +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/build.gradle @@ -1,5 +1,5 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibcobw-stubs') + compileOnly project(':dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs') } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/gradle.lockfile rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/gradle.lockfile diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/AbstractTibcoInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/CallbackHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/IgnoreHelper.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/JmsMessageGetterInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-6/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/TibcoDecorator.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/build.gradle b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/build.gradle rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/gradle.lockfile rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/gradle.lockfile diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bw/jms/shared/api/receive/JMSMessageCallBackHandler.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bw/jms/shared/api/receive/JMSMessageCallBackHandler.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bw/jms/shared/api/receive/JMSMessageCallBackHandler.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bw/jms/shared/api/receive/JMSMessageCallBackHandler.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxEmptyBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxEmptyBehavior.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxEmptyBehavior.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxEmptyBehavior.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxFlowBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxFlowBehavior.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxFlowBehavior.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxFlowBehavior.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxPickBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxPickBehavior.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxPickBehavior.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxPickBehavior.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxScopeBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxScopeBehavior.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxScopeBehavior.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/bx/core/behaviors/activity/BxScopeBehavior.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/PEVersion.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/PEVersion.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/PEVersion.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/ActivityGroup.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/ActivityGroup.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/ActivityGroup.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/ActivityGroup.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Job.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Job.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Job.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/JobPool.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/JobPool.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/JobPool.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/ProcessGroup.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/ProcessGroup.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/ProcessGroup.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/ProcessGroup.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Task.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Task.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Task.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Workflow.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/core/Workflow.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/core/Workflow.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/Activity.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Activity.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/Activity.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Activity.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/Component.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/Component.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/Component.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pe/plugin/ProcessContext.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmAttributed.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModelObject.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmModule.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmModule.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmModule.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmProcess.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcess.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmProcess.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcess.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmProcessInstance.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmTask.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmTask.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmTask.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/PmWorkUnit.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/behavior/PmBehavior.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/event/PmEvent.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/session/PmContext.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/session/PmContext.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/session/PmContext.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/session/PmContext.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttrFilter.java diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java similarity index 100% rename from dd-java-agent/instrumentation/tibco-businessworks/tibcobw-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java rename to dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/src/main/java/com/tibco/pvm/api/util/attr/PmAttribute.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 806b9ab3ad7..e2ef09486ac 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -559,9 +559,9 @@ include( ":dd-java-agent:instrumentation:thymeleaf", ":dd-java-agent:instrumentation:tinylog-2.0", ":dd-java-agent:instrumentation:tibco-businessworks", - ":dd-java-agent:instrumentation:tibco-businessworks:tibcobw-stubs", - ":dd-java-agent:instrumentation:tibco-businessworks:tibcobw-5", - ":dd-java-agent:instrumentation:tibco-businessworks:tibcobw-6", + ":dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-stubs", + ":dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-5.14", + ":dd-java-agent:instrumentation:tibco-businessworks:tibco-businessworks-6.5", ":dd-java-agent:instrumentation:tomcat:tomcat-5.5", ":dd-java-agent:instrumentation:tomcat:tomcat-common", ":dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-5.5", From f88b72a5e350c3be046caf855a824ef6b9af3ffb Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 16 Sep 2025 14:35:19 +0200 Subject: [PATCH 2/3] group netty modules --- .../armeria/armeria-grpc-0.84/build.gradle | 6 +++--- .../aws-java/aws-java-sdk-2.2/build.gradle | 4 ++-- .../elasticsearch/rest-6.4/build.gradle | 2 +- .../elasticsearch/rest-7/build.gradle | 2 +- .../elasticsearch/transport-5.3/build.gradle | 2 +- .../elasticsearch/transport-5/build.gradle | 2 +- .../elasticsearch/transport-6/build.gradle | 2 +- .../elasticsearch/transport-7.3/build.gradle | 2 +- .../instrumentation/finatra-2.9/build.gradle | 2 +- .../micronaut/http-server-netty-2.0/build.gradle | 2 +- .../micronaut/http-server-netty-3.0/build.gradle | 2 +- .../micronaut/http-server-netty-4.0/build.gradle | 2 +- .../{ => netty}/netty-3.8/build.gradle | 0 .../{ => netty}/netty-3.8/gradle.lockfile | 0 .../netty38/latestdep/Netty38ClientTest.groovy | 0 .../netty38/latestdep/Netty38ServerTest.groovy | 0 .../netty38/AbstractNettyAdvice.java | 0 .../ChannelFutureListenerInstrumentation.java | 0 .../netty38/ChannelPipelineAdviceUtil.java | 0 .../netty38/ChannelTraceContext.java | 0 .../netty38/NettyChannelInstrumentation.java | 0 .../NettyChannelPipelineInstrumentation.java | 0 .../client/HttpClientRequestTracingHandler.java | 0 .../client/HttpClientResponseTracingHandler.java | 0 .../netty38/client/HttpClientTracingHandler.java | 0 .../netty38/client/NettyHttpClientDecorator.java | 0 .../netty38/client/NettyResponseInjectAdapter.java | 0 .../netty38/server/BlockAllWritesHandler.java | 0 .../netty38/server/BlockingResponseHandler.java | 0 .../server/HttpServerRequestTracingHandler.java | 0 .../server/HttpServerResponseTracingHandler.java | 0 .../netty38/server/HttpServerTracingHandler.java | 0 .../netty38/server/MaybeBlockResponseHandler.java | 0 .../netty38/server/NettyHttpServerDecorator.java | 0 .../netty38/server/ResponseExtractAdapter.java | 0 .../WebSocketServerRequestTracingHandler.java | 0 .../WebSocketServerResponseTracingHandler.java | 0 .../websocket/WebSocketServerTracingHandler.java | 0 .../netty38/util/CombinedSimpleChannelHandler.java | 0 .../netty38/Netty38ClientTest.groovy | 0 .../netty38/Netty38ServerTest.groovy | 0 .../{ => netty}/netty-4.0/build.gradle | 2 +- .../{ => netty}/netty-4.0/gradle.lockfile | 0 .../instrumentation/netty40/AttributeKeys.java | 0 .../ChannelFutureListenerInstrumentation.java | 0 .../NettyChannelHandlerContextInstrumentation.java | 0 .../NettyChannelPipelineInstrumentation.java | 0 .../netty40/NettyPipelineHelper.java | 0 .../client/HttpClientRequestTracingHandler.java | 0 .../client/HttpClientResponseTracingHandler.java | 0 .../netty40/client/HttpClientTracingHandler.java | 0 .../netty40/client/NettyHttpClientDecorator.java | 0 .../netty40/client/NettyResponseInjectAdapter.java | 0 .../netty40/server/BlockingResponseHandler.java | 0 .../server/HttpServerRequestTracingHandler.java | 0 .../server/HttpServerResponseTracingHandler.java | 0 .../netty40/server/HttpServerTracingHandler.java | 0 .../netty40/server/MaybeBlockResponseHandler.java | 0 .../netty40/server/NettyHttpServerDecorator.java | 0 .../netty40/server/ResponseExtractAdapter.java | 0 .../WebSocketServerRequestTracingHandler.java | 0 .../WebSocketServerResponseTracingHandler.java | 0 .../websocket/WebSocketServerTracingHandler.java | 0 .../src/test/groovy/Netty40ClientTest.groovy | 0 .../src/test/groovy/Netty40PipelineTest.groovy | 0 .../src/test/groovy/Netty40ServerTest.groovy | 0 .../src/test/groovy/NettyWebsocketClient.groovy | 0 .../{ => netty}/netty-4.1/build.gradle | 4 ++-- .../{ => netty}/netty-4.1/gradle.lockfile | 0 .../ChannelFutureListenerInstrumentation.java | 0 ...ltiplexHandlerStreamChannelInstrumentation.java | 0 .../HttpPostRequestDecoderInstrumentation.java | 0 .../NettyChannelHandlerContextInstrumentation.java | 0 .../NettyChannelPipelineInstrumentation.java | 0 .../instrumentation/netty41/NettyHttp2Helper.java | 0 .../netty41/NettyPipelineHelper.java | 0 .../client/HttpClientRequestTracingHandler.java | 0 .../client/HttpClientResponseTracingHandler.java | 0 .../netty41/client/HttpClientTracingHandler.java | 0 .../netty41/client/NettyHttpClientDecorator.java | 0 .../netty41/client/NettyResponseInjectAdapter.java | 0 .../netty41/server/BlockingResponseHandler.java | 0 .../server/HttpServerRequestTracingHandler.java | 0 .../server/HttpServerResponseTracingHandler.java | 0 .../netty41/server/HttpServerTracingHandler.java | 0 .../netty41/server/MaybeBlockResponseHandler.java | 0 .../netty41/server/NettyHttpServerDecorator.java | 0 .../netty41/server/ResponseExtractAdapter.java | 0 .../WebSocketServerInboundTracingHandler.java | 0 .../WebSocketServerOutboundTracingHandler.java | 0 .../websocket/WebSocketServerTracingHandler.java | 0 .../src/test/groovy/Netty41ClientTest.groovy | 0 .../src/test/groovy/Netty41PipelineTest.groovy | 0 .../src/test/groovy/Netty41ServerTest.groovy | 0 .../src/test/groovy/NettyWebsocketClient.groovy | 0 .../src/test/groovy/ReactorNettyTest.groovy | 0 .../netty-buffer-4.0}/build.gradle | 0 .../netty-buffer-4.0}/gradle.lockfile | 0 .../buffer/ByteBufInputStreamInstrumentation.java | 0 .../netty40/buffer/ByteBufInstrumentation.java | 0 .../netty-common}/build.gradle | 0 .../netty-common}/gradle.lockfile | 0 .../instrumentation/netty41/AttributeKeys.java | 0 .../netty-concurrent-4.0}/build.gradle | 0 .../netty-concurrent-4.0}/gradle.lockfile | 0 .../SingleThreadEventExecutorInstrumentation.java | 0 .../src/test/groovy/TimingTest.groovy | 0 .../netty-promise-4.0}/build.gradle | 0 .../netty-promise-4.0}/gradle.lockfile | 0 .../netty4/promise/ListenerWrapper.java | 0 .../promise/NettyPromiseInstrumentation.java | 0 .../test/groovy/NettyProgressivePromiseTest.groovy | 0 .../src/test/groovy/NettyPromiseTest.groovy | 0 .../opensearch/transport/build.gradle | 2 +- .../play-ws/play-ws-1.0/build.gradle | 4 ++-- .../play-ws/play-ws-2.0/build.gradle | 4 ++-- .../play-ws/play-ws-2.1/build.gradle | 4 ++-- .../instrumentation/play/play-2.3/build.gradle | 2 +- .../instrumentation/play/play-2.4/build.gradle | 4 ++-- .../instrumentation/play/play-2.6/build.gradle | 4 ++-- .../instrumentation/ratpack-1.5/build.gradle | 2 +- .../instrumentation/reactor-netty-1/build.gradle | 6 +++--- .../instrumentation/resteasy-appsec/build.gradle | 2 +- .../spring-webflux/spring-webflux-5.0/build.gradle | 4 ++-- .../spring-webflux/spring-webflux-6.0/build.gradle | 4 ++-- .../vertx/vertx-rx-3.5/build.gradle | 2 +- .../vertx/vertx-web/vertx-web-3.4/build.gradle | 2 +- .../vertx/vertx-web/vertx-web-3.5/build.gradle | 2 +- .../vertx/vertx-web/vertx-web-3.9/build.gradle | 4 ++-- .../vertx/vertx-web/vertx-web-4.0/build.gradle | 6 +++--- .../vertx/vertx-web/vertx-web-5.0/build.gradle | 6 +++--- settings.gradle.kts | 14 +++++++------- 132 files changed, 57 insertions(+), 57 deletions(-) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/build.gradle (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ServerTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/build.gradle (98%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/test/groovy/Netty40ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/test/groovy/Netty40PipelineTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/test/groovy/Netty40ServerTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.0/src/test/groovy/NettyWebsocketClient.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/build.gradle (95%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/test/groovy/Netty41ClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/test/groovy/Netty41PipelineTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/test/groovy/Netty41ServerTest.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/test/groovy/NettyWebsocketClient.groovy (100%) rename dd-java-agent/instrumentation/{ => netty}/netty-4.1/src/test/groovy/ReactorNettyTest.groovy (100%) rename dd-java-agent/instrumentation/{netty-buffer-4 => netty/netty-buffer-4.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{netty-buffer-4 => netty/netty-buffer-4.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{netty-buffer-4 => netty/netty-buffer-4.0}/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java (100%) rename dd-java-agent/instrumentation/{netty-buffer-4 => netty/netty-buffer-4.0}/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java (100%) rename dd-java-agent/instrumentation/{netty-4.1-shared => netty/netty-common}/build.gradle (100%) rename dd-java-agent/instrumentation/{netty-4.1-shared => netty/netty-common}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{netty-4.1-shared => netty/netty-common}/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java (100%) rename dd-java-agent/instrumentation/{netty-concurrent-4 => netty/netty-concurrent-4.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{netty-concurrent-4 => netty/netty-concurrent-4.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{netty-concurrent-4 => netty/netty-concurrent-4.0}/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{netty-concurrent-4 => netty/netty-concurrent-4.0}/src/test/groovy/TimingTest.groovy (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/src/test/groovy/NettyProgressivePromiseTest.groovy (100%) rename dd-java-agent/instrumentation/{netty-promise-4 => netty/netty-promise-4.0}/src/test/groovy/NettyPromiseTest.groovy (100%) diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle index f6a9d253ee3..19a595b7c3e 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle @@ -56,9 +56,9 @@ dependencies { testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' testImplementation project(':dd-java-agent:instrumentation:grpc-1.5') - testImplementation project(':dd-java-agent:instrumentation:netty-3.8') - testImplementation project(':dd-java-agent:instrumentation:netty-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes latestDepTestImplementation group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '1.+' diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle index 0190dd77057..5c55f3f008d 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle @@ -33,7 +33,7 @@ dependencies { // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') // Also include netty instrumentation because it is used by aws async client - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0' testImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.2.0' testImplementation group: 'software.amazon.awssdk', name: 'rds', version: '2.2.0' @@ -70,7 +70,7 @@ dependencies { latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.18.40' latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') - latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1') + latestDepTestImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: fixedSdkVersion latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apigateway', version: fixedSdkVersion diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle index bd827929ca1..f5506e22870 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') // Netty is used, but it adds complexity to the tests since we're using embedded ES. - //testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + //testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle index f65b37678f1..29889b8aa29 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') // Netty is used, but it adds complexity to the tests since we're using embedded ES. - //testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + //testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle index 8b39f3accda..f90b499a8a6 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation project(':dd-java-agent:instrumentation:elasticsearch') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:spring:spring-data-1.8') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport') diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle index 4a573c97bd0..46552c49777 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle @@ -32,7 +32,7 @@ dependencies { // Ensure no cross interference testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport') testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle index 61d1d152c40..a84f004465d 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle @@ -28,7 +28,7 @@ dependencies { // Ensure no cross interference testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport') testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0' diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle index 4ff936178ba..cf03f24a6e1 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle @@ -29,7 +29,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-6.4') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport') testImplementation group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '7.3.0' diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle index 9cc38b6e88d..b2bd5982db1 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/build.gradle +++ b/dd-java-agent/instrumentation/finatra-2.9/build.gradle @@ -24,7 +24,7 @@ muzzle { dependencies { compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0' testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10') diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/build.gradle index bff5dd9f901..42ec98bf2be 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-2.0/build.gradle @@ -19,7 +19,7 @@ dependencies { // Added to ensure cross compatibility: testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-3.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0' testAnnotationProcessor "io.micronaut:micronaut-inject-java:2.0.0" diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/build.gradle index b858fbc7b36..5dbc77e9b52 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-3.0/build.gradle @@ -19,7 +19,7 @@ dependencies { // Added to ensure cross compatibility: testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-2.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '3.0.0' testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.3' diff --git a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle index ffb10fb10c3..d2b5035c01c 100644 --- a/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/micronaut/http-server-netty-4.0/build.gradle @@ -35,7 +35,7 @@ dependencies { // Added to ensure cross compatibility: testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-2.0') testImplementation project(':dd-java-agent:instrumentation:micronaut:http-server-netty-3.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:agent-debugger') testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '4.0.0', { exclude group: 'org.slf4j', module: 'slf4j-api' diff --git a/dd-java-agent/instrumentation/netty-3.8/build.gradle b/dd-java-agent/instrumentation/netty/netty-3.8/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/build.gradle rename to dd-java-agent/instrumentation/netty/netty-3.8/build.gradle diff --git a/dd-java-agent/instrumentation/netty-3.8/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ClientTest.groovy b/dd-java-agent/instrumentation/netty/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ClientTest.groovy rename to dd-java-agent/instrumentation/netty/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ClientTest.groovy diff --git a/dd-java-agent/instrumentation/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ServerTest.groovy b/dd-java-agent/instrumentation/netty/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ServerTest.groovy rename to dd-java-agent/instrumentation/netty/netty-3.8/src/latestDepTest/groovy/datadog/trace/instrumentation/netty38/latestdep/Netty38ServerTest.groovy diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/AbstractNettyAdvice.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelPipelineAdviceUtil.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelTraceContext.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyResponseInjectAdapter.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockAllWritesHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/BlockingResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/MaybeBlockResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/NettyHttpServerDecorator.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/ResponseExtractAdapter.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java rename to dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/util/CombinedSimpleChannelHandler.java diff --git a/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ClientTest.groovy b/dd-java-agent/instrumentation/netty/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ClientTest.groovy rename to dd-java-agent/instrumentation/netty/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ClientTest.groovy diff --git a/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy b/dd-java-agent/instrumentation/netty/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy rename to dd-java-agent/instrumentation/netty/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle similarity index 98% rename from dd-java-agent/instrumentation/netty-4.0/build.gradle rename to dd-java-agent/instrumentation/netty/netty-4.0/build.gradle index 5814e8bb725..2de6c89b311 100644 --- a/dd-java-agent/instrumentation/netty-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-4.0/build.gradle @@ -38,7 +38,7 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final' - testImplementation project(':dd-java-agent:instrumentation:netty-promise-4') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final' testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0' diff --git a/dd-java-agent/instrumentation/netty-4.0/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/AttributeKeys.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyPipelineHelper.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyHttpClientDecorator.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/NettyResponseInjectAdapter.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/BlockingResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/MaybeBlockResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/NettyHttpServerDecorator.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/ResponseExtractAdapter.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ClientTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40PipelineTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40PipelineTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40PipelineTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40PipelineTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/Netty40ServerTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/NettyWebsocketClient.groovy b/dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/NettyWebsocketClient.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.0/src/test/groovy/NettyWebsocketClient.groovy rename to dd-java-agent/instrumentation/netty/netty-4.0/src/test/groovy/NettyWebsocketClient.groovy diff --git a/dd-java-agent/instrumentation/netty-4.1/build.gradle b/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle similarity index 95% rename from dd-java-agent/instrumentation/netty-4.1/build.gradle rename to dd-java-agent/instrumentation/netty/netty-4.1/build.gradle index 8a279c08a2b..25a8b04c7dd 100644 --- a/dd-java-agent/instrumentation/netty-4.1/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-4.1/build.gradle @@ -39,9 +39,9 @@ dependencies { compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final' compileOnly group: 'io.netty', name: 'netty-codec-http2', version: '4.1.0.Final' - api project(':dd-java-agent:instrumentation:netty-4.1-shared') + api project(':dd-java-agent:instrumentation:netty:netty-common') - testImplementation project(':dd-java-agent:instrumentation:netty-promise-4') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final' diff --git a/dd-java-agent/instrumentation/netty-4.1/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/Http2MultiplexHandlerStreamChannelInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/HttpPostRequestDecoderInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyHttp2Helper.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyPipelineHelper.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyResponseInjectAdapter.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/BlockingResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerResponseTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/MaybeBlockResponseHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/ResponseExtractAdapter.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java rename to dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerTracingHandler.java diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41PipelineTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41PipelineTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41PipelineTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41PipelineTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ServerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ServerTest.groovy diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/NettyWebsocketClient.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyWebsocketClient.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/test/groovy/NettyWebsocketClient.groovy rename to dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyWebsocketClient.groovy diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/ReactorNettyTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1/src/test/groovy/ReactorNettyTest.groovy rename to dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/ReactorNettyTest.groovy diff --git a/dd-java-agent/instrumentation/netty-buffer-4/build.gradle b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/netty-buffer-4/build.gradle rename to dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle diff --git a/dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-buffer-4/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-buffer-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInputStreamInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-buffer-4/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-buffer-4.0/src/main/java/datadog/trace/instrumentation/netty40/buffer/ByteBufInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-4.1-shared/build.gradle b/dd-java-agent/instrumentation/netty/netty-common/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1-shared/build.gradle rename to dd-java-agent/instrumentation/netty/netty-common/build.gradle diff --git a/dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1-shared/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-4.1-shared/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java b/dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java similarity index 100% rename from dd-java-agent/instrumentation/netty-4.1-shared/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java rename to dd-java-agent/instrumentation/netty/netty-common/src/main/java/datadog/trace/instrumentation/netty41/AttributeKeys.java diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/netty-concurrent-4/build.gradle rename to dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-concurrent-4/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-concurrent-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-concurrent-4/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-concurrent-4/src/test/groovy/TimingTest.groovy b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/groovy/TimingTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-concurrent-4/src/test/groovy/TimingTest.groovy rename to dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/groovy/TimingTest.groovy diff --git a/dd-java-agent/instrumentation/netty-promise-4/build.gradle b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/build.gradle rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle diff --git a/dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile b/dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/gradle.lockfile rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/NettyPromiseInstrumentation.java diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyProgressivePromiseTest.groovy b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/test/groovy/NettyProgressivePromiseTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyProgressivePromiseTest.groovy rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/src/test/groovy/NettyProgressivePromiseTest.groovy diff --git a/dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyPromiseTest.groovy b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/test/groovy/NettyPromiseTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/netty-promise-4/src/test/groovy/NettyPromiseTest.groovy rename to dd-java-agent/instrumentation/netty/netty-promise-4.0/src/test/groovy/NettyPromiseTest.groovy diff --git a/dd-java-agent/instrumentation/opensearch/transport/build.gradle b/dd-java-agent/instrumentation/opensearch/transport/build.gradle index 17233a7bed3..20881e2832e 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/transport/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:opensearch:rest') testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'org.opensearch.plugin', name: 'transport-netty4-client', version: '1.0.0' testImplementation group: 'org.opensearch.client', name: 'transport', version: '1.0.0' diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle index e18dcff63a0..9bb39e74eb6 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/build.gradle @@ -31,8 +31,8 @@ dependencies { testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts') // These are to ensure cross compatibility - testImplementation project(':dd-java-agent:instrumentation:netty-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle index 9c41de235a1..9a01b77a250 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/build.gradle @@ -36,8 +36,8 @@ dependencies { testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts') // These are to ensure cross compatibility - testImplementation project(':dd-java-agent:instrumentation:netty-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle index 82d9d083762..60fb3612412 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/build.gradle @@ -37,8 +37,8 @@ dependencies { testImplementation project(path: ':dd-java-agent:instrumentation:play-ws:play-ws-common', configuration: 'testArtifacts') // These are to ensure cross compatibility - testImplementation project(':dd-java-agent:instrumentation:netty-4.0') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/dd-java-agent/instrumentation/play/play-2.3/build.gradle b/dd-java-agent/instrumentation/play/play-2.3/build.gradle index 50411569b6e..325f1a999f2 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.3/build.gradle @@ -41,7 +41,7 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.3.9' - testImplementation project(':dd-java-agent:instrumentation:netty-3.8') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8') testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testImplementation project(':dd-java-agent:instrumentation:scala-concurrent') testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10') diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index 38c7af399e4..8a6372a1d74 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -77,8 +77,8 @@ dependencies { main_play25CompileOnly project(':dd-java-agent:agent-tooling') main_play25CompileOnly project(':dd-java-agent:agent-bootstrap') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1') testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle index 518fb0c7b79..a98c0267ef7 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.6/build.gradle @@ -104,8 +104,8 @@ dependencies { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-4.1') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1') testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0') testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-actor-2.5') testRuntimeOnly project(':dd-java-agent:instrumentation:scala-concurrent') diff --git a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle index 8c85422c21a..38ed3cbd41f 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/build.gradle +++ b/dd-java-agent/instrumentation/ratpack-1.5/build.gradle @@ -17,7 +17,7 @@ dependencies { compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0' compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0' testImplementation 'com.sun.activation:jakarta.activation:1.2.2' testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') diff --git a/dd-java-agent/instrumentation/reactor-netty-1/build.gradle b/dd-java-agent/instrumentation/reactor-netty-1/build.gradle index 9d0a003ed03..c5b0e2920ee 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1/build.gradle +++ b/dd-java-agent/instrumentation/reactor-netty-1/build.gradle @@ -20,13 +20,13 @@ addTestSuite('latestDepTest') dependencies { compileOnly group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: '1.0.0' // This instrumentation interacts with the netty instrumentation - implementation project(':dd-java-agent:instrumentation:netty-4.1-shared') + implementation project(':dd-java-agent:instrumentation:netty:netty-common') testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: '1.0.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') latestDepTestImplementation group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: '+' - latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1') + latestDepTestImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') } diff --git a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle index 88351ec30d1..f994d3afda5 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle +++ b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle @@ -42,7 +42,7 @@ dependencies { nettyTestImplementation group: 'io.netty', name: 'netty', version: '3.8.0.Final' // upgrade netty to a version we support nettyTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-netty', version :'3.0.0.Final' - nettyTestImplementation project(':dd-java-agent:instrumentation:netty-3.8') + nettyTestImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8') def jettyVersion = '8.2.0.v20160908' jettyAsyncTestImplementation group: 'org.jboss.resteasy', name: 'async-http-servlet-3.0', version :'3.0.0.Final' diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index 849f6ec8412..6372dc0c1d9 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -81,8 +81,8 @@ dependencies { compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4' testImplementation project(':dd-java-agent:instrumentation:trace-annotation') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:netty-promise-4') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1') diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index d4cbd5d4dba..16edde016a4 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -30,8 +30,8 @@ iastTest { dependencies { testImplementation project(':dd-java-agent:instrumentation:spring:spring-webflux:spring-webflux-5.0') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') - testImplementation project(':dd-java-agent:instrumentation:netty-promise-4') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0') testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams') testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1') diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle index 13aac4161cc..518121a3b1f 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle @@ -22,7 +22,7 @@ latestDepForkedTest { } dependencies { - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.4') testImplementation project(path: '::dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-3.4', configuration: 'testArtifacts') diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle index ddcf8949f7f..50b92e36cd3 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle @@ -36,7 +36,7 @@ artifacts { dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.4.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle index 1a42be5e4cf..d00cc7f3b1e 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle @@ -36,7 +36,7 @@ artifacts { dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.5.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation group: 'io.vertx', name: 'vertx-web', version: '3.5.0' diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle index 7228a5d5199..106cc9860ef 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.9/build.gradle @@ -30,7 +30,7 @@ artifacts { dependencies { compileOnly group: 'io.vertx', name: 'vertx-web', version: '3.9.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') @@ -38,6 +38,6 @@ dependencies { testImplementation group: 'io.vertx', name: 'vertx-web-client', version: '3.9.0' testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-buffer-4.0') testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle index dd76d136d16..f5d9ca878a3 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle @@ -37,11 +37,11 @@ artifacts { } dependencies { - api project(':dd-java-agent:instrumentation:netty-4.1-shared') + api project(':dd-java-agent:instrumentation:netty:netty-common') compileOnly group: 'io.vertx', name: 'vertx-web', version: '4.0.0' - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') @@ -52,7 +52,7 @@ dependencies { testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-buffer-4.0') latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '4.+' latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '4.+' diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle index ecd3e7a4416..0334e97d2e5 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle @@ -36,11 +36,11 @@ artifacts { final vertxVersion = '5.0.0.CR3' dependencies { - api project(':dd-java-agent:instrumentation:netty-4.1-shared') + api project(':dd-java-agent:instrumentation:netty:netty-common') compileOnly group: 'io.vertx', name: 'vertx-web', version: vertxVersion - testImplementation project(':dd-java-agent:instrumentation:netty-4.1') + testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1') testImplementation project(':dd-java-agent:instrumentation:vertx:vertx-web:vertx-web-4.0') testImplementation project(':dd-java-agent:instrumentation:trace-annotation') @@ -53,7 +53,7 @@ dependencies { testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') - testRuntimeOnly project(':dd-java-agent:instrumentation:netty-buffer-4') + testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-buffer-4.0') latestDepTestImplementation group: 'io.vertx', name: 'vertx-web', version: '+' latestDepTestImplementation group: 'io.vertx', name: 'vertx-web-client', version: '+' diff --git a/settings.gradle.kts b/settings.gradle.kts index e2ef09486ac..33d3700c49e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -464,13 +464,13 @@ include( ":dd-java-agent:instrumentation:mongo:driver-3.3-async-test", ":dd-java-agent:instrumentation:mongo:driver-3.10-sync-test", ":dd-java-agent:instrumentation:mule-4.5", - ":dd-java-agent:instrumentation:netty-3.8", - ":dd-java-agent:instrumentation:netty-4.0", - ":dd-java-agent:instrumentation:netty-4.1-shared", - ":dd-java-agent:instrumentation:netty-4.1", - ":dd-java-agent:instrumentation:netty-buffer-4", - ":dd-java-agent:instrumentation:netty-concurrent-4", - ":dd-java-agent:instrumentation:netty-promise-4", + ":dd-java-agent:instrumentation:netty:netty-3.8", + ":dd-java-agent:instrumentation:netty:netty-4.0", + ":dd-java-agent:instrumentation:netty:netty-common", + ":dd-java-agent:instrumentation:netty:netty-4.1", + ":dd-java-agent:instrumentation:netty:netty-buffer-4.0", + ":dd-java-agent:instrumentation:netty:netty-concurrent-4.0", + ":dd-java-agent:instrumentation:netty:netty-promise-4.0", ":dd-java-agent:instrumentation:okhttp-2", ":dd-java-agent:instrumentation:okhttp-3", ":dd-java-agent:instrumentation:ognl-appsec", From a08cd6e0ca56f78ed47e5f82bb9f45b36f7ff485 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Tue, 16 Sep 2025 15:13:48 +0200 Subject: [PATCH 3/3] Group jetty modules --- .../apache-httpclient-4.0/build.gradle | 2 +- .../armeria/armeria-jetty-1.24/build.gradle | 12 +++---- .../instrumentation/cxf-2.1/build.gradle | 10 +++--- .../instrumentation/jersey/build.gradle | 6 ++-- .../jetty-appsec-7.0}/build.gradle | 0 .../jetty-appsec-7.0}/gradle.lockfile | 0 ...questExtractParametersInstrumentation.java | 0 .../jetty70/UrlEncodedInstrumentation.java | 0 .../jetty-appsec-8.1.3/build.gradle | 0 .../jetty-appsec-8.1.3/gradle.lockfile | 0 .../jetty8/ParameterCollector.java | 0 .../RequestGetPartsInstrumentation.java | 0 .../jetty-appsec-9.2/build.gradle | 0 .../jetty-appsec-9.2/gradle.lockfile | 0 ...tractContentParametersInstrumentation.java | 0 .../jetty-appsec-9.3/build.gradle | 0 .../jetty-appsec-9.3/gradle.lockfile | 0 ...tractContentParametersInstrumentation.java | 0 .../{ => jetty}/jetty-client/build.gradle | 0 .../{ => jetty}/jetty-client/gradle.lockfile | 0 .../jetty-client-10.0/build.gradle | 6 ++-- .../jetty-client-10.0/gradle.lockfile | 0 .../JettyClientInstrumentation.java | 0 .../jetty_client10/JettyClientDecorator.java | 0 .../jetty_client10/SendAdvice.java | 0 .../SpanFinishingCompleteListener.java | 0 .../src/test/groovy/JettyClientTest.groovy | 0 .../jetty-client-12.0/build.gradle | 6 ++-- .../jetty-client-12.0/gradle.lockfile | 0 ...FutureResponseListenerInstrumentation.java | 0 .../JettyHttpClientInstrumentation.java | 0 .../jetty_client12/CallbackWrapper.java | 0 .../jetty_client12/HeadersInjectAdapter.java | 0 .../jetty_client12/JettyClientDecorator.java | 0 .../jetty_client12/LinkListenerAdvice.java | 0 .../jetty_client12/RequestCreateAdvice.java | 0 .../jetty_client12/SendAdvice.java | 0 .../SpanFinishingCompleteListener.java | 0 .../jetty_client12/WrapListenerAdvice.java | 0 .../src/test/groovy/JettyClientTest.groovy | 0 .../jetty-client-9.1/build.gradle | 4 +-- .../jetty-client-9.1/gradle.lockfile | 0 ...FutureResponseListenerInstrumentation.java | 0 .../JettyAddListenerInstrumentation.java | 0 .../jetty_client91/JettyClientDecorator.java | 0 .../JettyClientInstrumentation.java | 0 .../SpanFinishingCompleteListener.java | 0 .../src/test/groovy/JettyClientTest.groovy | 0 .../jetty-client-common/build.gradle | 0 .../jetty-client-common/gradle.lockfile | 0 .../jetty_client/CallbackWrapper.java | 0 .../jetty_client/HeadersInjectAdapter.java | 0 .../{ => jetty}/jetty-common/build.gradle | 0 .../{ => jetty}/jetty-common/gradle.lockfile | 0 .../jetty/ConnectionHandleRequestVisitor.java | 0 .../jetty/DelayLoadsMethodVisitor.java | 0 .../jetty/HandleRequestVisitor.java | 0 .../jetty/JettyBlockResponseFunction.java | 0 .../jetty/JettyBlockingHelper.java | 0 .../MergeConsecutiveFramesMethodVisitor.java | 0 .../jetty9/DelayCertainInsMethodVisitor.java | 0 .../instrumentation/jetty9/HandleVisitor.java | 0 .../jetty9/HttpChannelHandleVisitor.java | 0 .../JettyBlockingHelperSpecification.groovy | 0 .../jetty-server-11.0}/build.gradle | 10 +++--- .../jetty-server-11.0}/gradle.lockfile | 0 .../jetty11/JettyServerInstrumentation.java | 0 .../jetty11/RequestInstrumentation.java | 0 .../jetty11/ExtractAdapter.java | 0 .../jetty11/JettyDecorator.java | 0 .../jetty11/JettyServerAdvice.java | 0 .../jetty11/RequestURIDataAdapter.java | 0 .../jetty11/SetContextPathAdvice.java | 0 .../jetty11/SetRequestedSessionIdAdvice.java | 0 .../test/groovy/HttpChannelAppSecTest.groovy | 0 .../groovy/Jetty11InactiveAppSecTest.groovy | 0 .../src/test/groovy/Jetty11Test.groovy | 0 .../test/groovy/JettyAsyncHandlerTest.groovy | 0 .../testFixtures/groovy/JettyServer.groovy | 0 .../jetty-server-12.0}/build.gradle | 12 +++---- .../jetty-server-12.0}/gradle.lockfile | 0 ...AbstractSessionManagerInstrumentation.java | 0 .../ContextHandlerInstrumentation.java | 0 .../jetty12/JettyServerInstrumentation.java | 0 .../jetty12/ExtractAdapter.java | 0 .../jetty12/JettyDecorator.java | 0 .../jetty12/JettyRunnableWrapper.java | 0 .../jetty12/JettyServerAdvice.java | 0 .../jetty12/RequestURIDataAdapter.java | 0 .../ResolveRequestedSessionIdAdvice.java | 0 .../jetty12/SetContextPathAdvice.java | 0 .../src/test/ee10/groovy/Jetty12Test.groovy | 0 .../src/test/ee10/groovy/JettyServer.groovy | 0 .../src/test/ee8/groovy/Jetty12Test.groovy | 0 .../src/test/ee8/groovy/JettyServer.groovy | 0 .../src/test/ee9/groovy/Jetty12Test.groovy | 0 .../src/test/ee9/groovy/JettyServer.groovy | 0 .../jetty-server-7.0}/build.gradle | 6 ++-- .../jetty-server-7.0}/gradle.lockfile | 0 .../jetty70/ExtractAdapter.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../jetty70/JettyDecorator.java | 0 .../JettyGeneratorInstrumentation.java | 0 .../jetty70/JettyServerInstrumentation.java | 0 .../jetty70/RequestInstrumentation.java | 0 .../jetty70/RequestURIDataAdapter.java | 0 .../jetty70/ServerHandleInstrumentation.java | 0 .../src/test/groovy/Jetty70Test.groovy | 0 .../JettyContinuationHandlerTest.groovy | 0 .../jetty-server-7.6}/build.gradle | 6 ++-- .../jetty-server-7.6}/gradle.lockfile | 0 .../jetty76/ExtractAdapter.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../jetty76/JettyDecorator.java | 0 .../JettyGeneratorInstrumentation.java | 0 .../jetty76/JettyServerInstrumentation.java | 0 .../jetty76/RequestInstrumentation.java | 0 .../jetty76/RequestURIDataAdapter.java | 0 .../jetty76/ServerHandleInstrumentation.java | 0 .../src/test/groovy/Jetty76Test.groovy | 0 .../JettyContinuationHandlerTest.groovy | 0 .../jetty-server-9.0}/build.gradle | 18 +++++------ .../jetty-server-9.0}/gradle.lockfile | 0 .../jetty10/DispatchableInstrumentation.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../jetty10/JettyServerInstrumentation.java | 0 .../jetty10/RequestInstrumentation.java | 0 .../jetty10/ServerHandleInstrumentation.java | 0 .../jetty9/ExtractAdapter.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../jetty9/JettyDecorator.java | 0 .../jetty9/JettyServerInstrumentation.java | 0 .../jetty9/RequestInstrumentation.java | 0 .../jetty9/RequestURIDataAdapter.java | 0 .../jetty9/ServerHandleInstrumentation.java | 0 .../WebSocketSessionInstrumentation.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../JettyCommitResponseInstrumentation.java | 0 .../jetty10/DispatchableAdvice.java | 0 .../jetty10/ExtractAdapter.java | 0 .../instrumentation/jetty10/HandleAdvice.java | 0 .../jetty10/HandleExceptionAdvice.java | 0 .../jetty10/JettyCommitResponseHelper.java | 0 .../jetty10/JettyDecorator.java | 0 .../jetty10/JettyOnCommitBlockingHelper.java | 0 .../instrumentation/jetty10/ResetAdvice.java | 0 .../jetty10/SendResponseCbAdvice.java | 0 .../jetty10/ServerHandleAdvice.java | 0 .../jetty10/SetContextPathAdvice.java | 0 .../jetty10/SetRequestedSessionIdAdvice.java | 0 .../jetty10/SetServletPathAdvice.java | 0 .../jetty904/JettyCommitResponseHelper.java | 0 .../jetty904/JettyOnCommitBlockingHelper.java | 0 .../jetty904/SendResponseCbAdvice.java | 0 .../jetty93/JettyCommitResponseHelper.java | 0 .../jetty93/JettyOnCommitBlockingHelper.java | 0 .../jetty93/SendResponseCbAdvice.java | 0 .../jetty9421/JettyCommitResponseHelper.java | 0 .../JettyOnCommitBlockingHelper.java | 0 .../jetty9421/SendResponseCbAdvice.java | 0 .../jetty9/Jetty9InactiveAppSecTest.groovy | 0 .../instrumentation/jetty9/Jetty9Test.groovy | 0 .../JettyContinuationHandlerTest.groovy | 0 .../groovy/test/JettyServer.groovy | 0 .../groovy/test/TestHandler.groovy | 0 .../jetty-util-9.4.31}/build.gradle | 0 .../jetty-util-9.4.31}/gradle.lockfile | 0 .../QueuedThreadPoolInstrumentation.java | 0 .../JettyExecutorInstrumentationTest.groovy | 0 .../src/test/java/JavaAsyncChild.java | 0 .../resteasy-appsec/build.gradle | 2 +- .../instrumentation/servlet/build.gradle | 2 +- .../servlet/request-2/build.gradle | 6 ++-- .../servlet/request-3/build.gradle | 8 ++--- .../sparkjava-2.3/build.gradle | 2 +- settings.gradle.kts | 32 +++++++++---------- 177 files changed, 75 insertions(+), 75 deletions(-) rename dd-java-agent/instrumentation/{jetty-appsec-7 => jetty/jetty-appsec/jetty-appsec-7.0}/build.gradle (100%) rename dd-java-agent/instrumentation/{jetty-appsec-7 => jetty/jetty-appsec/jetty-appsec-7.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-appsec-7 => jetty/jetty-appsec/jetty-appsec-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-appsec-7 => jetty/jetty-appsec/jetty-appsec-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-8.1.3/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-8.1.3/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.2/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.2/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.3/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.3/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty/jetty-appsec}/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/build.gradle (94%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-10.0/src/test/groovy/JettyClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/build.gradle (92%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/LinkListenerAdvice.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/build.gradle (93%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-9.1/src/test/groovy/JettyClientTest.groovy (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-common/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-common/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/build.gradle (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java (100%) rename dd-java-agent/instrumentation/{ => jetty}/jetty-common/src/test/groovy/datadog/trace/instrumentation/jetty/JettyBlockingHelperSpecification.groovy (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/build.gradle (92%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/test/groovy/HttpChannelAppSecTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/test/groovy/Jetty11InactiveAppSecTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/test/groovy/Jetty11Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/test/groovy/JettyAsyncHandlerTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-11 => jetty/jetty-server/jetty-server-11.0}/src/testFixtures/groovy/JettyServer.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/build.gradle (92%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee10/groovy/Jetty12Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee10/groovy/JettyServer.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee8/groovy/Jetty12Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee8/groovy/JettyServer.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee9/groovy/Jetty12Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-12 => jetty/jetty-server/jetty-server-12.0}/src/test/ee9/groovy/JettyServer.groovy (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/build.gradle (88%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/test/groovy/Jetty70Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-7.0 => jetty/jetty-server/jetty-server-7.0}/src/test/groovy/JettyContinuationHandlerTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/build.gradle (88%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/test/groovy/Jetty76Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-7.6 => jetty/jetty-server/jetty-server-7.6}/src/test/groovy/JettyContinuationHandlerTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/build.gradle (95%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ResetAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/test/groovy/datadog/trace/instrumentation/jetty9/JettyContinuationHandlerTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/testFixtures/groovy/test/JettyServer.groovy (100%) rename dd-java-agent/instrumentation/{jetty-9 => jetty/jetty-server/jetty-server-9.0}/src/testFixtures/groovy/test/TestHandler.groovy (100%) rename dd-java-agent/instrumentation/{jetty-util => jetty/jetty-util-9.4.31}/build.gradle (100%) rename dd-java-agent/instrumentation/{jetty-util => jetty/jetty-util-9.4.31}/gradle.lockfile (100%) rename dd-java-agent/instrumentation/{jetty-util => jetty/jetty-util-9.4.31}/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jetty-util => jetty/jetty-util-9.4.31}/src/test/groovy/JettyExecutorInstrumentationTest.groovy (100%) rename dd-java-agent/instrumentation/{jetty-util => jetty/jetty-util-9.4.31}/src/test/java/JavaAsyncChild.java (100%) diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index 79fa8ba465a..469aff39b1c 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -38,7 +38,7 @@ dependencies { // to instrument the integration test iastIntegrationTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures') iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-9')) + iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang')) diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle index f643b40e78e..a45616567a1 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle @@ -72,18 +72,18 @@ dependencies { exclude group: 'org.slf4j', module: 'slf4j-api' } testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) - testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-9')) + testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5')) - testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-11')) + testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')) testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } // always mix everything up - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') - testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util')) - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-9.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') + testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')) + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3') diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle index 20bb0d04ca5..1ff25265864 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/build.gradle +++ b/dd-java-agent/instrumentation/cxf-2.1/build.gradle @@ -61,11 +61,11 @@ dependencies { testCompileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1' testRuntimeOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' testRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.0') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.6') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-12') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0') testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation') testRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2') testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3') diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle index e256037374d..d91c2bff82a 100644 --- a/dd-java-agent/instrumentation/jersey/build.gradle +++ b/dd-java-agent/instrumentation/jersey/build.gradle @@ -54,7 +54,7 @@ dependencies { jersey2JettyTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jersey2Version jersey2JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' jersey2JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') + jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec') jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2') @@ -69,8 +69,8 @@ dependencies { jersey3JettyTestRuntimeOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jersey3Version jersey3JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' jersey3JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' - jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') - jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11') + jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') + jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0') jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec') jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-3-appsec') jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3') diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-7/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-7/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestExtractParametersInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-7/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-7.0/src/main/java/datadog/trace/instrumentation/jetty70/UrlEncodedInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-8.1.3/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-8.1.3/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/ParameterCollector.java diff --git a/dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-8.1.3/src/main/java/datadog/trace/instrumentation/jetty8/RequestGetPartsInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.2/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.2/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.2/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.2/src/main/java/datadog/trace/instrumentation/jetty92/RequestExtractContentParametersInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.3/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.3/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.3/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-appsec/jetty-appsec-9.3/src/main/java/datadog/trace/instrumentation/jetty93/RequestExtractContentParametersInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-client/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-client/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-client/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle similarity index 94% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle index ab6e34c6d3e..99bcf8dd8d0 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/build.gradle @@ -33,16 +33,16 @@ compileMain_java11Java.configure { } dependencies { main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0' - main_java11Implementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-common')) { + main_java11Implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) { transitive = false } //because contains some instrumentation that still apply - testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1')) testImplementation(project(path:':dd-java-agent:testing', 'configuration': 'shadow')) { // explicitly declared below. exclude group: 'org.eclipse.jetty' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0' testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.0.0' jetty10LatestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '10.+' diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java/datadog/trace/instrumentation/jetty_client10/JettyClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/JettyClientDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SpanFinishingCompleteListener.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/test/groovy/JettyClientTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/test/groovy/JettyClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/test/groovy/JettyClientTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-10.0/src/test/groovy/JettyClientTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle similarity index 92% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle index d6b8994dce2..d22928973ac 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle @@ -28,14 +28,14 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late dependencies { main_java17CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.0.0' // to test conflicts - testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1')) - testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-10.0')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-10.0')) testImplementation(project(path:':dd-java-agent:testing', 'configuration': 'shadow')) { // explicitly declared below. exclude group: 'org.eclipse.jetty' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.0.0' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.+' } diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/FutureResponseListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java/datadog/trace/instrumentation/jetty_client12/JettyHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/HeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/JettyClientDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/LinkListenerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/LinkListenerAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/LinkListenerAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/LinkListenerAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/RequestCreateAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SpanFinishingCompleteListener.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/WrapListenerAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle similarity index 93% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle index 18579cc66fb..18d30823263 100644 --- a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/build.gradle @@ -48,14 +48,14 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115' - implementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-common')) { + implementation(project(':dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common')) { transitive = false } testImplementation(project(':dd-java-agent:instrumentation-testing')) { // explicitly declared below. exclude group: 'org.eclipse.jetty' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.1.0.v20131115' testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.1.0.v20131115' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-client', version: '9.+' diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/FutureResponseListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyAddListenerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/SpanFinishingCompleteListener.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/test/groovy/JettyClientTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/test/groovy/JettyClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/test/groovy/JettyClientTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-9.1/src/test/groovy/JettyClientTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-common/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-common/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/HeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-common/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-common/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-common/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/ConnectionHandleRequestVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/DelayLoadsMethodVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/HandleRequestVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockResponseFunction.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/MergeConsecutiveFramesMethodVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/DelayCertainInsMethodVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HandleVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java b/dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java rename to dd-java-agent/instrumentation/jetty/jetty-common/src/main/java/datadog/trace/instrumentation/jetty9/HttpChannelHandleVisitor.java diff --git a/dd-java-agent/instrumentation/jetty-common/src/test/groovy/datadog/trace/instrumentation/jetty/JettyBlockingHelperSpecification.groovy b/dd-java-agent/instrumentation/jetty/jetty-common/src/test/groovy/datadog/trace/instrumentation/jetty/JettyBlockingHelperSpecification.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-common/src/test/groovy/datadog/trace/instrumentation/jetty/JettyBlockingHelperSpecification.groovy rename to dd-java-agent/instrumentation/jetty/jetty-common/src/test/groovy/datadog/trace/instrumentation/jetty/JettyBlockingHelperSpecification.groovy diff --git a/dd-java-agent/instrumentation/jetty-11/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle similarity index 92% rename from dd-java-agent/instrumentation/jetty-11/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle index 9b4c0b31be4..1294c654a37 100644 --- a/dd-java-agent/instrumentation/jetty-11/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle @@ -33,8 +33,8 @@ dependencies { main_java11CompileOnly ("org.eclipse.jetty:jetty-server:11.0.0") { exclude group: 'org.slf4j', module: 'slf4j-api' } - main_java11Implementation project(':dd-java-agent:instrumentation:jetty-common') - implementation project(':dd-java-agent:instrumentation:jetty-common') + main_java11Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') + implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') testFixturesCompileOnly "org.eclipse.jetty:jetty-server:11.0.0" testFixturesCompileOnly "org.eclipse.jetty:jetty-servlet:11.0.0" @@ -59,10 +59,10 @@ dependencies { testImplementation ("org.eclipse.jetty.websocket:websocket-jakarta-server:11.0.0") { exclude group: 'org.slf4j', module: 'slf4j-api' } - testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5')) testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0') @@ -81,7 +81,7 @@ dependencies { // just to mix things up, see if there's no conflict latestDepTestRuntimeOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1' - latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') + latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') } idea { diff --git a/dd-java-agent/instrumentation/jetty-11/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java/datadog/trace/instrumentation/jetty11/RequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/RequestURIDataAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetContextPathAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/main/java11/datadog/trace/instrumentation/jetty11/SetRequestedSessionIdAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/HttpChannelAppSecTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/HttpChannelAppSecTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/test/groovy/HttpChannelAppSecTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/HttpChannelAppSecTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11InactiveAppSecTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11InactiveAppSecTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11InactiveAppSecTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11InactiveAppSecTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/test/groovy/Jetty11Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/Jetty11Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/test/groovy/JettyAsyncHandlerTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/test/groovy/JettyAsyncHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/testFixtures/groovy/JettyServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-11/src/testFixtures/groovy/JettyServer.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/src/testFixtures/groovy/JettyServer.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle similarity index 92% rename from dd-java-agent/instrumentation/jetty-12/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle index 3ed11dcdb1c..d2b57296201 100644 --- a/dd-java-agent/instrumentation/jetty-12/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle @@ -59,8 +59,8 @@ dependencies { main_java17CompileOnly ("org.eclipse.jetty:jetty-session:12.0.0") { exclude group: 'org.slf4j', module: 'slf4j-api' } - main_java17Implementation project(':dd-java-agent:instrumentation:jetty-common') - implementation project(':dd-java-agent:instrumentation:jetty-common') + main_java17Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') + implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') // Don't want to conflict with jetty from the test server. testImplementation(project(':dd-java-agent:instrumentation-testing')) { @@ -70,7 +70,7 @@ dependencies { exclude group: 'org.slf4j', module: 'slf4j-api' } - testImplementation(project(':dd-java-agent:instrumentation:jetty-appsec-9.3')) + testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5')) testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0') @@ -79,10 +79,10 @@ dependencies { testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11") testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12") testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5') - testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-11')) - testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')) + testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')) latestDepTestImplementation ("org.eclipse.jetty:jetty-server:12.+") { exclude group: 'org.slf4j', module: 'slf4j-api' diff --git a/dd-java-agent/instrumentation/jetty-12/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/AbstractSessionManagerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/ContextHandlerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java/datadog/trace/instrumentation/jetty12/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/RequestURIDataAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/ResolveRequestedSessionIdAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/SetContextPathAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee10/groovy/Jetty12Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee10/groovy/Jetty12Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee10/groovy/Jetty12Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee10/groovy/Jetty12Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee10/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee10/groovy/JettyServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee10/groovy/JettyServer.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee10/groovy/JettyServer.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee8/groovy/Jetty12Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/Jetty12Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee8/groovy/Jetty12Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee8/groovy/JettyServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee8/groovy/JettyServer.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee8/groovy/JettyServer.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee9/groovy/Jetty12Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee9/groovy/Jetty12Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee9/groovy/Jetty12Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee9/groovy/Jetty12Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-12/src/test/ee9/groovy/JettyServer.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee9/groovy/JettyServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-12/src/test/ee9/groovy/JettyServer.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/ee9/groovy/JettyServer.groovy diff --git a/dd-java-agent/instrumentation/jetty-7.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle similarity index 88% rename from dd-java-agent/instrumentation/jetty-7.0/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle index 8667f3cbc25..8137663c16b 100644 --- a/dd-java-agent/instrumentation/jetty-7.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle @@ -14,20 +14,20 @@ addTestSuiteForDir('latestDepForkedTest', 'test') dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' - implementation project(':dd-java-agent:instrumentation:jetty-common') + implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') // Don't want to conflict with jetty from the test server. testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005' testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.0.0.v20091005' testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-7') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2') latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.+' diff --git a/dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyGeneratorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/RequestURIDataAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/main/java/datadog/trace/instrumentation/jetty70/ServerHandleInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/test/groovy/Jetty70Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/Jetty70Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/test/groovy/Jetty70Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/JettyContinuationHandlerTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/test/groovy/JettyContinuationHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.0/src/test/groovy/JettyContinuationHandlerTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/src/test/groovy/JettyContinuationHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-7.6/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle similarity index 88% rename from dd-java-agent/instrumentation/jetty-7.6/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle index d4fdc0fd6bd..7b108c80c68 100644 --- a/dd-java-agent/instrumentation/jetty-7.6/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle @@ -14,20 +14,20 @@ addTestSuiteForDir('latestDepForkedTest', 'test') dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127' - implementation project(':dd-java-agent:instrumentation:jetty-common') + implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') // Don't want to conflict with jetty from the test server. testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127' testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.6.0.v20120127' testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.6.0.v20120127' testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-7') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.+' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.+' diff --git a/dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyGeneratorInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/RequestURIDataAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/main/java/datadog/trace/instrumentation/jetty76/ServerHandleInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty76Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/Jetty76Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/Jetty76Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/JettyContinuationHandlerTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/JettyContinuationHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-7.6/src/test/groovy/JettyContinuationHandlerTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/src/test/groovy/JettyContinuationHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-9/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle similarity index 95% rename from dd-java-agent/instrumentation/jetty-9/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle index ed8051b5cf4..34722f534a2 100644 --- a/dd-java-agent/instrumentation/jetty-9/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle @@ -124,7 +124,7 @@ tasks.named("compileLatestDepForkedTestGroovy").configure { dependencies { compileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.0.v20130308' - implementation project(':dd-java-agent:instrumentation:jetty-common') + implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') main_jetty904CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.0.4.v20130625' main_jetty904CompileOnly project(':internal-api') @@ -158,7 +158,7 @@ dependencies { main_jetty10CompileOnly project(':internal-api') main_jetty10CompileOnly project(':dd-java-agent:agent-tooling') main_jetty10CompileOnly project(':dd-java-agent:agent-bootstrap') - main_jetty10Implementation project(':dd-java-agent:instrumentation:jetty-common') + main_jetty10Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common') main_jetty10CompileOnly files("$project.buildDir/classes/java/raw") { builtBy = ['compileJava'] } @@ -170,7 +170,7 @@ dependencies { testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') String jetty9Version = '9.0.0.v20130308' testFixturesCompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: jetty9Version @@ -179,9 +179,9 @@ dependencies { testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: jetty9Version testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jetty9Version testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: jetty9Version - testImplementation project(':dd-java-agent:instrumentation:jetty-appsec-7') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2') - testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-8.1.3') + testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0') testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10') @@ -193,14 +193,14 @@ dependencies { jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.2.30.v20200428' jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.2.30.v20200428' jetty92TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.2.30.v20200428' - jetty92TestImplementation project(':dd-java-agent:instrumentation:jetty-appsec-9.2') + jetty92TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2') jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.15.v20190215' jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.15.v20190215' jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.4.15.v20190215' jetty94TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.4.15.v20190215' - jetty94TestImplementation project(':dd-java-agent:instrumentation:jetty-appsec-9.3') + jetty94TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' @@ -208,13 +208,13 @@ dependencies { latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.+' latestDepJetty9TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.+' - latestDepJetty9TestImplementation project(':dd-java-agent:instrumentation:jetty-appsec-9.3') + latestDepJetty9TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+' latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+' latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+' - latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty-appsec-9.3') + latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3')) } configurations.getByName('latestDepForkedTestRuntimeClasspath').resolutionStrategy { diff --git a/dd-java-agent/instrumentation/jetty-9/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/RequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/ServerHandleInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/RequestURIDataAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/ServerHandleInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty904/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty93/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9421/JettyCommitResponseInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/DispatchableAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ExtractAdapter.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleExceptionAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyCommitResponseHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyDecorator.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/JettyOnCommitBlockingHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ResetAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ResetAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ResetAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ResetAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SendResponseCbAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/ServerHandleAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetContextPathAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetRequestedSessionIdAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/SetServletPathAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyCommitResponseHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/JettyOnCommitBlockingHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty904/datadog/trace/instrumentation/jetty904/SendResponseCbAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyCommitResponseHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/JettyOnCommitBlockingHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty93/datadog/trace/instrumentation/jetty93/SendResponseCbAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyCommitResponseHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/JettyOnCommitBlockingHelper.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java_jetty9421/datadog/trace/instrumentation/jetty9421/SendResponseCbAdvice.java diff --git a/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9InactiveAppSecTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/Jetty9Test.groovy diff --git a/dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/JettyContinuationHandlerTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/JettyContinuationHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/test/groovy/datadog/trace/instrumentation/jetty9/JettyContinuationHandlerTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/test/groovy/datadog/trace/instrumentation/jetty9/JettyContinuationHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-9/src/testFixtures/groovy/test/JettyServer.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/testFixtures/groovy/test/JettyServer.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/testFixtures/groovy/test/JettyServer.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/testFixtures/groovy/test/JettyServer.groovy diff --git a/dd-java-agent/instrumentation/jetty-9/src/testFixtures/groovy/test/TestHandler.groovy b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/testFixtures/groovy/test/TestHandler.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-9/src/testFixtures/groovy/test/TestHandler.groovy rename to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/testFixtures/groovy/test/TestHandler.groovy diff --git a/dd-java-agent/instrumentation/jetty-util/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/jetty-util/build.gradle rename to dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/build.gradle diff --git a/dd-java-agent/instrumentation/jetty-util/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/jetty-util/gradle.lockfile rename to dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/gradle.lockfile diff --git a/dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-util/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java rename to dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/main/java/datadog/trace/instrumentation/jetty_util/QueuedThreadPoolInstrumentation.java diff --git a/dd-java-agent/instrumentation/jetty-util/src/test/groovy/JettyExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/groovy/JettyExecutorInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/jetty-util/src/test/groovy/JettyExecutorInstrumentationTest.groovy rename to dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/groovy/JettyExecutorInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/jetty-util/src/test/java/JavaAsyncChild.java b/dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java similarity index 100% rename from dd-java-agent/instrumentation/jetty-util/src/test/java/JavaAsyncChild.java rename to dd-java-agent/instrumentation/jetty/jetty-util-9.4.31/src/test/java/JavaAsyncChild.java diff --git a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle index f994d3afda5..2cf0449164c 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle +++ b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle @@ -49,5 +49,5 @@ dependencies { jettyAsyncTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: jettyVersion jettyAsyncTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jettyVersion jettyAsyncTestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: jettyVersion - jettyAsyncTestImplementation project(':dd-java-agent:instrumentation:jetty-7.6') + jettyAsyncTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6') } diff --git a/dd-java-agent/instrumentation/servlet/build.gradle b/dd-java-agent/instrumentation/servlet/build.gradle index 31c6abdc9ac..394be383158 100644 --- a/dd-java-agent/instrumentation/servlet/build.gradle +++ b/dd-java-agent/instrumentation/servlet/build.gradle @@ -29,5 +29,5 @@ dependencies { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') } diff --git a/dd-java-agent/instrumentation/servlet/request-2/build.gradle b/dd-java-agent/instrumentation/servlet/request-2/build.gradle index 2a4049edcf0..469a2e147ff 100644 --- a/dd-java-agent/instrumentation/servlet/request-2/build.gradle +++ b/dd-java-agent/instrumentation/servlet/request-2/build.gradle @@ -37,10 +37,10 @@ dependencies { testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-7.0') // See if there's any conflicts. - testImplementation project(':dd-java-agent:instrumentation:jetty-7.6') // See if there's any conflicts. + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0') // See if there's any conflicts. + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6') // See if there's any conflicts. testImplementation project(':dd-java-agent:instrumentation:servlet') - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005' testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005' diff --git a/dd-java-agent/instrumentation/servlet/request-3/build.gradle b/dd-java-agent/instrumentation/servlet/request-3/build.gradle index f8ff0f25e5b..ff395baacca 100644 --- a/dd-java-agent/instrumentation/servlet/request-3/build.gradle +++ b/dd-java-agent/instrumentation/servlet/request-3/build.gradle @@ -46,14 +46,14 @@ dependencies { testImplementation(project(':dd-java-agent:instrumentation-testing')) { exclude group: 'org.eclipse.jetty', module: 'jetty-server' } - testImplementation project(':dd-java-agent:instrumentation:jetty-7.0') // See if there's any conflicts. - testImplementation project(':dd-java-agent:instrumentation:jetty-7.6') // See if there's any conflicts. - testImplementation project(':dd-java-agent:instrumentation:jetty-9') // See if there's any conflicts. + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0') // See if there's any conflicts. + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6') // See if there's any conflicts. + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') // See if there's any conflicts. testImplementation project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5') // See if there's any conflicts. testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0') testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0') testImplementation project(':dd-java-agent:instrumentation:servlet') - testImplementation project(':dd-java-agent:instrumentation:jetty-util') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.2.0.v20160908' testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.2.0.v20160908' testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41' diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/build.gradle b/dd-java-agent/instrumentation/sparkjava-2.3/build.gradle index 0ba0d1c562c..d2c1dabe2a2 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.3/build.gradle +++ b/dd-java-agent/instrumentation/sparkjava-2.3/build.gradle @@ -16,7 +16,7 @@ addTestSuiteForDir('latestDepTest', 'test') dependencies { compileOnly group: 'com.sparkjava', name: 'spark-core', version: '2.3' - testImplementation project(':dd-java-agent:instrumentation:jetty-9') + testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0') testImplementation group: 'com.sparkjava', name: 'spark-core', version: '2.4' diff --git a/settings.gradle.kts b/settings.gradle.kts index 33d3700c49e..0db78b03163 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -403,21 +403,21 @@ include( ":dd-java-agent:instrumentation:jersey", ":dd-java-agent:instrumentation:jersey-2-appsec", ":dd-java-agent:instrumentation:jersey-3-appsec", - ":dd-java-agent:instrumentation:jetty-7.0", - ":dd-java-agent:instrumentation:jetty-7.6", - ":dd-java-agent:instrumentation:jetty-9", - ":dd-java-agent:instrumentation:jetty-11", - ":dd-java-agent:instrumentation:jetty-12", - ":dd-java-agent:instrumentation:jetty-appsec-7", - ":dd-java-agent:instrumentation:jetty-appsec-8.1.3", - ":dd-java-agent:instrumentation:jetty-appsec-9.2", - ":dd-java-agent:instrumentation:jetty-appsec-9.3", - ":dd-java-agent:instrumentation:jetty-client:jetty-client-common", - ":dd-java-agent:instrumentation:jetty-client:jetty-client-9.1", - ":dd-java-agent:instrumentation:jetty-client:jetty-client-10.0", - ":dd-java-agent:instrumentation:jetty-client:jetty-client-12.0", - ":dd-java-agent:instrumentation:jetty-common", - ":dd-java-agent:instrumentation:jetty-util", + ":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0", + ":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6", + ":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0", + ":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0", + ":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2", + ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3", + ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-common", + ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-9.1", + ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-10.0", + ":dd-java-agent:instrumentation:jetty:jetty-client:jetty-client-12.0", + ":dd-java-agent:instrumentation:jetty:jetty-common", + ":dd-java-agent:instrumentation:jetty:jetty-util-9.4.31", ":dd-java-agent:instrumentation:jms", ":dd-java-agent:instrumentation:jose-jwt", ":dd-java-agent:instrumentation:org-json", @@ -610,6 +610,6 @@ include( include( ":dd-java-agent:benchmark", ":dd-java-agent:benchmark-integration", - ":dd-java-agent:benchmark-integration:jetty-perftest", + ":dd-java-agent:benchmark-integration:jetty:jetty-perftest", ":dd-java-agent:benchmark-integration:play-perftest", )