Skip to content

Add trace injection for prepared statements in Postgres #7940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nenadnoveljic merged 20 commits into from
Dec 12, 2024
Merged

Add trace injection for prepared statements in Postgres #7940

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
44444b4
trace injection for prepared statements
nenadnoveljic Nov 12, 2024
11adebc
parmeter
nenadnoveljic Nov 14, 2024
4b6f953
measure instrumentation time
nenadnoveljic Nov 14, 2024
7b88bca
test cases
nenadnoveljic Nov 18, 2024
320d497
test cases
nenadnoveljic Nov 19, 2024
75cdbd7
restored remote tests
nenadnoveljic Nov 19, 2024
049ce78
check concatenated string
nenadnoveljic Nov 19, 2024
2a45328
SpotBugs annotation
nenadnoveljic Nov 19, 2024
f2f7b8f
new test cases
nenadnoveljic Nov 20, 2024
5d235a0
renamed TIME_MS to INSTRUMENTATION_TIME_MS
nenadnoveljic Dec 3, 2024
cd9550f
compile regex
nenadnoveljic Dec 3, 2024
94fa673
catch Throwable
nenadnoveljic Dec 3, 2024
faa9541
fix sized StringBuilder
nenadnoveljic Dec 3, 2024
f552f64
removed inner catch
nenadnoveljic Dec 3, 2024
75cf7e5
pattern as class variable
nenadnoveljic Dec 3, 2024
ba6fa89
Update dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace…
nenadnoveljic Dec 3, 2024
d2b83fa
Merge branch 'master' into nenadnoveljic/pg-prepared
amarziali Dec 4, 2024
f159cd9
log only if isDebugEnabled
nenadnoveljic Dec 12, 2024
98f0164
switched to setClientInfo
nenadnoveljic Dec 12, 2024
89f033b
Merge branch 'master' into nenadnoveljic/pg-prepared
nenadnoveljic Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switched to setClientInfo
  • Loading branch information
@nenadnoveljic
nenadnoveljic committed Dec 12, 2024
commit 98f01640f3d3bba144befa3bd2d00aa29fe59620
15 changes: 1 addition & 14 deletions .../instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import datadog.trace.bootstrap.instrumentation.jdbc.DBInfo;
import datadog.trace.bootstrap.instrumentation.jdbc.DBQueryInfo;
import datadog.trace.bootstrap.instrumentation.jdbc.JDBCConnectionUrlParser;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.sql.Connection;
Expand All @@ -30,7 +29,6 @@
import java.sql.Statement;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

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

// SET doesn't work with parameters
try (Statement statement = connection.createStatement()) {
statement.execute("SET application_name = '" + traceContext + "';");
}
connection.setClientInfo("ApplicationName", traceContext);
} catch (Throwable e) {
if (log.isDebugEnabled()) {
log.debug(
Expand Down