update tests

Author: evanchooly

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java

@@ -577,12 +577,6 @@ private void notifyBlockedDefinitions(
 
   private InstrumentationResult applyInstrumentation(
       MethodInfo methodInfo, List<ProbeDefinition> definitions) {
-    System.out.println(
-        "****** DebuggerTransformer.applyInstrumentation "
-            + "methodInfo = "
-            + methodInfo
-            + ", definitions = "
-            + definitions);
     Map<ProbeId, List<DiagnosticMessage>> diagnostics = new HashMap<>();
     definitions.forEach(
         probeDefinition -> {

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java

@@ -88,18 +88,13 @@ public String captureCodeOrigin(Method method, boolean entry) {
   public void registerLogProbe(CodeOriginProbe probe) {
     if (!logProbes.containsKey(probe.getId())) {
       LogProbe logProbe =
-          new LogProbe(
-              probe.getLanguage(),
-              ProbeId.newId(),
-              null,
-              probe.getWhere(),
-              probe.getEvaluateAt(),
-              "",
-              Collections.emptyList(),
-              true,
-              null,
-              null,
-              null);
+          new LogProbe.Builder()
+              .language(probe.getLanguage())
+              .probeId(ProbeId.newId())
+              .where(probe.getWhere())
+              .evaluateAt(probe.getEvaluateAt())
+              .captureSnapshot(true)
+              .build();
       logProbes.put(probe.getId(), logProbe);
     }
   }

…trumentation/BasicProbeInstrumentor.java …trumentation/CodeOriginInstrumentor.javadd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/BasicProbeInstrumentor.java renamed to dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumentor.java dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/BasicProbeInstrumentor.java renamed to dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/CodeOriginInstrumentor.java

@@ -12,8 +12,8 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.InsnList;
 
-public class BasicProbeInstrumentor extends Instrumentor {
-  public BasicProbeInstrumentor(
+public class CodeOriginInstrumentor extends Instrumentor {
+  public CodeOriginInstrumentor(
       ProbeDefinition definition,
       MethodInfo methodInfo,
       List<DiagnosticMessage> diagnostics,

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

@@ -6,7 +6,7 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
-import com.datadog.debugger.instrumentation.BasicProbeInstrumentor;
+import com.datadog.debugger.instrumentation.CodeOriginInstrumentor;
 import com.datadog.debugger.instrumentation.DiagnosticMessage;
 import com.datadog.debugger.instrumentation.InstrumentationResult.Status;
 import com.datadog.debugger.instrumentation.MethodInfo;
@@ -36,7 +36,7 @@ public CodeOriginProbe(ProbeId probeId, boolean entry, Where where) {
   @Override
   public Status instrument(
       MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<ProbeId> probeIds) {
-    return new BasicProbeInstrumentor(this, methodInfo, diagnostics, probeIds).instrument();
+    return new CodeOriginInstrumentor(this, methodInfo, diagnostics, probeIds).instrument();
   }
 
   @Override

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

@@ -264,7 +264,6 @@ public void veryOldClassFile() throws Exception {
   public void oldClass1_1() throws Exception {
     final String CLASS_NAME = "org.apache.commons.lang.BooleanUtils"; // compiled with jdk 1.1
     TestSnapshotListener listener = installSingleProbe(CLASS_NAME, "toBoolean", null);
-    when(config.isDebuggerVerifyByteCode()).thenReturn(true);
     Class<?> testClass =
         loadClass(
             CLASS_NAME, getClass().getResource("/classfiles/BooleanUtils.classfile").getFile());

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

@@ -344,7 +344,7 @@ public static LogProbe.Builder createProbeBuilder(
 
   protected TestSnapshotListener installProbes(Configuration configuration) {
     config = Config.get();
-    //    setFieldInConfig(config, "debuggerEnabled", true);
+    setFieldInConfig(config, "debuggerEnabled", true);
     setFieldInConfig(config, "debuggerClassFileDumpEnabled", true);
     setFieldInConfig(config, "debuggerVerifyByteCode", false);
     setFieldInConfig(config, "debuggerCodeOriginMaxUserFrames", 20);

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

@@ -37,6 +37,8 @@
 import java.io.InputStreamReader;
 import java.lang.instrument.Instrumentation;
 import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -137,9 +139,8 @@ void setup() {
   @Test
   public void testDump() {
     Config config = createConfig();
-    final String JAVA_IO_TMPDIR = "java.io.tmpdir";
-    String initialTmpDir = System.getProperty(JAVA_IO_TMPDIR);
-    System.setProperty(JAVA_IO_TMPDIR, "/tmp");
+    Path initialTmpDir = DebuggerTransformer.DUMP_PATH;
+    DebuggerTransformer.DUMP_PATH = Paths.get("/tmp/debugger");
     try {
       when(config.isDebuggerClassFileDumpEnabled()).thenReturn(true);
       File instrumentedClassFile = new File("/tmp/debugger/java.util.ArrayList.class");
@@ -166,7 +167,7 @@ public void testDump() {
       Assertions.assertTrue(instrumentedClassFile.delete());
       Assertions.assertTrue(origClassFile.delete());
     } finally {
-      System.setProperty(JAVA_IO_TMPDIR, initialTmpDir);
+      DebuggerTransformer.DUMP_PATH = initialTmpDir;
     }
   }
 

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

@@ -16,7 +16,6 @@
 import static utils.InstrumentationTestHelper.compileAndLoadClass;
 
 import com.datadog.debugger.agent.CapturingTestBase;
-import com.datadog.debugger.agent.DebuggerTransformer;
 import com.datadog.debugger.codeorigin.DefaultCodeOriginRecorder;
 import com.datadog.debugger.probe.CodeOriginProbe;
 import com.datadog.debugger.probe.LogProbe;
@@ -37,7 +36,6 @@
 import datadog.trace.util.AgentTaskScheduler;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -106,7 +104,6 @@ public void basicInstrumentation() throws Exception {
 
   @Test
   public void withDebug1() throws Exception {
-    DebuggerTransformer.DUMP_PATH = Paths.get("build/debugger");
     final String className = "com.datadog.debugger.CodeOrigin02";
     installProbes();
     final Class<?> testClass = compileAndLoadClass(className);
@@ -149,7 +146,7 @@ public void doubleEntry() throws IOException, URISyntaxException {
     List<? extends MutableSpan> trace = traceInterceptor.getTrace();
     MutableSpan span = trace.get(0);
     // this should be entry but until we get the ordering resolved, it's this.
-    assertEquals("doubleEntry", span.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "method")));
+    assertEquals("entry", span.getTag(format(DD_CODE_ORIGIN_FRAME, 0, "method")));
   }
 
   @Test