Skip to content

Commit 98f0164

Browse files
committed
switched to setClientInfo
1 parent f159cd9 commit 98f0164

File tree

1 file changed

+1
-14
lines changed
  • dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc

1 file changed

+1
-14
lines changed

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
2121
import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
2222
import datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser;
23-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2423
import java.nio.ByteBuffer;
2524
import java.nio.ByteOrder;
2625
import java.sql.Connection;
@@ -30,7 +29,6 @@
3029
import java.sql.Statement;
3130
import java.util.HashSet;
3231
import java.util.Set;
33-
import java.util.regex.Pattern;
3432
import org.slf4j.Logger;
3533
import org.slf4j.LoggerFactory;
3634

@@ -50,8 +48,6 @@ public class JDBCDecorator extends DatabaseClientDecorator<DBInfo> {
5048
SpanNaming.instance().namingSchema().database().service("jdbc");
5149
public static final String DBM_PROPAGATION_MODE_STATIC = "service";
5250
public static final String DBM_PROPAGATION_MODE_FULL = "full";
53-
private static final Pattern traceParentPattern =
54-
Pattern.compile("^00-[a-f0-9]{32}-[a-f0-9]{16}-[a-f0-9]{2}$");
5551

5652
public static final String DBM_PROPAGATION_MODE = Config.get().getDBMPropagationMode();
5753
public static final boolean INJECT_COMMENT =
@@ -333,9 +329,6 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
333329
* @param span The span of the instrumented statement
334330
* @param connection The same connection as the one that will be used for the actual statement
335331
*/
336-
@SuppressFBWarnings(
337-
value = "SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE",
338-
justification = "Prepared statement not possible with SET")
339332
public void setApplicationName(AgentSpan span, Connection connection) {
340333
final long startTime = System.currentTimeMillis();
341334
try {
@@ -345,15 +338,9 @@ public void setApplicationName(AgentSpan span, Connection connection) {
345338
return;
346339
}
347340
final String traceParent = DECORATE.traceParent(span, priority);
348-
if (traceParent == null || !traceParentPattern.matcher(traceParent).matches()) {
349-
throw new IllegalArgumentException("Invalid trace parent: " + traceParent);
350-
}
351341
final String traceContext = "_DD_" + traceParent;
352342

353-
// SET doesn't work with parameters
354-
try (Statement statement = connection.createStatement()) {
355-
statement.execute("SET application_name = '" + traceContext + "';");
356-
}
343+
connection.setClientInfo("ApplicationName", traceContext);
357344
} catch (Throwable e) {
358345
if (log.isDebugEnabled()) {
359346
log.debug(

0 commit comments

Comments
 (0)