Skip to content

Commit

Permalink
Add CQLParser getOperationAndTableName exception handling (#857)
Browse files Browse the repository at this point in the history 
* Capture and ignore exceptions in the CQLParser getOperationAndTableName method used by Cassandra 4.x to address #827
  • Loading branch information
@GDownes
GDownes authored May 23, 2022
1 parent bbd4210 commit 77ed361
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 53 deletions.
36 changes: 22 additions & 14 deletions ...sandra-datastax-2.1.2/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@

package com.nr.agent.instrumentation.cassandra;

import com.newrelic.api.agent.NewRelic;

import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -41,9 +44,9 @@ public class CQLParser {
private static final Pattern CREATE_AGGREGATE_PATTERN = Pattern.compile("^(CREATE\\s+(?:OR\\s+REPLACE\\s+)?AGGREGATE)\\s+(?:IF\\s+NOT\\s+EXISTS\\s+)?(?:'|\")?(" + IDENTIFIER_REGEX + ")", FLAGS);
private static final Pattern DROP_AGGREGATE_PATTERN = Pattern.compile("^(DROP\\s+AGGREGATE)\\s+(?:IF\\s+EXISTS\\s+)?(?:'|\")?(" + IDENTIFIER_REGEX + ")", FLAGS);
private static final String COMMENT_PATTERN = "/\\*(?:.|[\\r\\n])*?\\*/";

private static final List<Pattern> PATTERNS = new LinkedList<>();

static {
// The order here is a performance optimization to favor more common queries first
PATTERNS.add(SELECT_PATTERN);
Expand All @@ -66,21 +69,26 @@ 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);
}
if (matcher.groupCount() == 2) {
tableName = matcher.group(2);
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);
}
return new OperationAndTableName(operation, tableName);
}
} catch (Exception ex) {
NewRelic.getAgent().getLogger().log(Level.FINEST, "Exception getting operation and table name", ex);
return null;
}
return null;
}
Expand Down
38 changes: 23 additions & 15 deletions ...sandra-datastax-3.0.0/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@

package com.nr.agent.instrumentation.cassandra;

import com.newrelic.api.agent.NewRelic;

import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* A very simplistic CQL "Parser" that attempts to extract the information we care about for Datastore requests:
*
* <p>
* - Operation (SELECT, INSERT, UPDATE, etc)
* - Table Name (Column Family)
*/
Expand All @@ -41,9 +44,9 @@ public class CQLParser {
private static final Pattern CREATE_AGGREGATE_PATTERN = Pattern.compile("^(CREATE\\s+(?:OR\\s+REPLACE\\s+)?AGGREGATE)\\s+(?:IF\\s+NOT\\s+EXISTS\\s+)?(?:'|\")?(" + IDENTIFIER_REGEX + ")", FLAGS);
private static final Pattern DROP_AGGREGATE_PATTERN = Pattern.compile("^(DROP\\s+AGGREGATE)\\s+(?:IF\\s+EXISTS\\s+)?(?:'|\")?(" + IDENTIFIER_REGEX + ")", FLAGS);
private static final String COMMENT_PATTERN = "/\\*(?:.|[\\r\\n])*?\\*/";

private static final List<Pattern> PATTERNS = new LinkedList<>();

static {
// The order here is a performance optimization to favor more common queries first
PATTERNS.add(SELECT_PATTERN);
Expand All @@ -66,21 +69,26 @@ 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);
}
if (matcher.groupCount() == 2) {
tableName = matcher.group(2);
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);
}
return new OperationAndTableName(operation, tableName);
}
} catch (Exception ex) {
NewRelic.getAgent().getLogger().log(Level.FINEST, "Exception getting operation and table name", ex);
return null;
}
return null;
}
Expand Down
32 changes: 20 additions & 12 deletions ...sandra-datastax-3.8.0/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@

package com.nr.agent.instrumentation.cassandra;

import com.newrelic.api.agent.NewRelic;

import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -66,21 +69,26 @@ 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);
}
if (matcher.groupCount() == 2) {
tableName = matcher.group(2);
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);
}
return new OperationAndTableName(operation, tableName);
}
} catch (Exception ex) {
NewRelic.getAgent().getLogger().log(Level.FINEST, "Exception getting operation and table name", ex);
return null;
}
return null;
}
Expand Down
32 changes: 20 additions & 12 deletions ...sandra-datastax-4.0.0/src/main/java/com/nr/agent/instrumentation/cassandra/CQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@

package com.nr.agent.instrumentation.cassandra;

import com.newrelic.api.agent.NewRelic;

import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -66,21 +69,26 @@ 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);
}
if (matcher.groupCount() == 2) {
tableName = matcher.group(2);
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);
}
return new OperationAndTableName(operation, tableName);
}
} catch (Exception ex) {
NewRelic.getAgent().getLogger().log(Level.FINEST, "Exception getting operation and table name", ex);
return null;
}
return null;
}
Expand Down

0 comments on commit 77ed361

Please sign in to comment.