Add correlation Ids for dynamic logs

jpbempel · jpbempel · commit 714c4f804523 · 2023-08-22T16:12:30.000+02:00
Adding trace id and span id for both snapshot and log probes
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/JsonSnapshotSerializer.java
@@ -45,14 +45,14 @@ private void handleDuration(Snapshot snapshot, IntakeRequest request) {
   }
 
   private void handleCorrelationFields(Snapshot snapshot, IntakeRequest request) {
+    request.traceId = snapshot.getTraceId();
+    request.spanId = snapshot.getSpanId();
     CapturedContext entry = snapshot.getCaptures().getEntry();
     if (entry != null) {
-      addTraceSpanId(entry, request);
       removeTraceSpanId(entry);
     }
     if (snapshot.getCaptures().getLines() != null) {
       for (CapturedContext context : snapshot.getCaptures().getLines().values()) {
-        addTraceSpanId(context, request);
         removeTraceSpanId(context);
       }
     }
@@ -71,11 +71,6 @@ private void removeTraceSpanId(CapturedContext context) {
     fields.remove(DD_SPAN_ID);
   }
 
-  private void addTraceSpanId(CapturedContext context, IntakeRequest request) {
-    request.traceId = context.getTraceId();
-    request.spanId = context.getSpanId();
-  }
-
   public static class IntakeRequest {
     private final String service;
     private final DebuggerIntakeRequestData debugger;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java
@@ -420,6 +420,8 @@ public void commit(
           return;
         }
       }
+      snapshot.setTraceId(entryContext.getTraceId());
+      snapshot.setSpanId(entryContext.getSpanId());
       if (isCaptureSnapshot()) {
         snapshot.setEntry(entryContext);
         snapshot.setExit(exitContext);
@@ -494,6 +496,8 @@ public void commit(CapturedContext lineContext, int line) {
           return;
         }
       }
+      snapshot.setTraceId(lineContext.getTraceId());
+      snapshot.setSpanId(lineContext.getSpanId());
       if (isCaptureSnapshot()) {
         snapshot.addLine(lineContext, line);
       }
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java
@@ -26,8 +26,8 @@ public class Snapshot {
   private final ProbeImplementation probe;
   private final String language;
   private final transient CapturedThread thread;
-  private String traceId; // trace_id
-  private String spanId; // span_id
+  private transient String traceId;
+  private transient String spanId;
   private List<EvaluationError> evaluationErrors;
   private transient String message;
   private final transient int maxDepth;
@@ -176,6 +176,14 @@ public void recordStackTrace(int offset) {
     }
   }
 
+  public void setTraceId(String traceId) {
+    this.traceId = traceId;
+  }
+
+  public void setSpanId(String spanId) {
+    this.spanId = spanId;
+  }
+
   public enum Kind {
     ENTER,
     RETURN,
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/TracerDebuggerIntegrationTest.java
@@ -62,6 +62,27 @@ void testTracer() throws Exception {
         logHasErrors(logFilePath, it -> it.contains("TypePool$Resolution$NoSuchTypeException")));
   }
 
+  @Test
+  @DisplayName("testTracerDynamicLog")
+  void testTracerDynamicLog() throws Exception {
+    LogProbe logProbe =
+        LogProbe.builder()
+            .probeId(PROBE_ID)
+            .where(
+                "org.springframework.web.servlet.DispatcherServlet",
+                "doService",
+                "(HttpServletRequest, HttpServletResponse)")
+            .captureSnapshot(false)
+            .build();
+    JsonSnapshotSerializer.IntakeRequest request = doTestTracer(logProbe);
+    Snapshot snapshot = request.getDebugger().getSnapshot();
+    assertEquals("123356536", snapshot.getProbe().getId());
+    assertTrue(Pattern.matches("[0-9a-f]+", request.getTraceId()));
+    assertTrue(Pattern.matches("\\d+", request.getSpanId()));
+    assertFalse(
+        logHasErrors(logFilePath, it -> it.contains("TypePool$Resolution$NoSuchTypeException")));
+  }
+
   @Test
   @DisplayName("testTracerSameMethod")
   void testTracerSameMethod() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,14 @@ private void handleDuration(Snapshot snapshot, IntakeRequest request) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private void handleCorrelationFields(Snapshot snapshot, IntakeRequest request) {`
	`48`	`+ request.traceId = snapshot.getTraceId();`
	`49`	`+ request.spanId = snapshot.getSpanId();`
`48`	`50`	`CapturedContext entry = snapshot.getCaptures().getEntry();`
`49`	`51`	`if (entry != null) {`
`50`		`- addTraceSpanId(entry, request);`
`51`	`52`	`removeTraceSpanId(entry);`
`52`	`53`	`}`
`53`	`54`	`if (snapshot.getCaptures().getLines() != null) {`
`54`	`55`	`for (CapturedContext context : snapshot.getCaptures().getLines().values()) {`
`55`		`- addTraceSpanId(context, request);`
`56`	`56`	`removeTraceSpanId(context);`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -71,11 +71,6 @@ private void removeTraceSpanId(CapturedContext context) {`
`71`	`71`	`fields.remove(DD_SPAN_ID);`
`72`	`72`	`}`
`73`	`73`
`74`		`- private void addTraceSpanId(CapturedContext context, IntakeRequest request) {`
`75`		`- request.traceId = context.getTraceId();`
`76`		`- request.spanId = context.getSpanId();`
`77`		`- }`
`78`		`-`
`79`	`74`	`public static class IntakeRequest {`
`80`	`75`	`private final String service;`
`81`	`76`	`private final DebuggerIntakeRequestData debugger;`
Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,8 @@ public void commit(`
`420`	`420`	`return;`
`421`	`421`	`}`
`422`	`422`	`}`
	`423`	`+ snapshot.setTraceId(entryContext.getTraceId());`
	`424`	`+ snapshot.setSpanId(entryContext.getSpanId());`
`423`	`425`	`if (isCaptureSnapshot()) {`
`424`	`426`	`snapshot.setEntry(entryContext);`
`425`	`427`	`snapshot.setExit(exitContext);`
`@@ -494,6 +496,8 @@ public void commit(CapturedContext lineContext, int line) {`
`494`	`496`	`return;`
`495`	`497`	`}`
`496`	`498`	`}`
	`499`	`+ snapshot.setTraceId(lineContext.getTraceId());`
	`500`	`+ snapshot.setSpanId(lineContext.getSpanId());`
`497`	`501`	`if (isCaptureSnapshot()) {`
`498`	`502`	`snapshot.addLine(lineContext, line);`
`499`	`503`	`}`