Skip to content

Commit 91eb33d

Browse files
sanitizing SQL string.
1 parent 0cc05f0 commit 91eb33d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import java.util.logging.Logger;
55
import java.util.regex.Pattern;
66

7-
public class SanitizeSQLString {
8-
private static final Logger logger = Logger.getLogger(SanitizeSQLString.class.getName());
7+
public class SanitizeSqlString {
8+
private static final Logger logger = Logger.getLogger(SanitizeSqlString.class.getName());
9+
10+
private SanitizeSqlString() {}
911
// Replace single-quoted string literals: 'foo', with ?
1012
private static final Pattern SINGLE_QUOTE_STRING =
1113
Pattern.compile("'([^'\\\\]|\\\\.)*'");
@@ -55,7 +57,7 @@ public static String sanitize(String sql) {
5557
// 5) Normalize whitespace: collapse multiple spaces/newlines into single space
5658
s = s.replaceAll("\\s+", " ").trim();
5759

58-
} catch (Exception e) {
60+
} catch (RuntimeException e) {
5961
logger.log(Level.WARNING, "failed to sanitize SQL string: " + sql, e);
6062
s = "mysql ??";
6163
}

instrumentation/vertx/vertx-sql-client/vertx-sql-client-3.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_9/sql/SqlQueryInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public static Object[] onEnter(@Advice.Argument(0) String sql) {
5252
}
5353

5454
Tracer tracer = GlobalOpenTelemetry.get().getTracer("vertx-sql-client");
55-
String sanitizedSql = SanitizeSQLString.sanitize(sql);
56-
String spanName = sanitizedSql.length() > 100 ? sanitizedSql.substring(0, 100) + "..." : sql;
55+
String sanitizedSql = SanitizeSqlString.sanitize(sql);
56+
String spanName = sanitizedSql.length() > 100 ? sanitizedSql.substring(0, 100) + "..." : sanitizedSql;
5757

5858
// Try to get context from Vert.x context first
5959
Context parentContext = Context.current();

0 commit comments

Comments
 (0)