Ning null out responseStatus reference sooner

newrelic · May 10, 2024 · 6d12d7d · 6d12d7d
1 parent afda029
commit 6d12d7d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/...client-1.0/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...client-1.0/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -65,6 +65,7 @@ public AsyncHandler.STATE onStatusReceived(HttpResponseStatus responseStatus) {
     }
 
     public void onThrowable(Throwable t) {
+        responseStatus = null;
         if (segment != null) {
             segment.reportAsExternal(GenericParameters
                     .library("AsyncHttpClient")
@@ -76,7 +77,6 @@ public void onThrowable(Throwable t) {
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
         Weaver.callOriginal();
@@ -103,6 +103,9 @@ public AsyncHandler.STATE onHeadersReceived(HttpResponseHeaders headers) {
 
     @Trace(async = true)
     public T onCompleted() throws Exception {
+        Integer statusCode = getStatusCode();
+        String reasonMessage = getReasonMessage();
+        responseStatus = null;
         if (segment != null) {
             // This keeps the transaction alive after "segment.end()" just in case there are any completion handlers
             segment.getTransaction().getToken().linkAndExpire();
@@ -112,14 +115,13 @@ public T onCompleted() throws Exception {
                     .uri(uri)
                     .procedure("onCompleted")
                     .inboundHeaders(inboundHeaders)
-                    .status(getStatusCode(), getReasonMessage())
+                    .status(statusCode, reasonMessage)
                     .build());
             //This used to be segment.finish(t), but the agent doesn't automatically report t.
             segment.end();
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
 

diff --git a/...client-1.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...client-1.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -62,6 +62,7 @@ public AsyncHandler.STATE onStatusReceived(HttpResponseStatus responseStatus) {
     }
 
     public void onThrowable(Throwable t) {
+        responseStatus = null;
         if (segment != null) {
             segment.reportAsExternal(GenericParameters
                     .library("AsyncHttpClient")
@@ -73,7 +74,6 @@ public void onThrowable(Throwable t) {
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
         Weaver.callOriginal();
@@ -93,6 +93,9 @@ public AsyncHandler.STATE onHeadersReceived(HttpResponseHeaders headers) {
 
     @Trace(async = true)
     public T onCompleted() throws Exception {
+        Integer statusCode = getStatusCode();
+        String reasonMessage = getReasonMessage();
+        responseStatus = null;
         if (segment != null) {
             // This keeps the transaction alive after "segment.end()" just in case there are any completion handlers
             segment.getTransaction().getToken().linkAndExpire();
@@ -102,23 +105,21 @@ public T onCompleted() throws Exception {
                     .uri(uri)
                     .procedure("onCompleted")
                     .inboundHeaders(inboundHeaders)
-                    .status(getStatusCode(), getReasonMessage())
+                    .status(statusCode, reasonMessage)
                     .build());
             //This used to be segment.finish(t), but the agent doesn't automatically report t.
             segment.end();
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
 
         return Weaver.callOriginal();
     }
 
     private Integer getStatusCode() {
-        if (responseStatus != null)
-        {
+        if (responseStatus != null) {
             return responseStatus.getStatusCode();
         }
         return null;

diff --git a/...ient-1.6.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...ient-1.6.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -62,6 +62,7 @@ public AsyncHandler.STATE onStatusReceived(HttpResponseStatus responseStatus) {
     }
 
     public void onThrowable(Throwable t) {
+        responseStatus = null;
         if (segment != null) {
             segment.reportAsExternal(GenericParameters
                     .library("AsyncHttpClient")
@@ -73,7 +74,6 @@ public void onThrowable(Throwable t) {
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
         Weaver.callOriginal();
@@ -93,6 +93,9 @@ public AsyncHandler.STATE onHeadersReceived(HttpResponseHeaders headers) {
 
     @Trace(async = true)
     public T onCompleted() throws Exception {
+        Integer statusCode = getStatusCode();
+        String reasonMessage = getReasonMessage();
+        responseStatus = null;
         if (segment != null) {
             // This keeps the transaction alive after "segment.end()" just in case there are any completion handlers
             segment.getTransaction().getToken().linkAndExpire();
@@ -102,23 +105,21 @@ public T onCompleted() throws Exception {
                     .uri(uri)
                     .procedure("onCompleted")
                     .inboundHeaders(inboundHeaders)
-                    .status(getStatusCode(), getReasonMessage())
+                    .status(statusCode, reasonMessage)
                     .build());
             // This used to be segment.finish(t), but the agent doesn't automatically report it.
             segment.end();
             segment = null;
             uri = null;
             inboundHeaders = null;
-            responseStatus = null;
             userAbortedOnStatusReceived = null;
         }
 
         return Weaver.callOriginal();
     }
 
     private Integer getStatusCode() {
-        if (responseStatus != null)
-        {
+        if (responseStatus != null) {
             return responseStatus.getStatusCode();
         }
         return null;