fix(dogstatsd-replay): delegate to agent-data-plane when ADP handles DSD

When data_plane.enabled is true, the Core Agent's DSD server is
disabled and ADP owns the UDS socket. The existing dogstatsd-replay and
dogstatsd-capture subcommands were unaware of this and continued to call
DogstatsdSetTaggerState (a no-op for ADP) then send packets to a socket
ADP owns without a replay session active, so tag enrichment was silently
lost.

ADP already has its own dogstatsd replay/capture CLI that correctly
loads tagger state into ADP before replaying. Delegate to it via exec
when data_plane.dogstatsd.enabled is true.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: jszwedko

cmd/agent/subcommands/dogstatsdcapture/command.go

@@ -10,6 +10,9 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
 	"time"
 
 	"go.uber.org/fx"
@@ -22,6 +25,7 @@ import (
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
 	pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/core"
+	"github.com/DataDog/datadog-agent/pkg/util/defaultpaths"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 
 	"github.com/spf13/cobra"
@@ -75,7 +79,43 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{dogstatsdCaptureCmd}
 }
 
+func findADPBinary() (string, error) {
+	candidates := []string{
+		filepath.Join(defaultpaths.GetEmbeddedBinPath(), "agent-data-plane"),
+		filepath.Join(defaultpaths.GetInstallPath(), "bin", "agent", "agent-data-plane"),
+	}
+	for _, p := range candidates {
+		if _, err := os.Stat(p); err == nil {
+			return p, nil
+		}
+	}
+	return "", fmt.Errorf("agent-data-plane binary not found (tried: %v)", candidates)
+}
+
+func captureViaADP(cliParams *cliParams) error {
+	adpBin, err := findADPBinary()
+	if err != nil {
+		return fmt.Errorf("cannot delegate dogstatsd-capture to agent-data-plane: %w", err)
+	}
+
+	args := []string{"dogstatsd", "capture", "--duration", cliParams.dsdCaptureDuration.String()}
+	if cliParams.dsdCaptureFilePath != "" {
+		args = append(args, "--path", cliParams.dsdCaptureFilePath)
+	}
+	if !cliParams.dsdCaptureCompressed {
+		args = append(args, "--compressed", "false")
+	}
+
+	cmd := exec.Command(adpBin, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
 func dogstatsdCapture(_ log.Component, _ config.Component, cliParams *cliParams, ipc ipc.Component) error {
+	if pkgconfigsetup.Datadog().GetBool("data_plane.enabled") && pkgconfigsetup.Datadog().GetBool("data_plane.dogstatsd.enabled") {
+		return captureViaADP(cliParams)
+	}
 	fmt.Printf("Starting a dogstatsd traffic capture session...\n\n")
 
 	ctx, cancel := context.WithCancel(context.Background())

cmd/agent/subcommands/dogstatsdreplay/command.go

@@ -12,7 +12,10 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"os/exec"
 	"os/signal"
+	"path/filepath"
+	"strconv"
 	"syscall"
 
 	"go.uber.org/fx"
@@ -31,6 +34,7 @@ import (
 	replay "github.com/DataDog/datadog-agent/comp/dogstatsd/replay/impl"
 	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
 	pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/core"
+	"github.com/DataDog/datadog-agent/pkg/util/defaultpaths"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 )
 
@@ -77,7 +81,23 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{dogstatsdReplayCmd}
 }
 
+func findADPBinary() (string, error) {
+	candidates := []string{
+		filepath.Join(defaultpaths.GetEmbeddedBinPath(), "agent-data-plane"),
+		filepath.Join(defaultpaths.GetInstallPath(), "bin", "agent", "agent-data-plane"),
+	}
+	for _, p := range candidates {
+		if _, err := os.Stat(p); err == nil {
+			return p, nil
+		}
+	}
+	return "", fmt.Errorf("agent-data-plane binary not found (tried: %v)", candidates)
+}
+
 func dogstatsdReplay(_ log.Component, _ config.Component, cliParams *cliParams, ipc ipc.Component) error {
+	if pkgconfigsetup.Datadog().GetBool("data_plane.enabled") && pkgconfigsetup.Datadog().GetBool("data_plane.dogstatsd.enabled") {
+		return replayViaADP(cliParams)
+	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -211,3 +231,20 @@ func dogstatsdReplay(_ log.Component, _ config.Component, cliParams *cliParams,
 	fmt.Println("replay done")
 	return err
 }
+
+func replayViaADP(cliParams *cliParams) error {
+	adpBin, err := findADPBinary()
+	if err != nil {
+		return fmt.Errorf("cannot delegate dogstatsd-replay to agent-data-plane: %w", err)
+	}
+
+	args := []string{"dogstatsd", "replay", "--file", cliParams.dsdReplayFilePath}
+	if cliParams.dsdReplayIterations != defaultIterations {
+		args = append(args, "--loops", strconv.Itoa(cliParams.dsdReplayIterations))
+	}
+
+	cmd := exec.Command(adpBin, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}

test/new-e2e/tests/agent-subcommands/dogstatsdreplay_nix_test.go

@@ -30,13 +30,6 @@ log_level: DEBUG
 dogstatsd_non_local_traffic: true
 dogstatsd_tag_cardinality: high
 dogstatsd_origin_detection: true
-# dogstatsd-replay tag enrichment relies on the Core Agent DSD server's PID map
-# (set via DogstatsdSetTaggerState). ADP does not consult this map for origin
-# detection, so replay tag enrichment does not work when ADP handles DSD.
-# Disable ADP here so this test exercises the Core Agent DSD path.
-# TODO: fix dogstatsd-replay to inject dd.internal.entity_id into packets so
-# it works with ADP too (https://github.com/DataDog/saluki/issues/2341).
-data_plane.enabled: false
 `),
 				),
 			),