Skip to content

Commit 3f73dee

Browse files
shatzishatzi
committed
change tags to match Code Origin RFC updated spec
1 parent 27f522f commit 3f73dee

File tree

5 files changed

+10
-49
lines changed

5 files changed

+10
-49
lines changed

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/CodeOriginProbe.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.datadog.debugger.probe;
22

33
import static com.datadog.debugger.codeorigin.DebuggerConfiguration.isDebuggerEnabled;
4-
import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID;
54
import static datadog.trace.api.DDTags.DD_STACK_CODE_ORIGIN_FRAME;
65
import static datadog.trace.api.DDTags.DD_STACK_CODE_ORIGIN_TYPE;
76
import static java.lang.String.format;
@@ -13,7 +12,6 @@
1312
import com.datadog.debugger.instrumentation.InstrumentationResult;
1413
import com.datadog.debugger.sink.Snapshot;
1514
import com.datadog.debugger.util.ClassNameFiltering;
16-
import datadog.trace.api.DDTags;
1715
import datadog.trace.bootstrap.debugger.CapturedContext;
1816
import datadog.trace.bootstrap.debugger.MethodLocation;
1917
import datadog.trace.bootstrap.debugger.ProbeId;
@@ -91,28 +89,9 @@ public void commit(
9189

9290
private void applySpanOriginTags(AgentSpan span, String snapshotId) {
9391
List<StackTraceElement> entries = getUserStackFrames();
94-
recordCodeOrigin(span, entries, snapshotId);
9592
recordStackFrames(span, entries, snapshotId);
9693
}
9794

98-
private void recordCodeOrigin(
99-
AgentSpan span, List<StackTraceElement> entries, String snapshotId) {
100-
if (entrySpanProbe && !entries.isEmpty()) {
101-
StackTraceElement entry = entries.get(0);
102-
List<AgentSpan> list = asList(span, span.getLocalRootSpan());
103-
for (AgentSpan s : list) {
104-
s.setTag(DDTags.DD_CODE_ORIGIN_FILE, toFileName(entry.getClassName()));
105-
s.setTag(DDTags.DD_CODE_ORIGIN_METHOD, entry.getMethodName());
106-
s.setTag(DDTags.DD_CODE_ORIGIN_LINE, entry.getLineNumber());
107-
s.setTag(DDTags.DD_CODE_ORIGIN_TYPE, entry.getClassName());
108-
s.setTag(DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE, signature);
109-
if (snapshotId != null) {
110-
s.setTag(DD_CODE_ORIGIN_SNAPSHOT_ID, snapshotId);
111-
}
112-
}
113-
}
114-
}
115-
11695
private void recordStackFrames(
11796
AgentSpan span, List<StackTraceElement> entries, String snapshotId) {
11897
List<AgentSpan> agentSpans =
@@ -127,6 +106,9 @@ private void recordStackFrames(
127106
s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "method"), info.getMethodName());
128107
s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "line"), info.getLineNumber());
129108
s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "type"), info.getClassName());
109+
if (i == 0 && signature != null) {
110+
s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "signature"), signature);
111+
}
130112
if (i == 0 && snapshotId != null) {
131113
s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "snapshot_id"), snapshotId);
132114
}

‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.Collections;
4141
import java.util.List;
4242
import java.util.Objects;
43+
import java.util.regex.Pattern;
4344
import org.slf4j.Logger;
4445
import org.slf4j.LoggerFactory;
4546

