add type to requests sent to intake (#9520)

help to discriminate type of content when processing by intake

Author: jpbempel

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

@@ -54,6 +54,7 @@ public static class IntakeRequest {
     private final DebuggerIntakeRequestData debugger;
     private final String ddsource = "dd_debugger";
     private final String message;
+    private final String type = "snapshot";
 
     private final String ddtags;
 
@@ -146,6 +147,10 @@ public String getLoggerThreadName() {
     public String getProcessTags() {
       return processTags;
     }
+
+    public String getType() {
+      return type;
+    }
   }
 
   public static class DebuggerIntakeRequestData {

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

@@ -25,6 +25,8 @@ public class ProbeStatus {
   @Json(name = "ddsource")
   private final String ddSource = "dd_debugger";
 
+  private final String type = "diagnostic";
+
   private final String service;
   private final String message;
   private final long timestamp;
@@ -51,6 +53,10 @@ public String getDdSource() {
     return ddSource;
   }
 
+  public String getType() {
+    return type;
+  }
+
   public String getService() {
     return service;
   }

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

@@ -36,7 +36,8 @@ public class SymbolSink {
       "{%n"
           + "\"ddsource\": \"dd_debugger\",%n"
           + "\"service\": \"%s\",%n"
-          + "\"runtimeId\": \"%s\"%n"
+          + "\"runtimeId\": \"%s\",%n"
+          + "\"type\": \"symdb\"%n"
           + "}";
   static final int MAX_SYMDB_UPLOAD_SIZE = 50 * 1024 * 1024;
 

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

@@ -325,6 +325,7 @@ private void deserialize(String buffer) throws IOException {
         MoshiHelper.createMoshiProbeStatus().adapter(ProbeStatus.class);
     ProbeStatus probeStatus = adapter.fromJson(buffer);
     assertEquals("dd_debugger", probeStatus.getDdSource());
+    assertEquals("diagnostic", probeStatus.getType());
     assertEquals(SERVICE_NAME, probeStatus.getService());
     assertEquals("Error installing probe " + PROBE_ID + ".", probeStatus.getMessage());
     assertEquals(PROBE_ID, probeStatus.getDiagnostics().getProbeId());

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

@@ -35,6 +35,7 @@ public void testSimpleFlush() {
     String strEventContent = new String(eventContent.getContent());
     assertTrue(strEventContent.contains("\"ddsource\": \"dd_debugger\""));
     assertTrue(strEventContent.contains("\"service\": \"service1\""));
+    assertTrue(strEventContent.contains("\"type\": \"symdb\""));
     BatchUploader.MultiPartContent symbolContent = symbolUploaderMock.multiPartContents.get(1);
     assertEquals("file", symbolContent.getPartName());
     assertEquals("file.json", symbolContent.getFileName());

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java

@@ -53,6 +53,10 @@ void testSimpleSingleFrameException() throws Exception {
     execute(appUrl, TRACED_METHOD_NAME, "oops"); // collecting snapshots and sending them
     registerTraceListener(this::receiveExceptionReplayTrace);
     registerSnapshotListener(this::receiveSnapshot);
+    registerIntakeRequestListener(
+        intakeRequest -> {
+          assertEquals("snapshot", intakeRequest.getType());
+        });
     processRequests(
         () -> {
           if (snapshotIdTags.isEmpty()) {

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/LogProbesIntegrationTest.java

@@ -68,6 +68,10 @@ void testFullMethod() throws Exception {
     setCurrentConfiguration(createConfig(probe));
     targetProcess = createProcessBuilder(logFilePath, METHOD_NAME, EXPECTED_UPLOADS).start();
     AtomicBoolean snapshotReceived = new AtomicBoolean();
+    registerIntakeRequestListener(
+        intakeRequest -> {
+          assertEquals("snapshot", intakeRequest.getType());
+        });
     registerSnapshotListener(
         snapshot -> {
           assertEquals(PROBE_ID.getId(), snapshot.getProbe().getId());