Capture and ignore exceptions in the CQLParser getOperationAndTableNa…

…me method used by Cassandra 4.x to address #827
newrelic · May 18, 2022 · 58897bf · 58897bf
1 parent 103d81c
commit 58897bf
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/...sandra-datastax-4.0.0/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java b/...sandra-datastax-4.0.0/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java
@@ -66,21 +66,25 @@ public class CQLParser {
     }
 
     public OperationAndTableName getOperationAndTableName(String rawQuery) {
-        rawQuery = rawQuery.replaceAll(COMMENT_PATTERN, "").trim();
+        try {
+            rawQuery = rawQuery.replaceAll(COMMENT_PATTERN, "").trim();
 
-        String operation = null;
-        String tableName = null;
-        for (Pattern pattern : PATTERNS) {
-            Matcher matcher = pattern.matcher(rawQuery);
-            if (matcher.find()) {
-                if (matcher.groupCount() >= 1) {
-                    operation = matcher.group(1);
+            String operation = null;
+            String tableName = null;
+            for (Pattern pattern : PATTERNS) {
+                Matcher matcher = pattern.matcher(rawQuery);
+                if (matcher.find()) {
+                    if (matcher.groupCount() >= 1) {
+                        operation = matcher.group(1);
+                    }
+                    if (matcher.groupCount() == 2) {
+                        tableName = matcher.group(2);
+                    }
+                    return new OperationAndTableName(operation, tableName);
                 }
-                if (matcher.groupCount() == 2) {
-                    tableName = matcher.group(2);
-                }
-                return new OperationAndTableName(operation, tableName);
             }
+        } catch (Exception ex) {
+            return null;
         }
         return null;
     }