diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/build.gradle rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/build.gradle diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/gradle.lockfile rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientDecorator.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/BasicFutureInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HostAndRequestAsHttpUriRequest.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/HttpHeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/ApacheHttpAsyncClientTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/HttpUriRequest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpasyncclient-4/src/test/groovy/HttpUriRequest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/HttpUriRequest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle similarity index 96% rename from dd-java-agent/instrumentation/apache-httpclient-4/build.gradle rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle index 4c06d6f1bda..e12abc8749f 100644 --- a/dd-java-agent/instrumentation/apache-httpclient-4/build.gradle +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle @@ -34,12 +34,12 @@ dependencies { compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' testImplementation(testFixtures(project(':dd-java-agent:agent-iast'))) testImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' - testImplementation(project(':dd-java-agent:instrumentation:apache-httpasyncclient-4')) + testImplementation(project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')) // to instrument the integration test iastIntegrationTestImplementation(testFixtures(project(':dd-java-agent:agent-iast'))) iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0' iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-9')) - iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore-4')) + 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')) iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net')) diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/gradle.lockfile rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/groovy/IastHttpClientIntegrationTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/groovy/IastHttpClientIntegrationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/groovy/IastHttpClientIntegrationTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/groovy/IastHttpClientIntegrationTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/java/SsrfController.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/java/SsrfController.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/foo/bar/VulnerableUrlBuilder.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientDecorator.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HostAndRequestAsHttpUriRequest.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HttpHeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/WrappingStatusSettingResponseHandler.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/HttpUriRequest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/HttpUriRequest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/HttpUriRequest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/IastHttpClientInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/IastHttpClientInstrumentationTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/IastHttpClientInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/build.gradle rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/build.gradle diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/gradle.lockfile rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestProducer.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HostAndRequestAsHttpUriRequest.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HttpHeadersInjectAdapter.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/IastHttpUriRequestBaseInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/WrappingStatusSettingResponseHandler.java diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpAsyncClient5Test.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpAsyncClient5Test.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpAsyncClient5Test.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpAsyncClient5Test.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/HttpUriRequest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/HttpUriRequest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/HttpUriRequest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/HttpUriRequest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/IastHttpUriRequestBaseInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/IastHttpUriRequestBaseInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/IastHttpUriRequestBaseInstrumentationTest.groovy rename to dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/IastHttpUriRequestBaseInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpclient/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/build.gradle new file mode 100644 index 00000000000..5e69c67bd78 --- /dev/null +++ b/dd-java-agent/instrumentation/apache-httpclient/build.gradle @@ -0,0 +1 @@ +apply from: "$rootDir/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-4/build.gradle rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/build.gradle diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-4/gradle.lockfile rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-4/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/main/java/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpcore-4/src/test/groovy/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/test/groovy/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-4/src/test/groovy/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentationTest.groovy rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-4.0/src/test/groovy/datadog/trace/instrumentation/apachehttpcore/IastHttpHostInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpcore-5/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-5/build.gradle rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/build.gradle diff --git a/dd-java-agent/instrumentation/apache-httpcore-5/gradle.lockfile b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-5/gradle.lockfile rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/gradle.lockfile diff --git a/dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-5/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/main/java/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentation.java diff --git a/dd-java-agent/instrumentation/apache-httpcore-5/src/test/groovy/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentationTest.groovy b/dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/test/groovy/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentationTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/apache-httpcore-5/src/test/groovy/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentationTest.groovy rename to dd-java-agent/instrumentation/apache-httpcore/apache-httpcore-5.0/src/test/groovy/datadog/trace/instrumentation/apachehttpcore5/IastHttpHostInstrumentationTest.groovy diff --git a/dd-java-agent/instrumentation/apache-httpcore/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/build.gradle new file mode 100644 index 00000000000..5e69c67bd78 --- /dev/null +++ b/dd-java-agent/instrumentation/apache-httpcore/build.gradle @@ -0,0 +1 @@ +apply from: "$rootDir/gradle/java.gradle" diff --git a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle index fd09aca0fea..d7e09e45765 100644 --- a/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.30.22' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation 'software.amazon.awssdk:dynamodb:2.30.22' testImplementation 'org.testcontainers:localstack:1.20.1' diff --git a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle index 1fa9dfbeb41..34e58e5f852 100644 --- a/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly group: 'software.amazon.awssdk', name: 'eventbridge', version: '2.27.19' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation 'software.amazon.awssdk:eventbridge:2.27.23' // SQS and SNS are used to act as the "targets" of the EB bus. diff --git a/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle index 21fa4b5818c..71b0b92e8ae 100644 --- a/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle @@ -16,7 +16,7 @@ dependencies { compileOnly group: 'software.amazon.awssdk', name: 's3', version: '2.29.26' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testRuntimeOnly project(':dd-java-agent:instrumentation:apache-httpclient-4') + testRuntimeOnly project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testRuntimeOnly project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation 'software.amazon.awssdk:s3:2.29.26' testImplementation 'org.testcontainers:localstack:1.20.1' diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle index ef340066548..a1c3c823d2f 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle @@ -37,7 +37,7 @@ dependencies { compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '[1.11,1.11.106]' testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-rds', version: '[1.11,1.11.106]' diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle b/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle index 4d0292b377d..30395ff0917 100644 --- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle @@ -31,7 +31,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:aws-common') // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + 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 group: 'software.amazon.awssdk', name: 'apache-client', version: '2.2.0' @@ -69,7 +69,7 @@ dependencies { latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '2.18.40' latestPayloadTaggingTestImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.18.40' - latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + latestDepTestImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') latestDepTestImplementation project(':dd-java-agent:instrumentation:netty-4.1') latestDepTestImplementation group: 'software.amazon.awssdk', name: 'apache-client', version: fixedSdkVersion diff --git a/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle index 29d759d1026..089e6c83900 100644 --- a/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle @@ -17,7 +17,7 @@ dependencies { compileOnly group: 'software.amazon.awssdk', name: 'sfn', version: '2.15.35' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation 'software.amazon.awssdk:sfn:2.15.35' testImplementation libs.testcontainers diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle index e24d81f2746..34d5f1d5cc1 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:aws-common') // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-1.11.0') testImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '1.12.710' // SQS is used to act as the "Subscriber" of the SNS topic. diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle index 05de75cc809..b9981c726ac 100644 --- a/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:aws-common') // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation 'software.amazon.awssdk:sns:2.25.40' // SQS is used to act as the "Subscriber" of the SNS topic. diff --git a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle index 3b7783ce898..f1e21262a58 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle @@ -19,7 +19,7 @@ dependencies { compileOnly group: 'com.amazonaws', name: 'amazon-sqs-java-messaging-lib', version: '1.0.0' // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-1.11.0') testImplementation project(':dd-java-agent:instrumentation:jms') diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle index 551baeb5a9a..e56ba82dccd 100644 --- a/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle +++ b/dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:aws-common') // Include httpclient instrumentation for testing because it is a dependency for aws-sdk. - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation project(':dd-java-agent:instrumentation:jms') diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle index adc610e0696..a5b45e99034 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle @@ -31,8 +31,8 @@ dependencies { implementation project(':dd-java-agent:instrumentation:elasticsearch') - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') 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-6.4/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle index e1f8db709c0..bd827929ca1 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle @@ -24,8 +24,8 @@ dependencies { implementation project(':dd-java-agent:instrumentation:elasticsearch') - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + 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') diff --git a/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle b/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle index 5bdb61c3478..f65b37678f1 100644 --- a/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle @@ -24,8 +24,8 @@ dependencies { implementation project(':dd-java-agent:instrumentation:elasticsearch') - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + 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') diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle index 70a86a2da28..7d48361480d 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle @@ -25,7 +25,7 @@ dependencies { // Ensure no cross interference testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport-5') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport') testImplementation group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.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 64914e0b47e..77871ed05d4 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation project(':dd-java-agent:instrumentation:elasticsearch') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-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: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 079e6c99254..4a573c97bd0 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle @@ -31,7 +31,7 @@ dependencies { // Ensure no cross interference testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-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:elasticsearch:transport') diff --git a/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle b/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle index 9aae909ad00..61d1d152c40 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle @@ -27,7 +27,7 @@ dependencies { // Ensure no cross interference testImplementation project(':dd-java-agent:instrumentation:elasticsearch:rest-5') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-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:elasticsearch:transport') 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 38b7b9f11bd..4ff936178ba 100644 --- a/dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle +++ b/dd-java-agent/instrumentation/elasticsearch/transport-7.3/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:elasticsearch:rest-6.4') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-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:elasticsearch:transport') diff --git a/dd-java-agent/instrumentation/opensearch/rest/build.gradle b/dd-java-agent/instrumentation/opensearch/rest/build.gradle index 0ae2a557128..4ccddf6a5c3 100644 --- a/dd-java-agent/instrumentation/opensearch/rest/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/rest/build.gradle @@ -17,8 +17,8 @@ dependencies { implementation project(':dd-java-agent:instrumentation:opensearch') - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') 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/opensearch/transport/build.gradle b/dd-java-agent/instrumentation/opensearch/transport/build.gradle index 3579daed98e..17233a7bed3 100644 --- a/dd-java-agent/instrumentation/opensearch/transport/build.gradle +++ b/dd-java-agent/instrumentation/opensearch/transport/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation project(':dd-java-agent:instrumentation:opensearch') testImplementation project(':dd-java-agent:instrumentation:opensearch:rest') - testImplementation project(':dd-java-agent:instrumentation:apache-httpasyncclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0') testImplementation project(':dd-java-agent:instrumentation:netty-4.1') testImplementation group: 'org.opensearch.plugin', name: 'transport-netty4-client', version: '1.0.0' diff --git a/dd-java-agent/instrumentation/spring-cloud-zuul-2/build.gradle b/dd-java-agent/instrumentation/spring-cloud-zuul-2/build.gradle index 38c214a236e..60c523be771 100644 --- a/dd-java-agent/instrumentation/spring-cloud-zuul-2/build.gradle +++ b/dd-java-agent/instrumentation/spring-cloud-zuul-2/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:spring-webmvc-3.1') // These two are used need for spans to propagate correctly: - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:http-url-connection') testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get() diff --git a/dd-java-agent/instrumentation/spring-messaging-4/build.gradle b/dd-java-agent/instrumentation/spring-messaging-4/build.gradle index 3c8469b30cc..e7eb20526e4 100644 --- a/dd-java-agent/instrumentation/spring-messaging-4/build.gradle +++ b/dd-java-agent/instrumentation/spring-messaging-4/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation project(':dd-java-agent:instrumentation:aws-common') // capture SQS send and receive spans, propagate trace details in messages - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation project(':dd-java-agent:instrumentation:aws-java-sdk-2.2') testImplementation project(':dd-java-agent:instrumentation:aws-java-sqs-2.0') diff --git a/dd-java-agent/instrumentation/twilio/build.gradle b/dd-java-agent/instrumentation/twilio/build.gradle index 2593253e02d..8c48f908e26 100644 --- a/dd-java-agent/instrumentation/twilio/build.gradle +++ b/dd-java-agent/instrumentation/twilio/build.gradle @@ -14,7 +14,7 @@ dependencies { compileOnly group: 'com.twilio.sdk', name: 'twilio', version: '0.0.1' testImplementation group: 'com.twilio.sdk', name: 'twilio', version: '0.0.1' - testImplementation project(':dd-java-agent:instrumentation:apache-httpclient-4') + testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0') testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: '2.5.2' // Last version to support Java7 latestDepTestImplementation group: 'com.twilio.sdk', name: 'twilio', version: '+' diff --git a/settings.gradle b/settings.gradle index 6f365dc8a68..612e08245e1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -209,11 +209,13 @@ include ':dd-java-agent:instrumentation:akka-http:akka-http-10.0' include ':dd-java-agent:instrumentation:akka-http:akka-http-10.2-iast' include ':dd-java-agent:instrumentation:akka-http:akka-http-10.6' include ':dd-java-agent:instrumentation:akka-init' -include ':dd-java-agent:instrumentation:apache-httpasyncclient-4' -include ':dd-java-agent:instrumentation:apache-httpclient-4' -include ':dd-java-agent:instrumentation:apache-httpclient-5' -include ':dd-java-agent:instrumentation:apache-httpcore-4' -include ':dd-java-agent:instrumentation:apache-httpcore-5' +include ':dd-java-agent:instrumentation:apache-httpclient' +include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0' +include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0' +include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-5.0' +include ':dd-java-agent:instrumentation:apache-httpcore' +include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0' +include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-5.0' include ':dd-java-agent:instrumentation:armeria-grpc' include ':dd-java-agent:instrumentation:armeria-jetty' include ':dd-java-agent:instrumentation:avro'