Test

Author: sarahchen6

dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/NettyHttpClientDecorator.java

@@ -7,6 +7,10 @@
 import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.jboss.netty.handler.codec.http.HttpHeaders;
 import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 
@@ -57,11 +61,23 @@ protected int status(final HttpResponse httpResponse) {
 
   @Override
   protected String getRequestHeader(HttpRequest request, String headerName) {
-    return request.headers().get(headerName);
+    //    return request.headers().get(headerName);
+    HttpHeaders headers = request.headers();
+    List<String> values = new ArrayList<>();
+    for (Map.Entry<String, String> header : headers) {
+      values.add(header.getValue());
+    }
+    return String.join(", ", values);
   }
 
   @Override
   protected String getResponseHeader(HttpResponse response, String headerName) {
-    return response.headers().get(headerName);
+    //    return response.headers().get(headerName);
+    HttpHeaders headers = response.headers();
+    List<String> values = new ArrayList<>();
+    for (Map.Entry<String, String> header : headers) {
+      values.add(header.getValue());
+    }
+    return String.join(", ", values);
   }
 }