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
compile regex
  • Loading branch information
@nenadnoveljic
nenadnoveljic committed Dec 3, 2024
commit cd9550f263964b9105f33b36712cc43eee787eb1
8 changes: 5 additions & 3 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 @@ -2,6 +2,7 @@

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DBM_TRACE_INJECTED;
import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.INSTRUMENTATION_TIME_MS;
import static datadog.trace.bootstrap.instrumentation.api.Tags.*;

import datadog.trace.api.Config;
Expand Down Expand Up @@ -29,6 +30,7 @@
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 Down Expand Up @@ -341,8 +343,8 @@ public void setApplicationName(AgentSpan span, Connection connection) {
return;
}
final String traceParent = DECORATE.traceParent(span, priority);
if (traceParent == null
|| !traceParent.matches("^00-[a-f0-9]{32}-[a-f0-9]{16}-[a-f0-9]{2}$")) {
final Pattern pattern = Pattern.compile("^00-[a-f0-9]{32}-[a-f0-9]{16}-[a-f0-9]{2}$");
if (traceParent == null || !pattern.matcher(traceParent).matches()) {
throw new IllegalArgumentException("Invalid trace parent: " + traceParent);
Comment thread
nenadnoveljic marked this conversation as resolved.
Outdated
}
final String traceContext = "_DD_" + traceParent;
Expand All @@ -369,7 +371,7 @@ public void setApplicationName(AgentSpan span, Connection connection) {
} finally {
span.setTag(DBM_TRACE_INJECTED, true);
final long elapsed = System.currentTimeMillis() - startTime;
span.setTag("dd.instrumentation.time_ms", elapsed);
span.setTag(INSTRUMENTATION_TIME_MS, elapsed);
}
}

Expand Down