feat: add product field to snapshots

Author: daniel-mohedano

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

@@ -14,13 +14,15 @@
 public class JsonSnapshotSerializer implements DebuggerContext.ValueSerializer {
   private static final String DD_TRACE_ID = "dd.trace_id";
   private static final String DD_SPAN_ID = "dd.span_id";
+  public static final String TEST_OPT_PRODUCT = "test_optimization";
   private static final JsonAdapter<IntakeRequest> ADAPTER =
       MoshiHelper.createMoshiSnapshot().adapter(IntakeRequest.class);
   private static final JsonAdapter<CapturedContext.CapturedValue> VALUE_ADAPTER =
       new MoshiSnapshotHelper.CapturedValueAdapter();
 
-  public String serializeSnapshot(String serviceName, Snapshot snapshot) {
-    IntakeRequest request = new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot));
+  public String serializeSnapshot(String serviceName, Snapshot snapshot, Config config) {
+    IntakeRequest request =
+        new IntakeRequest(serviceName, new DebuggerIntakeRequestData(snapshot), config);
     handleCorrelationFields(snapshot, request);
     handleDuration(snapshot, request);
     handlerLogger(snapshot, request);
@@ -53,6 +55,7 @@ public static class IntakeRequest {
     private final String service;
     private final DebuggerIntakeRequestData debugger;
     private final String ddsource = "dd_debugger";
+    private final String product;
     private final String message;
 
     private final String ddtags;
@@ -85,14 +88,15 @@ public static class IntakeRequest {
     @Json(name = "logger.thread_name")
     private String loggerThreadName;
 
-    public IntakeRequest(String service, DebuggerIntakeRequestData debugger) {
+    public IntakeRequest(String service, DebuggerIntakeRequestData debugger, Config config) {
       this.service = service;
       this.debugger = debugger;
       this.message = debugger.snapshot.getMessage();
       this.ddtags = debugger.snapshot.getProbe().getStrTags();
       this.timestamp = debugger.snapshot.getTimestamp();
       final CharSequence pt = ProcessTags.getTagsForSerialization();
       this.processTags = pt != null ? pt.toString() : null;
+      this.product = config.isCiVisibilityFailedTestReplayActive() ? TEST_OPT_PRODUCT : null;
     }
 
     public String getService() {
@@ -107,6 +111,10 @@ public String getDdsource() {
       return ddsource;
     }
 
+    public String getProduct() {
+      return product;
+    }
+
     public String getMessage() {
       return message;
     }

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/SnapshotSink.java

@@ -45,10 +45,12 @@ public class SnapshotSink {
   private final AtomicBoolean started = new AtomicBoolean();
   private volatile AgentTaskScheduler.Scheduled<SnapshotSink> highRateScheduled;
   private volatile long currentHighRateFlushInterval = HIGH_RATE_MAX_FLUSH_INTERVAL_MS;
+  private final Config config;
 
   public SnapshotSink(Config config, String tags, BatchUploader snapshotUploader) {
     this.serviceName = TagsHelper.sanitize(config.getServiceName());
     this.batchSize = config.getDynamicInstrumentationUploadBatchSize();
+    this.config = config;
     this.tags = tags;
     this.snapshotUploader = snapshotUploader;
   }
@@ -183,7 +185,8 @@ private List<String> getSerializedSnapshots(BlockingQueue<Snapshot> queue, int l
 
   private String serializeSnapshot(String serviceName, Snapshot snapshot) {
     snapshot.getId(); // Ensure id is generated
-    String str = DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot);
+    String str =
+        DebuggerAgent.getSnapshotSerializer().serializeSnapshot(serviceName, snapshot, config);
     String prunedStr = SnapshotPruner.prune(str, MAX_SNAPSHOT_SIZE, 4);
     if (prunedStr.length() != str.length()) {
       LOGGER.debug(

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/sink/DebuggerSinkTest.java

@@ -124,6 +124,27 @@ public void addSnapshot(boolean processTagsEnabled) throws IOException {
     }
   }
 
+  @ParameterizedTest(name = "Add Failed Test Replay product ''{0}''")
+  @ValueSource(booleans = {true, false})
+  public void addProductTag(boolean failedTestReplayActive) throws IOException {
+    when(config.isCiVisibilityFailedTestReplayActive()).thenReturn(failedTestReplayActive);
+    ProcessTags.reset(config);
+    DebuggerSink sink = createDefaultDebuggerSink();
+    DebuggerAgentHelper.injectSerializer(new JsonSnapshotSerializer());
+    Snapshot snapshot = createSnapshot();
+    sink.addSnapshot(snapshot);
+    sink.lowRateFlush(sink);
+    verify(batchUploader).upload(payloadCaptor.capture(), matches(EXPECTED_SNAPSHOT_TAGS));
+    String strPayload = new String(payloadCaptor.getValue(), StandardCharsets.UTF_8);
+    System.out.println(strPayload);
+    JsonSnapshotSerializer.IntakeRequest intakeRequest = assertOneIntakeRequest(strPayload);
+    if (failedTestReplayActive) {
+      assertEquals(JsonSnapshotSerializer.TEST_OPT_PRODUCT, intakeRequest.getProduct());
+    } else {
+      assertNull(intakeRequest.getProduct());
+    }
+  }
+
   @Test
   public void addMultipleSnapshots() throws IOException {
     when(config.getDynamicInstrumentationUploadBatchSize()).thenReturn(2);