move urlconnection instrumentation to java-net

amarziali · amarziali · commit 7d45be4a5583 · 2025-12-19T09:26:12.000+01:00
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
@@ -67,8 +67,6 @@ subprojects { Project subProj ->
 
       // Include instrumentations instrumenting core JDK classes to ensure interoperability with other instrumentation
       testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')
-      // FIXME: we should enable this, but currently this fails tests for google http client
-      //testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
       testImplementation project(':dd-java-agent:instrumentation:java:java-lang:java-lang-classloading-1.8')
 
       testImplementation project(':dd-java-agent:instrumentation-testing')
diff --git a/dd-java-agent/instrumentation/http-url-connection/build.gradle b/dd-java-agent/instrumentation/http-url-connection/build.gradle
diff --git a/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile b/dd-java-agent/instrumentation/http-url-connection/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/build.gradle
@@ -11,6 +11,8 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
+  testImplementation group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE'
+
 }
 
 // IBM8 is having troubles with TLS set up by jetty 9.4.
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/gradle.lockfile
@@ -45,6 +45,7 @@ com.thoughtworks.qdox:qdox:1.12.1=codenarc
 commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.20.0=spotbugs
+commons-logging:commons-logging:1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 de.thetaphi:forbiddenapis:3.10=compileClasspath,csiCompileClasspath
 io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath
 io.sqreen:libsqreen:17.2.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
@@ -115,5 +116,11 @@ org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
 org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-aop:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-beans:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-context:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-core:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-expression:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.springframework:spring-web:4.3.7.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs
 empty=csiAnnotationProcessor,csiRuntimeClasspath,spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/HttpUrlConnectionInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.http_url_connection;
+package datadog.trace.instrumentation.java.net;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.http_url_connection;
+package datadog.trace.instrumentation.java.net;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionConnectFirstTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionConnectFirstTest.groovy
@@ -1,8 +1,8 @@
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
+
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
 import spock.lang.Timeout
 
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
-
 @Timeout(5)
 class HttpUrlConnectionConnectFirstTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0{
 
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionTest.groovy
@@ -1,3 +1,7 @@
+import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
+import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
+
 import datadog.trace.agent.test.base.HttpClientTest
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
 import datadog.trace.api.DDSpanTypes
@@ -8,10 +12,6 @@ import spock.lang.IgnoreIf
 import spock.lang.Timeout
 import sun.net.www.protocol.https.HttpsURLConnectionImpl
 
-import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
-import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
-
 @Timeout(5)
 abstract class HttpUrlConnectionTest extends HttpClientTest {
 
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy
@@ -1,8 +1,8 @@
+import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
+
 import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
 import spock.lang.Timeout
 
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
-
 @Timeout(5)
 class HttpUrlConnectionUseCachesFalseTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/SpringRestTemplateTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/SpringRestTemplateTest.groovy
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/UrlConnectionTest.groovy b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/UrlConnectionTest.groovy
@@ -1,13 +1,13 @@
-import datadog.trace.agent.test.naming.VersionedNamingTestBase
-import datadog.trace.api.DDSpanTypes
-import datadog.trace.bootstrap.DatadogClassLoader
-import datadog.trace.bootstrap.instrumentation.api.Tags
-
 import static datadog.trace.agent.test.utils.PortUtils.UNUSABLE_PORT
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
 
+import datadog.trace.agent.test.naming.VersionedNamingTestBase
+import datadog.trace.api.DDSpanTypes
+import datadog.trace.bootstrap.DatadogClassLoader
+import datadog.trace.bootstrap.instrumentation.api.Tags
+
 abstract class UrlConnectionTest extends VersionedNamingTestBase {
 
   def "trace request with connection failure #scheme"() {
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 
   // These two are used need for spans to propagate correctly:
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
-  testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
+  testImplementation project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8')
 
   // These two version sets are compatible together:
   testImplementation enforcedPlatform('org.springframework.boot:spring-boot-dependencies:2.3.5.RELEASE') {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -358,7 +358,6 @@ include(
   ":dd-java-agent:instrumentation:hibernate:hibernate-core-3.3",
   ":dd-java-agent:instrumentation:hibernate:hibernate-core-4.0",
   ":dd-java-agent:instrumentation:hibernate:hibernate-core-4.3",
-  ":dd-java-agent:instrumentation:http-url-connection",
   ":dd-java-agent:instrumentation:hystrix-1.4",
   ":dd-java-agent:instrumentation:iast-instrumenter",
   ":dd-java-agent:instrumentation:ignite-2.0",

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ addTestSuiteForDir('latestDepTest', 'test')`
`11`	`11`
`12`	`12`	`dependencies {`
`13`	`13`	`testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')`
	`14`	`+ testImplementation group: 'org.springframework', name: 'spring-web', version: '4.3.7.RELEASE'`
	`15`	`+`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`// IBM8 is having troubles with TLS set up by jetty 9.4.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package datadog.trace.instrumentation.http_url_connection;`
	`1`	`+package datadog.trace.instrumentation.java.net;`
`2`	`2`
`3`	`3`	`import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;`
`4`	`4`	`import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf;`