dropped snapshots from CO probes

Author: evanchooly

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

@@ -409,7 +409,7 @@ private boolean instrumentationIsAllowed(
     return true;
   }
 
-  private ClassNode parseClassFile(String classFilePath, byte[] classfileBuffer) {
+  public ClassNode parseClassFile(String classFilePath, byte[] classfileBuffer) {
     ClassReader reader = new ClassReader(classfileBuffer);
     dumpOriginalClassFile(classFilePath, classfileBuffer);
     ClassNode classNode = new ClassNode();

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

@@ -7,7 +7,6 @@
 import com.datadog.debugger.probe.CodeOriginProbe;
 import com.datadog.debugger.probe.Where;
 import datadog.trace.api.Config;
-import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import datadog.trace.bootstrap.debugger.DebuggerContext.CodeOriginRecorder;
 import datadog.trace.bootstrap.debugger.ProbeId;
@@ -17,7 +16,6 @@
 import datadog.trace.util.stacktrace.StackWalkerFactory;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -81,8 +79,9 @@ private CodeOriginProbe createProbe(String fingerPrint, boolean entry, Where whe
     // committing here manually so that first run probe encounters decorate the span until the
     // instrumentation gets installed
     if (span != null) {
-      probe.commit(
-          CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
+      //      probe.commit(
+      //          CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT,
+      // Collections.emptyList());
     }
     return probe;
   }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/InstrumentationResult.java

@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.objectweb.asm.tree.MethodNode;
 
 /** Stores status instrumentation results */
 public class InstrumentationResult {
@@ -67,9 +68,10 @@ public InstrumentationResult(
     this.diagnostics = diagnostics;
     this.sourceFileName = methodInfo.getClassNode().sourceFile;
     this.typeName = methodInfo.getClassNode().name.replace('/', '.');
-    this.methodName = methodInfo.getMethodNode().name;
-    this.signature = methodInfo.getMethodNode().signature;
+    MethodNode methodNode = methodInfo.getMethodNode();
+    this.methodName = methodNode.name;
     this.methodStart = methodInfo.getMethodStart();
+    this.signature = Types.descriptorToSignature(methodNode.desc);
   }
 
   public boolean isError() {

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

@@ -1,12 +1,16 @@
 package com.datadog.debugger.probe;
 
+import static com.datadog.debugger.probe.LogProbe.Capture.toLimits;
 import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_FRAME;
 import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_TYPE;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 
+import com.datadog.debugger.instrumentation.CapturedContextInstrumentor;
+import com.datadog.debugger.instrumentation.DiagnosticMessage;
 import com.datadog.debugger.instrumentation.InstrumentationResult;
+import com.datadog.debugger.instrumentation.MethodInfo;
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.CapturedContext.CapturedThrowable;
 import datadog.trace.bootstrap.debugger.MethodLocation;
@@ -23,11 +27,21 @@ public class CodeOriginProbe extends LogProbe implements ForceMethodInstrumentat
 
   private final boolean entrySpanProbe;
 
+  private String signature;
+
   public CodeOriginProbe(ProbeId probeId, boolean entry, Where where) {
     super(LANGUAGE, probeId, null, where, MethodLocation.EXIT, null, null, true, null, null, null);
     this.entrySpanProbe = entry;
   }
 
+  @Override
+  public InstrumentationResult.Status instrument(
+      MethodInfo methodInfo, List<DiagnosticMessage> diagnostics, List<ProbeId> probeIds) {
+    return new CapturedContextInstrumentor(
+            this, methodInfo, diagnostics, probeIds, isCaptureSnapshot(), toLimits(null))
+        .instrument();
+  }
+
   @Override
   public boolean isLineProbe() {
     // these are always method probes even if there is a line number
@@ -56,9 +70,9 @@ private void recordCodeOrigin() {
       int i = 0;
       s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "file"), location.getFile());
       s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "method"), location.getMethod());
-      s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "line"), "-1");
+      s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "line"), location.getLines().get(0));
       s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "type"), location.getType());
-      //      s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "signature"), signature);
+      s.setTag(format(DD_CODE_ORIGIN_FRAME, i, "signature"), signature);
     }
   }
 
@@ -83,6 +97,7 @@ public void buildLocation(InstrumentationResult result) {
       if (file == null) {
         file = result.getSourceFileName();
       }
+      signature = result.getMethodSignature();
     }
     this.location = new ProbeLocation(type, method, file, lines);
   }

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

@@ -118,7 +118,7 @@ public void withLogProbe() throws IOException, URISyntaxException {
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     }
-    checkResults(testClass, "debug_1", true);
+    checkResults(testClass, "debug_1", false);
   }
 
   @Test