guard lettuce npe (#1204)

merging with tomee.py test fail. False positive. Test is faulty and is being disabled until faultiness resolved. All other tests pass here.
newrelic · Apr 14, 2023 · f559a15 · f559a15
1 parent f34b0f5
commit f559a15
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/instrumentation/lettuce-5.0/src/main/java/com/nr/lettuce5/instrumentation/NRHolder.java b/instrumentation/lettuce-5.0/src/main/java/com/nr/lettuce5/instrumentation/NRHolder.java
@@ -11,6 +11,8 @@
 import com.newrelic.api.agent.Segment;
 import com.newrelic.api.agent.Token;
 
+import java.util.logging.Level;
+
 public class NRHolder {
     private String segmentName = null;
     private Segment segment = null;
@@ -45,7 +47,7 @@ public void end() {
             token.linkAndExpire();
             token = null;
         }
-        if (segment != null) {
+        if (segment != null && params != null) {
             String operation = params.getOperation();
             if (operation.equalsIgnoreCase("expire")) {
                 segment.ignore();
@@ -56,9 +58,13 @@ public void end() {
             params = null;
             segment = null;
         } else {
-            String operation = params.getOperation();
-            if (!operation.equalsIgnoreCase("expire")) {
-                NewRelic.getAgent().getTracedMethod().reportAsExternal(params);
+            if (params != null) {
+                String operation = params.getOperation();
+                if (!operation.equalsIgnoreCase("expire")) {
+                    NewRelic.getAgent().getTracedMethod().reportAsExternal(params);
+                }
+            } else {
+                NewRelic.getAgent().getLogger().log(Level.WARNING, "DatastoreParameters was null for Lettuce instrumentation. Unable to report as external.");
             }
         }
     }

diff --git a/instrumentation/lettuce-6.0/src/main/java/com/nr/lettuce6/instrumentation/NRHolder.java b/instrumentation/lettuce-6.0/src/main/java/com/nr/lettuce6/instrumentation/NRHolder.java
@@ -11,6 +11,8 @@
 import com.newrelic.api.agent.Segment;
 import com.newrelic.api.agent.Token;
 
+import java.util.logging.Level;
+
 public class NRHolder {
     private String segmentName = null;
     private Segment segment = null;
@@ -45,7 +47,7 @@ public void end() {
             token.linkAndExpire();
             token = null;
         }
-        if (segment != null) {
+        if (segment != null && params != null) {
             String operation = params.getOperation();
             if (operation.equalsIgnoreCase("expire")) {
                 segment.ignore();
@@ -56,9 +58,13 @@ public void end() {
             params = null;
             segment = null;
         } else {
-            String operation = params.getOperation();
-            if (!operation.equalsIgnoreCase("expire")) {
-                NewRelic.getAgent().getTracedMethod().reportAsExternal(params);
+            if (params != null) {
+                String operation = params.getOperation();
+                if (!operation.equalsIgnoreCase("expire")) {
+                    NewRelic.getAgent().getTracedMethod().reportAsExternal(params);
+                }
+            } else {
+                NewRelic.getAgent().getLogger().log(Level.WARNING, "DatastoreParameters was null for Lettuce instrumentation. Unable to report as external");
             }
         }
     }