Skip to content

Commit b1a470b

Browse files
authored
Fix Where conversion for CodeOrigin probes (#7858)
Conversion must create a Where instance with no SourceLine (null)
1 parent 80652a0 commit b1a470b

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFil
6868
lineWhere.typeName,
6969
method.name,
7070
Types.descriptorToSignature(method.desc),
71-
new SourceLine[0],
71+
(SourceLine[]) null,
7272
null);
7373
}
7474
}

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturingTestBase.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,11 @@ protected TestSnapshotListener installProbes(LogProbe... logProbes) {
333333
.build() /*, logProbes*/);
334334
}
335335

336+
public static LogProbe.Builder createProbeBuilder(
337+
ProbeId id, String typeName, String methodName, String signature) {
338+
return createProbeBuilder(id, typeName, methodName, signature, (String[]) null);
339+
}
340+
336341
public static LogProbe.Builder createProbeBuilder(
337342
ProbeId id, String typeName, String methodName, String signature, String... lines) {
338343
return LogProbe.builder()

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/WhereTest.java

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

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertNull;
45
import static org.junit.jupiter.api.Assertions.assertTrue;
56
import static org.mockito.Mockito.mock;
67
import static org.mockito.Mockito.when;
@@ -94,7 +95,7 @@ public void convertLineToMethod() {
9495
assertEquals("java.util.Map", whereMapPut.getTypeName());
9596
assertEquals("put", whereMapPut.getMethodName());
9697
assertEquals("(java.lang.Object, java.lang.Object)", whereMapPut.getSignature());
97-
assertEquals(0, whereMapPut.getLines().length);
98+
assertNull(whereMapPut.getLines());
9899
}
99100

100101
@Test

0 commit comments

Comments
 (0)