Merge pull request #2197 from newrelic/fix-httpclient-5-memory-issue

Fix memory issue with httpclient-5.0 instrumentation

Author: jasonjkeller

instrumentation/httpclient-5.0/src/main/java/org/apache/hc/client5/http/async/HttpAsyncClient_Instrumentation.java

@@ -41,6 +41,8 @@ public <T> Future<T> execute(
         Segment segment = InstrumentationUtils.startAsyncSegment();
 
         HttpRequest request = ((BasicRequestProducer_Instrumentation)requestProducer).nrRequest;
+        // null out the NewField to prevent memory issues
+        ((BasicRequestProducer_Instrumentation)requestProducer).nrRequest = null;
         InstrumentationUtils.doOutboundCAT(request, segment);
         Token token = NewRelic.getAgent().getTransaction().getToken();
 

instrumentation/httpclient-5.0/src/main/java/org/apache/hc/core5/http/nio/support/BasicRequestProducer_Instrumentation.java

@@ -17,7 +17,7 @@
 public class BasicRequestProducer_Instrumentation {
 
     @NewField
-    public final HttpRequest nrRequest;
+    public HttpRequest nrRequest;
 
     public BasicRequestProducer_Instrumentation(final HttpRequest request, final AsyncEntityProducer dataProducer) {
         nrRequest = request;