Merge pull request #1775 from newrelic/1648_HttpResponseFixes

1648 http response fixes

Author: jbedell-newrelic

instrumentation/http-async-client-4/src/main/java/com/nr/agent/instrumentation/httpasyncclient4/InboundWrapper.java

@@ -12,17 +12,18 @@
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Wraps Apache http async client's inbound response headers for CAT.
  */
 public class InboundWrapper extends ExtendedInboundHeaders {
-    private final HttpResponse response;
+    private final Header[] headers;
 
     public InboundWrapper(HttpResponse response) {
-        this.response = response;
+        this.headers = response == null ? null : response.getAllHeaders();
     }
 
     @Override
@@ -32,25 +33,25 @@ public HeaderType getHeaderType() {
 
     @Override
     public String getHeader(String name) {
-        // getHeaders always returns an array of length >= 0
-        Header[] headers = response.getHeaders(name);
-        if (headers.length > 0) {
-            return headers[0].getValue();
-        }
-        return null;
+        if (headers == null || name == null) return null;
+
+        return Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
     public List<String> getHeaders(String name) {
-        // getHeaders always returns an array of length >= 0
-        Header[] headers = response.getHeaders(name);
-        if (headers.length > 0) {
-            List<String> result = new ArrayList<>(headers.length);
-            for (Header header : headers) {
-                result.add(header.getValue());
-            }
-            return result;
-        }
-        return null;
+        if (headers == null  || name == null) return null;
+
+        List<String> result = Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .collect(Collectors.toList());
+
+        return result.isEmpty() ? null : result;
     }
+
 }

instrumentation/http-async-client-4/src/main/java/org/apache/http/nio/protocol/HttpAsyncResponseConsumer_Instrumentation.java

@@ -36,14 +36,21 @@ public class HttpAsyncResponseConsumer_Instrumentation<T> {
     @NewField
     private InboundWrapper inboundHeaders;
     @NewField
-    private HttpResponse httpResponse;
+    private Integer statusCode;
+    @NewField
+    private String reasonMessage;
 
     /**
      * Invoked when a HTTP response message is received.
      */
     public void responseReceived(HttpResponse response) throws IOException, HttpException {
         inboundHeaders = new InboundWrapper(response);
-        httpResponse = response;
+
+        if (response != null && response.getStatusLine() != null) {
+            statusCode = response.getStatusLine().getStatusCode();
+            reasonMessage = response.getStatusLine().getReasonPhrase();
+        }
+
         Weaver.callOriginal();
     }
 
@@ -64,6 +71,8 @@ public void responseCompleted(HttpContext context) {
         segment = null;
         uri = null;
         inboundHeaders = null;
+        statusCode = null;
+        reasonMessage = null;
         Weaver.callOriginal();
     }
 
@@ -90,16 +99,10 @@ public void failed(Exception ex) {
     }
 
     private Integer getStatusCode() {
-        if (httpResponse != null && httpResponse.getStatusLine() != null) {
-            return httpResponse.getStatusLine().getStatusCode();
-        }
-        return null;
+        return statusCode;
     }
 
     private String getReasonMessage() {
-        if (httpResponse != null && httpResponse.getStatusLine() != null) {
-            return httpResponse.getStatusLine().getReasonPhrase();
-        }
-        return null;
+        return reasonMessage;
     }
 }

instrumentation/http4s-blaze-client-2.13_0.23/src/main/scala/com/nr/instrumentation/http4s/InboundResponseWrapper.scala

@@ -1,13 +1,13 @@
 package com.nr.instrumentation.http4s
 
 import com.newrelic.api.agent.{ExtendedInboundHeaders, HeaderType}
-import org.http4s.Response
+import org.http4s.Headers
 import org.typelevel.ci.CIString
 
 import scala.jdk.CollectionConverters._
 import java.util
 
-class InboundResponseWrapper[F[_]](response: Response[F]) extends ExtendedInboundHeaders {
+class InboundResponseWrapper[F[_]](headers: Headers) extends ExtendedInboundHeaders {
   /**
     * Return the type of header key syntax used for this.
     *
@@ -25,8 +25,8 @@ class InboundResponseWrapper[F[_]](response: Response[F]) extends ExtendedInboun
     * @since 3.5.0
     */
   override def getHeader(name: String): String =
-    response.headers.headers.find(_.name == CIString(name)).map(_.value).orNull
+    headers.headers.find(_.name == CIString(name)).map(_.value).orNull
 
   override def getHeaders(name: String): util.List[String] =
-    response.headers.headers.map(_.name.toString).asJava
+    headers.headers.map(_.name.toString).asJava
 }

instrumentation/http4s-blaze-client-2.13_0.23/src/main/scala/com/nr/instrumentation/http4s/NewrelicClientMiddleware.scala

@@ -31,7 +31,7 @@ object NewrelicClientMiddleware {
               .library("HTTP4S")
               .uri(new URI(req.uri.toString()))
               .procedure(req.method.toString())
-              .inboundHeaders(new InboundResponseWrapper(response))
+              .inboundHeaders(new InboundResponseWrapper(response.headers))
               .build())
             seg.end()
             response

instrumentation/http4s-ember-client-2.13_0.23/src/main/scala/com/nr/instrumentation/http4s/InboundResponseWrapper.scala

@@ -1,13 +1,13 @@
 package com.nr.instrumentation.http4s
 
 import com.newrelic.api.agent.{ExtendedInboundHeaders, HeaderType}
-import org.http4s.Response
+import org.http4s.Headers
 import org.typelevel.ci.CIString
 
 import scala.jdk.CollectionConverters._
 import java.util
 
-class InboundResponseWrapper[F[_]](response: Response[F]) extends ExtendedInboundHeaders {
+class InboundResponseWrapper[F[_]](headers: Headers) extends ExtendedInboundHeaders {
   /**
     * Return the type of header key syntax used for this.
     *
@@ -25,8 +25,8 @@ class InboundResponseWrapper[F[_]](response: Response[F]) extends ExtendedInboun
     * @since 3.5.0
     */
   override def getHeader(name: String): String =
-    response.headers.headers.find(_.name == CIString(name)).map(_.value).orNull
+    headers.headers.find(_.name == CIString(name)).map(_.value).orNull
 
   override def getHeaders(name: String): util.List[String] =
-    response.headers.headers.map(_.name.toString).asJava
+    headers.headers.map(_.name.toString).asJava
 }

instrumentation/http4s-ember-client-2.13_0.23/src/main/scala/com/nr/instrumentation/http4s/NewrelicClientMiddleware.scala

@@ -32,7 +32,7 @@ object NewrelicClientMiddleware {
               .library("HTTP4S")
               .uri(new URI(req.uri.toString()))
               .procedure(req.method.toString())
-              .inboundHeaders(new InboundResponseWrapper(response))
+              .inboundHeaders(new InboundResponseWrapper(response.headers))
               .build())
             seg.end()
             response

instrumentation/httpclient-3.1/src/main/java/com/nr/agent/instrumentation/httpclient31/InboundWrapper.java

@@ -12,36 +12,38 @@
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethod;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class InboundWrapper extends ExtendedInboundHeaders {
-    private final HttpMethod delegate;
+    private final Header[] headers;
 
     public InboundWrapper(HttpMethod response) {
-        this.delegate = response;
+        this.headers = response == null ? null : response.getResponseHeaders();
     }
 
     @Override
     public String getHeader(String name) {
-        Header[] headers = delegate.getResponseHeaders(name);
-        if (headers.length > 0) {
-            return headers[0].getValue();
-        }
-        return null;
+        if (headers == null || name == null) return null;
+
+        return Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
     public List<String> getHeaders(String name) {
-        Header[] headers = delegate.getResponseHeaders(name);
-        if (headers.length > 0) {
-            List<String> result = new ArrayList<>(headers.length);
-            for (Header header : headers) {
-                result.add(header.getValue());
-            }
-            return result;
-        }
-        return null;
+        if (headers == null  || name == null) return null;
+
+        List<String> result = Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .collect(Collectors.toList());
+
+        return result.isEmpty() ? null : result;
     }
 
     @Override

instrumentation/httpclient-4.0/src/main/java/com/nr/agent/instrumentation/httpclient40/InboundWrapper.java

@@ -12,36 +12,38 @@
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class InboundWrapper extends ExtendedInboundHeaders {
-    private final HttpResponse delegate;
+    private final Header[] headers;
 
     public InboundWrapper(HttpResponse response) {
-        this.delegate = response;
+        this.headers = response == null ? null : response.getAllHeaders();
     }
 
     @Override
     public String getHeader(String name) {
-        Header[] headers = delegate.getHeaders(name);
-        if (headers.length > 0) {
-            return headers[0].getValue();
-        }
-        return null;
+        if (headers == null || name == null) return null;
+
+        return Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
     public List<String> getHeaders(String name) {
-        Header[] headers = delegate.getHeaders(name);
-        if (headers.length > 0) {
-            List<String> result = new ArrayList<>(headers.length);
-            for (Header header : headers) {
-                result.add(header.getValue());
-            }
-            return result;
-        }
-        return null;
+        if (headers == null  || name == null) return null;
+
+        List<String> result = Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .collect(Collectors.toList());
+
+        return result.isEmpty() ? null : result;
     }
 
     @Override

instrumentation/httpclient-5.0/src/main/java/com/nr/agent/instrumentation/httpclient50/InboundWrapper.java

@@ -12,36 +12,38 @@
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpResponse;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class InboundWrapper extends ExtendedInboundHeaders {
-    private final HttpResponse delegate;
+    private final Header[] headers;
 
     public InboundWrapper(HttpResponse response) {
-        this.delegate = response;
+        this.headers = response == null ? null : response.getHeaders();
     }
 
     @Override
     public String getHeader(String name) {
-        Header[] headers = delegate.getHeaders(name);
-        if (headers.length > 0) {
-            return headers[0].getValue();
-        }
-        return null;
+        if (headers == null || name == null) return null;
+
+        return Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .findFirst()
+                .orElse(null);
     }
 
     @Override
     public List<String> getHeaders(String name) {
-        Header[] headers = delegate.getHeaders(name);
-        if (headers.length > 0) {
-            List<String> result = new ArrayList<>(headers.length);
-            for (Header header : headers) {
-                result.add(header.getValue());
-            }
-            return result;
-        }
-        return null;
+        if (headers == null  || name == null) return null;
+
+        List<String> result = Arrays.stream(headers)
+                .filter(h -> name.equals(h.getName()))
+                .map(h -> h.getValue())
+                .collect(Collectors.toList());
+
+        return result.isEmpty() ? null : result;
     }
 
     @Override

instrumentation/httpclient-jdk11/src/main/java/com.nr.agent.instrumentation.httpclient/InboundWrapper.java

@@ -3,15 +3,15 @@
 import com.newrelic.api.agent.HeaderType;
 import com.newrelic.api.agent.InboundHeaders;
 
+import java.net.http.HttpHeaders;
 import java.net.http.HttpResponse;
-import java.util.function.Function;
 
 public class InboundWrapper implements InboundHeaders {
 
-    private final HttpResponse delegate;
+    private final HttpHeaders headers;
 
     public InboundWrapper(HttpResponse response) {
-        this.delegate = response;
+        this.headers = response == null ? null : response.headers();
     }
 
     @Override
@@ -21,6 +21,6 @@ public HeaderType getHeaderType() {
 
     @Override
     public String getHeader(String name) {
-        return delegate.headers().firstValue(name).map(String::toString).orElse(null);
+        return headers.firstValue(name).map(String::toString).orElse(null);
     }
 }