Add tests

Author: sarahchen6

dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpAsyncClient5Test.groovy

@@ -55,6 +55,21 @@ abstract class ApacheHttpAsyncClient5Test<T extends HttpRequest> extends HttpCli
     callback?.call()
     return response.code
   }
+
+  @Override
+  int doRequest(String method, URI uri, String[] headers, String body, Closure callback) {
+    def request = SimpleHttpRequests.create(method, uri)
+    request.setConfig(RequestConfig.custom().setConnectTimeout(CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS).build())
+    for (String header : headers) {
+      String[] keyVal = header.split(":")
+      request.addHeader(keyVal[0], keyVal[1])
+    }
+
+    def future = client.execute(request, null)
+    def response = future.get(READ_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+    callback?.call()
+    return response.code
+  }
 }
 
 class ApacheHttpAsyncClient5NamingV0ForkedTest extends ApacheHttpAsyncClient5Test implements TestingGenericHttpNamingConventions.ClientV0 {

dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy

@@ -53,6 +53,23 @@ class ApacheHttpClientResponseHandlerTest extends HttpClientTest implements Test
     return status
   }
 
+  @Override
+  int doRequest(String method, URI uri, String[] headers, String body, Closure callback) {
+    def request = new BasicClassicHttpRequest(method, uri)
+    for (String header : headers) {
+      String[] keyVal = header.split(":")
+      request.addHeader(new BasicHeader(keyVal[0], keyVal[1]))
+    }
+
+    CloseableHttpResponse response = null
+    def status = client.execute(request, handler)
+
+    // handler execution is included within the client span, so we can't call the callback there.
+    callback?.call()
+
+    return status
+  }
+
   @Override
   CharSequence component() {
     return ApacheHttpClientDecorator.DECORATE.component()

dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy

@@ -48,6 +48,25 @@ abstract class ApacheHttpClientTest<T extends HttpRequest> extends HttpClientTes
     }
   }
 
+  @Override
+  int doRequest(String method, URI uri, String[] headers, String body, Closure callback) {
+    def request = createRequest(method, uri)
+    for (String header : headers) {
+      String[] keyVal = header.split(":")
+      request.addHeader(new BasicHeader(keyVal[0], keyVal[1]))
+    }
+
+    CloseableHttpResponse response = null
+    try {
+      response = executeRequest(request, uri)
+      callback?.call()
+      return response.code
+    }
+    finally {
+      response?.close()
+    }
+  }
+
   abstract T createRequest(String method, URI uri)
 
   abstract CloseableHttpResponse executeRequest(T request, URI uri)

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy

@@ -144,6 +144,8 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
    */
   abstract int doRequest(String method, URI uri, Map<String, String> headers = [:], String body = "", Closure callback = null)
 
+  abstract int doRequest(String method, URI uri, String[] headers, String body = "", Closure callback = null)
+
   String keyStorePath() {
     server.keystorePath
   }
@@ -765,7 +767,8 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
   def "test request header #header tag mapping"() {
     when:
     def url = server.address.resolve("/success")
-    def status = doRequest(method, url, [(header): value])
+    String[] headerVals = [header + ":" + value , header + ":" + value2]
+    def status = (value2 == null) ? doRequest(method, url, [(header): value]) : doRequest(method, url, headerVals)
     if (isDataStreamsEnabled()) {
       TEST_DATA_STREAMS_WRITER.waitForGroups(1)
     }
@@ -788,11 +791,13 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
     }
 
     where:
-    method | header                           | value     | tags
-    'GET'  | 'X-Datadog-Test-Both-Header'     | 'foo'     | [ 'both_header_tag': 'foo' ]
-    'GET'  | 'X-Datadog-Test-Request-Header'  | 'bar'     | [ 'request_header_tag': 'bar' ]
-    'GET'  | 'X-Datadog-Test-Both-Header'     | 'bar,baz' | [ 'both_header_tag': 'bar,baz' ]
-    'GET'  | 'X-Datadog-Test-Request-Header'  | 'foo,bar' | [ 'request_header_tag': 'foo,bar' ]
+    method | header                           | value     | value2 | tags
+    'GET'  | 'X-Datadog-Test-Both-Header'     | 'foo'     | null   | [ 'both_header_tag': 'foo' ]
+    'GET'  | 'X-Datadog-Test-Request-Header'  | 'bar'     | null   | [ 'request_header_tag': 'bar' ]
+    'GET'  | 'X-Datadog-Test-Both-Header'     | 'bar,baz' | null   | [ 'both_header_tag': 'bar,baz' ]
+    'GET'  | 'X-Datadog-Test-Request-Header'  | 'foo,bar' | null   | [ 'request_header_tag': 'foo,bar' ]
+    'GET'  | 'X-Datadog-Test-Both-Header'     | 'bar,baz' | 'foo'  | [ 'both_header_tag': 'bar,baz,foo' ]
+    'GET'  | 'X-Datadog-Test-Request-Header'  | 'foo,bar' | 'baz'  | [ 'request_header_tag': 'foo,bar,baz' ]
   }
 
   def "test response header #header tag mapping"() {