Send debugger logs to DEBUGGER track

jpbempel · jpbempel · commit 95a70383a1e4 · 2026-02-13T11:34:58.000+01:00
DEBUGGER track now apply SDS rules. We want to redact by default
the content of debugger logs (not only snapshots).
debugger/v2/input and debugger/v1/diagnostics endpoints send data to
DEBUGGER track. We privilege debugger/v2/input but fallbacks to
debugger/v1/diagnostics like snapshots
diff --git a/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java b/communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java
@@ -268,19 +268,7 @@ private boolean processInfoResponse(State newState, String response) {
         }
       }
 
-      if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V1)) {
-        newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V1;
-      }
-      // both debugger v2 and diagnostics endpoints are forwarding events to the DEBUGGER intake
-      // because older agents support diagnostics from DD agent 7.49
-      if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
-        newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V2;
-      } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
-        newState.debuggerSnapshotEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-      }
-      if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
-        newState.debuggerDiagnosticsEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
-      }
+      setDebuggerEndpoints(newState, endpoints);
 
       for (String endpoint : dataStreamsEndpoints) {
         if (containsEndpoint(endpoints, endpoint)) {
@@ -335,6 +323,26 @@ private boolean processInfoResponse(State newState, String response) {
     return false;
   }
 
+  private static void setDebuggerEndpoints(State newState, Set<String> endpoints) {
+    // both debugger v2 and diagnostics endpoints are forwarding events to the DEBUGGER intake
+    // because older agents support diagnostics from DD agent 7.49
+    if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
+      newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V2;
+    } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+      newState.debuggerLogEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
+    } else if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V1)) {
+      newState.debuggerLogEndpoint = DEBUGGER_ENDPOINT_V1;
+    }
+    if (containsEndpoint(endpoints, DEBUGGER_ENDPOINT_V2)) {
+      newState.debuggerSnapshotEndpoint = DEBUGGER_ENDPOINT_V2;
+    } else if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+      newState.debuggerSnapshotEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
+    }
+    if (containsEndpoint(endpoints, DEBUGGER_DIAGNOSTICS_ENDPOINT)) {
+      newState.debuggerDiagnosticsEndpoint = DEBUGGER_DIAGNOSTICS_ENDPOINT;
+    }
+  }
+
   private static boolean containsEndpoint(Set<String> endpoints, String endpoint) {
     return endpoints.contains(endpoint) || endpoints.contains("/" + endpoint);
   }
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
@@ -116,7 +116,7 @@ void testEndpoints() throws Exception {
               }
               if (line.contains("Started BatchUploader[Logs]")) {
                 return !line.matches(
-                    ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/input");
+                    ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/diagnostics");
               }
               if (line.contains("Started BatchUploader[SymDB]")) {
                 return !line.matches(

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void testEndpoints() throws Exception {`
`116`	`116`	`}`
`117`	`117`	`if (line.contains("Started BatchUploader[Logs]")) {`
`118`	`118`	`return !line.matches(`
`119`		`- ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/input");`
	`119`	`+ ".* Started BatchUploader\\[Logs] with target url http://localhost:\\d+/debugger/v1/diagnostics");`
`120`	`120`	`}`
`121`	`121`	`if (line.contains("Started BatchUploader[SymDB]")) {`
`122`	`122`	`return !line.matches(`