Cross test apache-httpclient javaagent instrumentations (#15095)

trask · web-flow · commit 59b3ce8adac9 · 2025-10-22T18:49:50.000+03:00
diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/build.gradle.kts
@@ -14,6 +14,9 @@ dependencies {
   library("commons-httpclient:commons-httpclient:2.0")
 
   latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+") // see apache-httpclient-4.0 module
+
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent"))
 }
 
 tasks {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/build.gradle.kts
@@ -28,6 +28,9 @@ muzzle {
 dependencies {
   library("org.apache.httpcomponents:httpclient:4.0")
   testCompileOnly("net.jcip:jcip-annotations:1.0")
+
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent"))
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent"))
 }
 
 tasks {
diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/build.gradle.kts
@@ -14,6 +14,9 @@ dependencies {
   library("org.apache.httpcomponents.client5:httpclient5:5.0")
   // https://issues.apache.org/jira/browse/HTTPCORE-653
   library("org.apache.httpcomponents.core5:httpcore5:5.0.3")
+
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent"))
+  testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
 }
 
 tasks {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ dependencies {`
`14`	`14`	`library("commons-httpclient:commons-httpclient:2.0")`
`15`	`15`
`16`	`16`	`latestDepTestLibrary("commons-httpclient:commons-httpclient:3.+") // see apache-httpclient-4.0 module`
	`17`	`+`
	`18`	`+ testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))`
	`19`	`+ testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent"))`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ muzzle {`
`28`	`28`	`dependencies {`
`29`	`29`	`library("org.apache.httpcomponents:httpclient:4.0")`
`30`	`30`	`testCompileOnly("net.jcip:jcip-annotations:1.0")`
	`31`	`+`
	`32`	`+ testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent"))`
	`33`	`+ testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent"))`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`tasks {`