@@ -49,6 +50,8 @@ public class LogProbe extends ProbeDefinition {
4950
private static final Limits LIMITS = new Limits(1, 3, 8192, 5);
5051
private static final int LOG_MSG_LIMIT = 8192;
5152

53+
private static final Pattern SPLIT_WATCHES_PATTERN = Pattern.compile(",");
54+
5255
/** Stores part of a templated message either a str or an expression */
5356
public static class Segment {
5457
private final String str;
@@ -336,7 +339,7 @@ private static List<ValueScript> parseWatchesFromTags(Tag[] tags) {
336339
if ("dd_watches_dsl".equals(tag.getKey())) {
337340
String ddWatches = tag.getValue();
338341
// this for POC only, parsing is not robust!
339-
String[] splitWatches = ddWatches.split(",");
342+
String[] splitWatches = SPLIT_WATCHES_PATTERN.split(ddWatches);
340343
for (String watchDef : splitWatches) {
341344
// remove curly braces
342345
String refPath = watchDef.substring(1, watchDef.length() - 1);

‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/origin/CodeOriginTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import com.datadog.debugger.util.TestTraceInterceptor;
3333
import datadog.trace.agent.tooling.TracerInstaller;
3434
import datadog.trace.api.Config;
35-
import datadog.trace.api.DDTags;
3635
import datadog.trace.api.InstrumenterConfig;
3736
import datadog.trace.api.interceptor.MutableSpan;
3837
import datadog.trace.bootstrap.debugger.DebuggerContext;
@@ -191,10 +190,6 @@ private void waitForInstrumentation() {
191190

192191
private static void checkEntrySpanTags(MutableSpan span, boolean includeSnapshot) {
193192
String keys = format("Existing keys for %s: %s", span.getOperationName(), ldKeys(span));
194-
assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_FILE);
195-
assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_LINE);
196-
assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_METHOD);
197-
assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE);
198193

199194
assertEquals(span.getTag(DD_STACK_CODE_ORIGIN_TYPE), "entry", keys);
200195
assertKeyPresent(span, DD_STACK_CODE_ORIGIN_TYPE);
@@ -204,7 +199,6 @@ private static void checkEntrySpanTags(MutableSpan span, boolean includeSnapshot
204199
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "type"));
205200

206201
if (includeSnapshot) {
207-
assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID);
208202
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "snapshot_id"));
209203
}
210204
}
@@ -229,14 +223,8 @@ private static void checkExitSpanTags(MutableSpan span, boolean includeSnapshot)
229223
String keys =
230224
format("Existing keys for %s: %s", span.getOperationName(), new TreeSet<>(ldKeys(span)));
231225

232-
assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_FILE);
233-
assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_LINE);
234-
assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_METHOD);
235-
assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE);
236-
assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID);
237-
238226
assertKeyPresent(span, DD_STACK_CODE_ORIGIN_TYPE);
239-
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "file"));
227+
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 3, "file"));
240228
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "line"));
241229
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "method"));
242230
assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "type"));

‎dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ class TagsAssert {
6262
assertedTags.add(DDTags.PROFILING_ENABLED)
6363
assertedTags.add(DDTags.PROFILING_CONTEXT_ENGINE)
6464
assertedTags.add(DDTags.BASE_SERVICE)
65-
assertedTags.add(DDTags.DD_CODE_ORIGIN_FILE)
66-
assertedTags.add(DDTags.DD_CODE_ORIGIN_METHOD)
67-
assertedTags.add(DDTags.DD_CODE_ORIGIN_LINE)
68-
assertedTags.add(DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE)
6965
assertedTags.add(DDTags.DSM_ENABLED)
7066
assertedTags.add(DDTags.DJM_ENABLED)
7167
assertedTags.add(DDTags.PARENT_ID)

‎dd-trace-api/src/main/java/datadog/trace/api/DDTags.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@
33
public class DDTags {
44

55
private static final String DD_LD_PREFIX = "_dd.ld.";
6-
public static final String DD_STACK_CODE_ORIGIN_PREFIX = "_dd.stack.code_origin.";
6+
public static final String DD_STACK_CODE_ORIGIN_PREFIX = DD_LD_PREFIX + "code_origin.";
77

88
public static final String DD_STACK_CODE_ORIGIN_TYPE = DD_STACK_CODE_ORIGIN_PREFIX + "type";
99
// _dd.stack.code_origin.frame.%d.file|line|method|type|snapshot_id
1010
public static final String DD_STACK_CODE_ORIGIN_FRAME =
11-
DD_STACK_CODE_ORIGIN_PREFIX + "frame.%d.%s";
12-
13-
public static final String DD_CODE_ORIGIN_FILE = DD_LD_PREFIX + "code_origin.file";
14-
public static final String DD_CODE_ORIGIN_METHOD = DD_LD_PREFIX + "code_origin.method";
15-
public static final String DD_CODE_ORIGIN_METHOD_SIGNATURE =
16-
DD_LD_PREFIX + "code_origin.signature";
17-
public static final String DD_CODE_ORIGIN_LINE = DD_LD_PREFIX + "code_origin.line";
18-
public static final String DD_CODE_ORIGIN_SNAPSHOT_ID = DD_LD_PREFIX + "code_origin.snapshot_id";
19-
public static final String DD_CODE_ORIGIN_TYPE = DD_LD_PREFIX + "code_origin.type";
11+
DD_STACK_CODE_ORIGIN_PREFIX + "frames.%d.%s";
2012

2113
public static final String SPAN_TYPE = "span.type";
2214
public static final String SERVICE_NAME = "service.name";

0 commit comments

Comments
 (0)