change tags to match Code Origin RFC updated spec

Author: shatzi

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

@@ -1,7 +1,6 @@
 package com.datadog.debugger.probe;
 
 import static com.datadog.debugger.codeorigin.DebuggerConfiguration.isDebuggerEnabled;
-import static datadog.trace.api.DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID;
 import static datadog.trace.api.DDTags.DD_STACK_CODE_ORIGIN_FRAME;
 import static datadog.trace.api.DDTags.DD_STACK_CODE_ORIGIN_TYPE;
 import static java.lang.String.format;
@@ -13,7 +12,6 @@
 import com.datadog.debugger.instrumentation.InstrumentationResult;
 import com.datadog.debugger.sink.Snapshot;
 import com.datadog.debugger.util.ClassNameFiltering;
-import datadog.trace.api.DDTags;
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.MethodLocation;
 import datadog.trace.bootstrap.debugger.ProbeId;
@@ -91,28 +89,9 @@ public void commit(
 
   private void applySpanOriginTags(AgentSpan span, String snapshotId) {
     List<StackTraceElement> entries = getUserStackFrames();
-    recordCodeOrigin(span, entries, snapshotId);
     recordStackFrames(span, entries, snapshotId);
   }
 
-  private void recordCodeOrigin(
-      AgentSpan span, List<StackTraceElement> entries, String snapshotId) {
-    if (entrySpanProbe && !entries.isEmpty()) {
-      StackTraceElement entry = entries.get(0);
-      List<AgentSpan> list = asList(span, span.getLocalRootSpan());
-      for (AgentSpan s : list) {
-        s.setTag(DDTags.DD_CODE_ORIGIN_FILE, toFileName(entry.getClassName()));
-        s.setTag(DDTags.DD_CODE_ORIGIN_METHOD, entry.getMethodName());
-        s.setTag(DDTags.DD_CODE_ORIGIN_LINE, entry.getLineNumber());
-        s.setTag(DDTags.DD_CODE_ORIGIN_TYPE, entry.getClassName());
-        s.setTag(DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE, signature);
-        if (snapshotId != null) {
-          s.setTag(DD_CODE_ORIGIN_SNAPSHOT_ID, snapshotId);
-        }
-      }
-    }
-  }
-
   private void recordStackFrames(
       AgentSpan span, List<StackTraceElement> entries, String snapshotId) {
     List<AgentSpan> agentSpans =
@@ -127,6 +106,9 @@ private void recordStackFrames(
         s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "method"), info.getMethodName());
         s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "line"), info.getLineNumber());
         s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "type"), info.getClassName());
+        if (i == 0 && signature != null) {
+          s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "signature"), signature);
+        }
         if (i == 0 && snapshotId != null) {
           s.setTag(format(DD_STACK_CODE_ORIGIN_FRAME, i, "snapshot_id"), snapshotId);
         }

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

@@ -40,6 +40,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,6 +50,8 @@ public class LogProbe extends ProbeDefinition {
   private static final Limits LIMITS = new Limits(1, 3, 8192, 5);
   private static final int LOG_MSG_LIMIT = 8192;
 
+  private static final Pattern SPLIT_WATCHES_PATTERN = Pattern.compile(",");
+
   /** Stores part of a templated message either a str or an expression */
   public static class Segment {
     private final String str;
@@ -336,7 +339,7 @@ private static List<ValueScript> parseWatchesFromTags(Tag[] tags) {
       if ("dd_watches_dsl".equals(tag.getKey())) {
         String ddWatches = tag.getValue();
         // this for POC only, parsing is not robust!
-        String[] splitWatches = ddWatches.split(",");
+        String[] splitWatches = SPLIT_WATCHES_PATTERN.split(ddWatches);
         for (String watchDef : splitWatches) {
           // remove curly braces
           String refPath = watchDef.substring(1, watchDef.length() - 1);

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

@@ -32,7 +32,6 @@
 import com.datadog.debugger.util.TestTraceInterceptor;
 import datadog.trace.agent.tooling.TracerInstaller;
 import datadog.trace.api.Config;
-import datadog.trace.api.DDTags;
 import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.api.interceptor.MutableSpan;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
@@ -191,10 +190,6 @@ private void waitForInstrumentation() {
 
   private static void checkEntrySpanTags(MutableSpan span, boolean includeSnapshot) {
     String keys = format("Existing keys for %s: %s", span.getOperationName(), ldKeys(span));
-    assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_FILE);
-    assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_LINE);
-    assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_METHOD);
-    assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE);
 
     assertEquals(span.getTag(DD_STACK_CODE_ORIGIN_TYPE), "entry", keys);
     assertKeyPresent(span, DD_STACK_CODE_ORIGIN_TYPE);
@@ -204,7 +199,6 @@ private static void checkEntrySpanTags(MutableSpan span, boolean includeSnapshot
     assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "type"));
 
     if (includeSnapshot) {
-      assertKeyPresent(span, DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID);
       assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "snapshot_id"));
     }
   }
