Skip to content

refactor gradle modules for httpclient and httpcore #9065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 2 commits into from
Jul 1, 2025
Merged

refactor gradle modules for httpclient and httpcore #9065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
070280c
refactor gradle modules for httpclient and httpcore
amarziali Jun 30, 2025
9207c1a
Merge branch 'master' into andrea.marziali/httpclient-refactoring
amarziali Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ion/apache-httpasyncclient-4/build.gradle → ...t/apache-httpasyncclient-4.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 .../apache-httpasyncclient-4/gradle.lockfile → ...pache-httpasyncclient-4.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...lient/ApacheHttpAsyncClientDecorator.java → ...lient/ApacheHttpAsyncClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ApacheHttpAsyncClientInstrumentation.java → ...ApacheHttpAsyncClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...cheHttpClientRedirectInstrumentation.java → ...cheHttpClientRedirectInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...yncclient/BasicFutureInstrumentation.java → ...yncclient/BasicFutureInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...syncclient/DelegatingRequestProducer.java → ...syncclient/DelegatingRequestProducer.java
View file
Open in desktop
File renamed without changes.
0 ...lient/HostAndRequestAsHttpUriRequest.java → ...lient/HostAndRequestAsHttpUriRequest.java
View file
Open in desktop
File renamed without changes.
0 ...asyncclient/HttpHeadersInjectAdapter.java → ...asyncclient/HttpHeadersInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...cclient/TraceContinuedFutureCallback.java → ...cclient/TraceContinuedFutureCallback.java
View file
Open in desktop
File renamed without changes.
0 .../ApacheHttpAsyncClientCallbackTest.groovy → .../ApacheHttpAsyncClientCallbackTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...cheHttpAsyncClientNullCallbackTest.groovy → ...cheHttpAsyncClientNullCallbackTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/ApacheHttpAsyncClientTest.groovy → ...t/groovy/ApacheHttpAsyncClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t-4/src/test/groovy/HttpUriRequest.groovy → ...4.0/src/test/groovy/HttpUriRequest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...entation/apache-httpclient-4/build.gradle → ...client/apache-httpclient-4.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
0 ...ation/apache-httpclient-4/gradle.lockfile → ...ent/apache-httpclient-4.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...oovy/IastHttpClientIntegrationTest.groovy → ...oovy/IastHttpClientIntegrationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...tIntegrationTest/java/SsrfController.java → ...tIntegrationTest/java/SsrfController.java
View file
Open in desktop
File renamed without changes.
0 ...st/java/foo/bar/VulnerableUrlBuilder.java → ...st/java/foo/bar/VulnerableUrlBuilder.java
View file
Open in desktop
File renamed without changes.
0 ...httpclient/ApacheHttpClientDecorator.java → ...httpclient/ApacheHttpClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ient/ApacheHttpClientInstrumentation.java → ...ient/ApacheHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ation/apachehttpclient/HelperMethods.java → ...ation/apachehttpclient/HelperMethods.java
View file
Open in desktop
File renamed without changes.
0 ...lient/HostAndRequestAsHttpUriRequest.java → ...lient/HostAndRequestAsHttpUriRequest.java
View file
Open in desktop
File renamed without changes.
0 ...ehttpclient/HttpHeadersInjectAdapter.java → ...ehttpclient/HttpHeadersInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...WrappingStatusSettingResponseHandler.java → ...WrappingStatusSettingResponseHandler.java
View file
Open in desktop
File renamed without changes.
0 ...pacheHttpClientResponseHandlerTest.groovy → ...pacheHttpClientResponseHandlerTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...c/test/groovy/ApacheHttpClientTest.groovy → ...c/test/groovy/ApacheHttpClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t-4/src/test/groovy/HttpUriRequest.groovy → ...4.0/src/test/groovy/HttpUriRequest.groovy
View file
Open in desktop
File renamed without changes.
0 .../IastHttpClientInstrumentationTest.groovy → .../IastHttpClientInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...entation/apache-httpclient-5/build.gradle → ...client/apache-httpclient-5.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ation/apache-httpclient-5/gradle.lockfile → ...ent/apache-httpclient-5.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ApacheHttpAsyncClientInstrumentation.java → ...ApacheHttpAsyncClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ttpclient5/ApacheHttpClientDecorator.java → ...ttpclient5/ApacheHttpClientDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...ent5/ApacheHttpClientInstrumentation.java → ...ent5/ApacheHttpClientInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...httpclient5/DelegatingRequestChannel.java → ...httpclient5/DelegatingRequestChannel.java
View file
Open in desktop
File renamed without changes.
0 ...ttpclient5/DelegatingRequestProducer.java → ...ttpclient5/DelegatingRequestProducer.java
View file
Open in desktop
File renamed without changes.
0 ...tion/apachehttpclient5/HelperMethods.java → ...tion/apachehttpclient5/HelperMethods.java
View file
Open in desktop
File renamed without changes.
0 ...ient5/HostAndRequestAsHttpUriRequest.java → ...ient5/HostAndRequestAsHttpUriRequest.java
View file
Open in desktop
File renamed without changes.
0 ...httpclient5/HttpHeadersInjectAdapter.java → ...httpclient5/HttpHeadersInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...astHttpUriRequestBaseInstrumentation.java → ...astHttpUriRequestBaseInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...client5/TraceContinuedFutureCallback.java → ...client5/TraceContinuedFutureCallback.java
View file
Open in desktop
File renamed without changes.
0 ...WrappingStatusSettingResponseHandler.java → ...WrappingStatusSettingResponseHandler.java
View file
Open in desktop
File renamed without changes.
0 .../groovy/ApacheHttpAsyncClient5Test.groovy → .../groovy/ApacheHttpAsyncClient5Test.groovy
View file
Open in desktop
File renamed without changes.
0 ...pacheHttpClientResponseHandlerTest.groovy → ...pacheHttpClientResponseHandlerTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...c/test/groovy/ApacheHttpClientTest.groovy → ...c/test/groovy/ApacheHttpClientTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t-5/src/test/groovy/HttpUriRequest.groovy → ...5.0/src/test/groovy/HttpUriRequest.groovy
View file
Open in desktop
File renamed without changes.
0 ...pUriRequestBaseInstrumentationTest.groovy → ...pUriRequestBaseInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/apache-httpclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apply from: "$rootDir/gradle/java.gradle"
0 ...umentation/apache-httpcore-4/build.gradle → ...httpcore/apache-httpcore-4.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ntation/apache-httpcore-4/gradle.lockfile → ...pcore/apache-httpcore-4.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...httpcore/IastHttpHostInstrumentation.java → ...httpcore/IastHttpHostInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...re/IastHttpHostInstrumentationTest.groovy → ...re/IastHttpHostInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...umentation/apache-httpcore-5/build.gradle → ...httpcore/apache-httpcore-5.0/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...ntation/apache-httpcore-5/gradle.lockfile → ...pcore/apache-httpcore-5.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ttpcore5/IastHttpHostInstrumentation.java → ...ttpcore5/IastHttpHostInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...e5/IastHttpHostInstrumentationTest.groovy → ...e5/IastHttpHostInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/apache-httpcore/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apply from: "$rootDir/gradle/java.gradle"
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-dynamodb-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-eventbridge-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-s3-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sdk-1.11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]'
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/aws-java-sdk-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sfn-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sns-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sns-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sqs-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/aws-java-sqs-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/elasticsearch/rest-6.4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/elasticsearch/rest-7/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/elasticsearch/transport-7.3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
4 changes: 2 additions & 2 deletions dd-java-agent/instrumentation/opensearch/rest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/opensearch/transport/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring-cloud-zuul-2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/spring-messaging-4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/twilio/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '+'
Expand Down
12 changes: 7 additions & 5 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down