Focus baseline Dynamic Tests E2E coverage

Author: AlexandreYang

pkg/network/sender/BUILD.bazel

@@ -144,6 +144,7 @@ dd_agent_go_test(
             "//comp/core/workloadmeta/mock",
             "//comp/forwarder/connectionsforwarder/mock",
             "//comp/networkpath/npcollector/impl",
+            "//comp/networkpath/npcollector/model",
             "//pkg/eventmonitor",
             "//pkg/network",
             "//pkg/network/dns",
@@ -171,6 +172,7 @@ dd_agent_go_test(
             "//comp/core/workloadmeta/mock",
             "//comp/forwarder/connectionsforwarder/mock",
             "//comp/networkpath/npcollector/impl",
+            "//comp/networkpath/npcollector/model",
             "//pkg/eventmonitor",
             "//pkg/network",
             "//pkg/network/dns",

pkg/network/sender/sender_linux_test.go

@@ -9,6 +9,7 @@ package sender
 
 import (
 	"fmt"
+	"math"
 	"slices"
 	"strconv"
 	"testing"
@@ -32,6 +33,7 @@ import (
 	workloadmetamock "github.com/DataDog/datadog-agent/comp/core/workloadmeta/mock"
 	connectionsforwardermock "github.com/DataDog/datadog-agent/comp/forwarder/connectionsforwarder/mock"
 	npcollectorimpl "github.com/DataDog/datadog-agent/comp/networkpath/npcollector/impl"
+	npmodel "github.com/DataDog/datadog-agent/comp/networkpath/npcollector/model"
 	"github.com/DataDog/datadog-agent/pkg/eventmonitor"
 	"github.com/DataDog/datadog-agent/pkg/network"
 	"github.com/DataDog/datadog-agent/pkg/network/dns"
@@ -155,6 +157,29 @@ func TestNetworkConnectionBatching(t *testing.T) {
 	}
 }
 
+func TestNetworkPathConnectionsBaselineSignals(t *testing.T) {
+	d := mockDirectSender(t)
+	conn := makeConnection(1)
+	conn.TCPFailures = map[uint16]uint32{npmodel.TCPTimeoutErrno: 1}
+	conn.Last.TCPRTOCount = 2
+	conn.Last.Retransmits = 3
+	conn.RTTVar = 4
+	conn.Last.SentBytes = math.MaxUint64
+	conn.Last.RecvBytes = 1
+
+	got := slices.Collect(d.networkPathConnections(&network.Connections{
+		BufferedData: network.BufferedData{Conns: []network.ConnectionStats{conn}},
+	}))
+
+	require.Len(t, got, 1)
+	assert.True(t, got[0].TCPTimeout)
+	assert.True(t, got[0].TCPRTO)
+	assert.Equal(t, uint64(3), got[0].Retransmits)
+	assert.Equal(t, uint64(4), got[0].RTTVar)
+	assert.Equal(t, uint64(math.MaxUint64), got[0].Bytes)
+	assert.True(t, got[0].NumericSaturated)
+}
+
 func TestNetworkConnectionBatchingWithDNS(t *testing.T) {
 	d := mockDirectSender(t)
 	d.maxConnsPerMessage = 1

pkg/process/checks/BUILD.bazel

@@ -248,6 +248,7 @@ dd_agent_go_test(
         "//comp/core/workloadmeta/def",
         "//comp/core/workloadmeta/fx-mock",
         "//comp/core/workloadmeta/mock",
+        "//comp/networkpath/npcollector/model",
         "//comp/process/gpusubscriber/fx-mock",
         "//pkg/config/env",
         "//pkg/config/mock",

pkg/process/checks/net.go

@@ -7,6 +7,7 @@ package checks
 
 import (
 	"fmt"
+	"iter"
 	"net/http"
 	"net/netip"
 	"sort"
@@ -219,7 +220,11 @@ func (c *ConnectionsCheck) Cleanup() {
 }
 
 func (c *ConnectionsCheck) scheduleNetworkPath(conns *model.Connections) {
-	c.npCollector.ScheduleNetworkPathTests(func(yield func(npmodel.NetworkPathConnection) bool) {
+	c.npCollector.ScheduleNetworkPathTests(networkPathConnections(conns))
+}
+
+func networkPathConnections(conns *model.Connections) iter.Seq[npmodel.NetworkPathConnection] {
+	return func(yield func(npmodel.NetworkPathConnection) bool) {
 		for _, conn := range conns.Conns {
 			srcIP, err := netip.ParseAddr(conn.Laddr.GetIp())
 			if err != nil {
@@ -263,7 +268,7 @@ func (c *ConnectionsCheck) scheduleNetworkPath(conns *model.Connections) {
 				return
 			}
 		}
-	})
+	}
 }
 
 func getDNSNameForIP(conns *model.Connections, ip string) string {

pkg/process/checks/net_test.go

@@ -7,15 +7,18 @@ package checks
 
 import (
 	"fmt"
+	"math"
 	"os"
 	"runtime"
+	"slices"
 	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	model "github.com/DataDog/agent-payload/v5/process"
+	npmodel "github.com/DataDog/datadog-agent/comp/networkpath/npcollector/model"
 
 	taggerfxmock "github.com/DataDog/datadog-agent/comp/core/tagger/fx-mock"
 	taggertypes "github.com/DataDog/datadog-agent/comp/core/tagger/types"
@@ -167,6 +170,28 @@ func TestNetworkConnectionBatching(t *testing.T) {
 	}
 }
 
+func TestNetworkPathConnectionsBaselineSignals(t *testing.T) {
+	conn := makeConnection(1)
+	conn.Laddr.Ip = "10.0.0.1"
+	conn.Raddr.Ip = "10.0.0.2"
+	conn.TcpFailuresByErrCode = map[uint32]uint32{uint32(npmodel.TCPTimeoutErrno): 1}
+	conn.LastTcpRtoCount = 2
+	conn.LastRetransmits = 3
+	conn.RttVar = 4
+	conn.LastBytesSent = math.MaxUint64
+	conn.LastBytesReceived = 1
+
+	got := slices.Collect(networkPathConnections(&model.Connections{Conns: []*model.Connection{conn}}))
+
+	require.Len(t, got, 1)
+	assert.True(t, got[0].TCPTimeout)
+	assert.True(t, got[0].TCPRTO)
+	assert.Equal(t, uint64(3), got[0].Retransmits)
+	assert.Equal(t, uint64(4), got[0].RTTVar)
+	assert.Equal(t, uint64(math.MaxUint64), got[0].Bytes)
+	assert.True(t, got[0].NumericSaturated)
+}
+
 func TestNetworkConnectionBatchingWithDNS(t *testing.T) {
 	p := makeConnections(4)
 

test/new-e2e/tests/netpath/dynamic-tests/config/baseline_host_traffic_dynamic_path.yaml

@@ -1,6 +1,4 @@
 network_path:
-  remote_config:
-    enabled: true
   connections_monitoring:
     baseline_tests:
       enabled: true

test/new-e2e/tests/netpath/dynamic-tests/host_traffic_dynamic_path_test.go

@@ -94,8 +94,8 @@ type hostTrafficDynamicPathEnv struct {
 
 type hostTrafficDynamicPathSuite struct {
 	e2e.BaseSuite[hostTrafficDynamicPathEnv]
-	remoteConfigAdded       bool
-	preserveInitialPayloads bool
+	remoteConfigAdded bool
+	skipRemoteConfig  bool
 }
 
 type baselineHostTrafficDynamicPathSuite struct {
@@ -110,7 +110,7 @@ func TestHostTrafficDynamicPathSuite(t *testing.T) {
 // TestBaselineHostTrafficDynamicPathSuite verifies baseline tests from packaged Agent configuration through fakeintake.
 func TestBaselineHostTrafficDynamicPathSuite(t *testing.T) {
 	suite := &baselineHostTrafficDynamicPathSuite{
-		hostTrafficDynamicPathSuite: hostTrafficDynamicPathSuite{preserveInitialPayloads: true},
+		hostTrafficDynamicPathSuite: hostTrafficDynamicPathSuite{skipRemoteConfig: true},
 	}
 	e2e.Run(t, suite, e2e.WithProvisioner(hostTrafficDynamicPathProvisioner("baselineHostTrafficDynamicPath", baselineHostTrafficDynamicPathAgentConfig, baselineHostTrafficSystemProbeConfig)))
 }
@@ -183,6 +183,11 @@ func (s *hostTrafficDynamicPathSuite) SetupSuite() {
 	s.assertHostTrafficDomainResolves()
 
 	fakeintake := s.Env().FakeIntake.Client()
+	if s.skipRemoteConfig {
+		require.NoError(s.T(), fakeintake.FlushServerAndResetAggregators())
+		return
+	}
+
 	s.EventuallyWithT(func(c *assert.CollectT) {
 		stats, err := fakeintake.RCStats()
 		assert.NoError(c, err)
@@ -198,9 +203,7 @@ func (s *hostTrafficDynamicPathSuite) SetupSuite() {
 		assert.Greater(c, stats.Polls, statsAfterAdd.Polls, "agent did not poll Remote Config after the dynamic config was added")
 	}, 2*time.Minute, 5*time.Second)
 
-	if !s.preserveInitialPayloads {
-		require.NoError(s.T(), fakeintake.FlushServerAndResetAggregators())
-	}
+	require.NoError(s.T(), fakeintake.FlushServerAndResetAggregators())
 }
 
 func (s *hostTrafficDynamicPathSuite) TearDownSuite() {
@@ -285,9 +288,6 @@ func (s *baselineHostTrafficDynamicPathSuite) TestHostTrafficDynamicNetworkPath(
 		assert.Equal(c, uint16(80), match.Destination.Port)
 		require.NotEmpty(c, match.Traceroute.Runs, "matched network path has no traceroute runs")
 		assert.True(c, hasTracerouteDestinationIP(match), "matched network path has no traceroute destination IP")
-		assert.Empty(c, match.TestConfigID, "baseline test unexpectedly inherited Remote Config attribution")
-		assert.Empty(c, match.TestConfigSource, "baseline test unexpectedly inherited Remote Config attribution")
-		assert.Empty(c, match.Tags, "baseline test unexpectedly inherited Remote Config tags")
 	}, 5*time.Minute, 10*time.Second)
 }
 
@@ -396,8 +396,6 @@ fi
 func (s *hostTrafficDynamicPathSuite) assertHostTrafficDomainResolves() {
 	output := s.Env().RemoteHost.MustExecute("getent ahostsv4 " + shellQuote(hostTrafficRemoteConfigDomain))
 	require.Contains(s.T(), output, s.Env().HTTPBinHost.Address)
-
-	s.Env().RemoteHost.MustExecute(fmt.Sprintf("curl -4 -fsS --retry 3 --max-time 5 %s >/dev/null", shellQuote(hostTrafficURL(hostTrafficRemoteConfigDomain))))
 }
 
 func (s *hostTrafficDynamicPathSuite) startHostTrafficGenerator(duration time.Duration) {