@@ -229,14 +223,8 @@ private static void checkExitSpanTags(MutableSpan span, boolean includeSnapshot)
     String keys =
         format("Existing keys for %s: %s", span.getOperationName(), new TreeSet<>(ldKeys(span)));
 
-    assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_FILE);
-    assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_LINE);
-    assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_METHOD);
-    assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE);
-    assertKeyNotPresent(span, DDTags.DD_CODE_ORIGIN_SNAPSHOT_ID);
-
     assertKeyPresent(span, DD_STACK_CODE_ORIGIN_TYPE);
-    assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "file"));
+    assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 3, "file"));
     assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "line"));
     assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "method"));
     assertKeyPresent(span, format(DD_STACK_CODE_ORIGIN_FRAME, 0, "type"));

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

@@ -62,10 +62,6 @@ class TagsAssert {
     assertedTags.add(DDTags.PROFILING_ENABLED)
     assertedTags.add(DDTags.PROFILING_CONTEXT_ENGINE)
     assertedTags.add(DDTags.BASE_SERVICE)
-    assertedTags.add(DDTags.DD_CODE_ORIGIN_FILE)
-    assertedTags.add(DDTags.DD_CODE_ORIGIN_METHOD)
-    assertedTags.add(DDTags.DD_CODE_ORIGIN_LINE)
-    assertedTags.add(DDTags.DD_CODE_ORIGIN_METHOD_SIGNATURE)
     assertedTags.add(DDTags.DSM_ENABLED)
     assertedTags.add(DDTags.DJM_ENABLED)
     assertedTags.add(DDTags.PARENT_ID)

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

@@ -3,20 +3,12 @@
 public class DDTags {
 
   private static final String DD_LD_PREFIX = "_dd.ld.";
-  public static final String DD_STACK_CODE_ORIGIN_PREFIX = "_dd.stack.code_origin.";
+  public static final String DD_STACK_CODE_ORIGIN_PREFIX = DD_LD_PREFIX + "code_origin.";
 
   public static final String DD_STACK_CODE_ORIGIN_TYPE = DD_STACK_CODE_ORIGIN_PREFIX + "type";
   // _dd.stack.code_origin.frame.%d.file|line|method|type|snapshot_id
   public static final String DD_STACK_CODE_ORIGIN_FRAME =
-      DD_STACK_CODE_ORIGIN_PREFIX + "frame.%d.%s";
-
-  public static final String DD_CODE_ORIGIN_FILE = DD_LD_PREFIX + "code_origin.file";
-  public static final String DD_CODE_ORIGIN_METHOD = DD_LD_PREFIX + "code_origin.method";
-  public static final String DD_CODE_ORIGIN_METHOD_SIGNATURE =
-      DD_LD_PREFIX + "code_origin.signature";
-  public static final String DD_CODE_ORIGIN_LINE = DD_LD_PREFIX + "code_origin.line";
-  public static final String DD_CODE_ORIGIN_SNAPSHOT_ID = DD_LD_PREFIX + "code_origin.snapshot_id";
-  public static final String DD_CODE_ORIGIN_TYPE = DD_LD_PREFIX + "code_origin.type";
+      DD_STACK_CODE_ORIGIN_PREFIX + "frames.%d.%s";
 
   public static final String SPAN_TYPE = "span.type";
   public static final String SERVICE_NAME = "service.name";