Simplify baseline dynamic test configuration

Author: AlexandreYang

comp/networkpath/npcollector/impl/baseline_window_test.go

@@ -35,7 +35,7 @@ func baselineWindowConn(host string, bytes uint64) npmodel.NetworkPathConnection
 
 func TestBaselineFirstSnapshotAndSteadyWindow(t *testing.T) {
 	_, collector := newTestNpCollector(t, map[string]any{
-		"network_path.connections_monitoring.baseline_tests.enabled": true,
+		"network_path.connections_monitoring.baseline_tests_enabled": true,
 		"network_path.collector.monitor_ip_without_domain":           true,
 		"network_path.collector.pathtest_interval":                   time.Second,
 	}, &teststatsd.Client{}, nil)
@@ -69,7 +69,7 @@ func TestBaselineFirstSnapshotAndSteadyWindow(t *testing.T) {
 
 func TestBaselineEmptySnapshotsDoNotStartVirtualWindow(t *testing.T) {
 	_, collector := newTestNpCollector(t, map[string]any{
-		"network_path.connections_monitoring.baseline_tests.enabled": true,
+		"network_path.connections_monitoring.baseline_tests_enabled": true,
 		"network_path.collector.monitor_ip_without_domain":           true,
 	}, &teststatsd.Client{}, nil)
 	collector.ScheduleNetworkPathTests(slices.Values([]npmodel.NetworkPathConnection{{
@@ -84,7 +84,7 @@ func TestBaselineEmptySnapshotsDoNotStartVirtualWindow(t *testing.T) {
 
 func TestBaselineDisabledCreatesNoCollectorMachinery(t *testing.T) {
 	_, collector := newTestNpCollector(t, map[string]any{
-		"network_path.connections_monitoring.baseline_tests.enabled": false,
+		"network_path.connections_monitoring.baseline_tests_enabled": false,
 		"network_path.collector.monitor_ip_without_domain":           true,
 	}, &teststatsd.Client{}, nil)
 
@@ -97,7 +97,7 @@ func TestBaselineDisabledCreatesNoCollectorMachinery(t *testing.T) {
 func TestBaselineSelectionConsumesSlotsBeforeChannelAdmission(t *testing.T) {
 	stats := &teststatsd.Client{}
 	_, collector := newTestNpCollector(t, map[string]any{
-		"network_path.connections_monitoring.baseline_tests.enabled": true,
+		"network_path.connections_monitoring.baseline_tests_enabled": true,
 		"network_path.collector.monitor_ip_without_domain":           true,
 		"network_path.collector.input_chan_size":                     1,
 	}, stats, nil)
@@ -118,7 +118,7 @@ func TestBaselineBypassesRemoteFiltersButStandardDoesNot(t *testing.T) {
 	remoteExclude := []connfilter.Config{{Type: connfilter.FilterTypeExclude, MatchIP: "10.0.0.1"}}
 
 	_, baseline := newTestNpCollector(t, map[string]any{
-		"network_path.connections_monitoring.baseline_tests.enabled": true,
+		"network_path.connections_monitoring.baseline_tests_enabled": true,
 		"network_path.collector.monitor_ip_without_domain":           true,
 	}, &teststatsd.Client{}, nil)
 	baseline.replaceRemoteFilters(remoteExclude)

comp/networkpath/npcollector/impl/config.go

@@ -19,7 +19,6 @@ import (
 
 type collectorConfigs struct {
 	dynamicTestsState               npconfig.DynamicTestsState
-	baselineWindow                  time.Duration
 	netflowMonitoringEnabled        bool
 	workers                         int
 	timeout                         time.Duration
@@ -55,7 +54,6 @@ func newConfig(agentConfig config.Component, logger log.Component) *collectorCon
 		filterConfigs = nil
 	}
 	return &collectorConfigs{
-		baselineWindow:             30 * time.Minute,
 		netflowMonitoringEnabled:   agentConfig.GetBool("network_path.netflow_monitoring.enabled"),
 		workers:                    agentConfig.GetInt("network_path.collector.workers"),
 		timeout:                    agentConfig.GetDuration("network_path.collector.timeout") * time.Millisecond,

comp/networkpath/npcollector/impl/config_test.go

@@ -47,7 +47,6 @@ func TestNewConfig(t *testing.T) {
 				"network_path.collector.filters": []map[string]any{},
 			},
 			expectedConfig: &collectorConfigs{
-				baselineWindow:             30 * time.Minute,
 				netflowMonitoringEnabled:   false,
 				workers:                    4,
 				timeout:                    1000 * time.Millisecond,
@@ -120,7 +119,6 @@ func TestNewConfig(t *testing.T) {
 				},
 			},
 			expectedConfig: &collectorConfigs{
-				baselineWindow:             30 * time.Minute,
 				netflowMonitoringEnabled:   false,
 				workers:                    8,
 				timeout:                    5000 * time.Millisecond,

comp/networkpath/npcollector/impl/npcollector.go

@@ -38,6 +38,7 @@ import (
 )
 
 const (
+	baselineSelectionInterval           = 30 * time.Minute
 	reverseDNSLookupMetricPrefix        = common.NetworkPathCollectorMetricPrefix + "reverse_dns_lookup."
 	reverseDNSLookupFailuresMetricName  = reverseDNSLookupMetricPrefix + "failures"
 	reverseDNSLookupSuccessesMetricName = reverseDNSLookupMetricPrefix + "successes"
@@ -398,7 +399,7 @@ func (s *npCollectorImpl) scheduleBaselineNetworkPathTests(conns iter.Seq[npmode
 func (s *npCollectorImpl) closeBaselineWindow(now time.Time) {
 	selected := s.baselineSelector.selectPathtests()
 	s.baselineSelector.reset()
-	s.baselineDeadline = now.Add(s.collectorConfigs.baselineWindow)
+	s.baselineDeadline = now.Add(baselineSelectionInterval)
 	_ = s.statsdClient.Incr(common.NetworkPathCollectorMetricPrefix+"baseline.windows_closed", nil, 1)
 	for i := range selected {
 		_ = s.statsdClient.Incr(common.NetworkPathCollectorMetricPrefix+"baseline.selections", nil, 1)

comp/rdnsquerier/impl/config_test.go

@@ -348,8 +348,7 @@ func TestConfigEnabledForBaselineNetworkPathTests(t *testing.T) {
 	mockConfig := mock.NewFromYAML(t, `
 network_path:
   connections_monitoring:
-    baseline_tests:
-      enabled: true
+    baseline_tests_enabled: true
 `)
 
 	systemProbeConfig := mock.NewSystemProbe(t)
@@ -363,8 +362,7 @@ func TestConfigDisabledForIneffectiveBaselineNetworkPathTests(t *testing.T) {
 	mockConfig := mock.NewFromYAML(t, `
 network_path:
   connections_monitoring:
-    baseline_tests:
-      enabled: true
+    baseline_tests_enabled: true
 `)
 
 	assert.False(t, newConfig(mockConfig, mock.NewSystemProbe(t)).enabled)

pkg/config/schema/yaml/core_schema.yaml

@@ -1723,19 +1723,14 @@ properties:
             description: Enables Network Path Dynamic Test for monitoring network
               connections via Network Path.
             example: 'true'
-          baseline_tests:
-            node_type: section
-            type: object
-            description: Configuration for included baseline Network Path Dynamic Tests.
-            properties:
-              enabled:
-                node_type: setting
-                type: boolean
-                default: false
-                description: Enables up to three included Network Path Dynamic Tests immediately
-                  for the first eligible snapshot, then every 30 minutes, when Cloud Network
-                  Monitoring is enabled.
-                example: 'true'
+          baseline_tests_enabled:
+            node_type: setting
+            type: boolean
+            default: false
+            description: Enables up to three included Network Path Dynamic Tests immediately
+              for the first eligible snapshot, then every 30 minutes, when Cloud Network
+              Monitoring is enabled.
+            example: 'true'
       collector:
         node_type: section
         type: object

pkg/config/setup/config_test.go

@@ -749,7 +749,7 @@ func TestNetworkPathDefaults(t *testing.T) {
 	config := confFromYAML(t, datadogYaml)
 
 	assert.Equal(t, false, config.GetBool("network_path.connections_monitoring.enabled"))
-	assert.Equal(t, false, config.GetBool("network_path.connections_monitoring.baseline_tests.enabled"))
+	assert.Equal(t, false, config.GetBool("network_path.connections_monitoring.baseline_tests_enabled"))
 	assert.Equal(t, false, config.GetBool("network_path.remote_config.enabled"))
 	assert.Equal(t, 4, config.GetInt("network_path.collector.workers"))
 	assert.Equal(t, 1000, config.GetInt("network_path.collector.timeout"))

pkg/networkpath/config/state.go

@@ -36,7 +36,7 @@ func (s DynamicTestsState) String() string {
 
 const (
 	standardEnabledKey = "network_path.connections_monitoring.enabled"
-	baselineEnabledKey = "network_path.connections_monitoring.baseline_tests.enabled"
+	baselineEnabledKey = "network_path.connections_monitoring.baseline_tests_enabled"
 	systemProbeKey     = "system_probe_config.enabled"
 	networkConfigKey   = "network_config.enabled"
 )

pkg/system-probe/config/config_test.go

@@ -172,10 +172,10 @@ func TestTracerouteModuleDynamicTestsState(t *testing.T) {
 		wantEnable           bool
 		checkDefaultInjector bool
 	}{
-		{name: "baseline disabled has no impact", core: map[string]any{"network_path.connections_monitoring.baseline_tests.enabled": false}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": true}},
-		{name: "baseline outside CNM", core: map[string]any{"network_path.connections_monitoring.baseline_tests.enabled": true}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": false}},
-		{name: "effective baseline with implicit system probe", core: map[string]any{"network_path.connections_monitoring.baseline_tests.enabled": true}, sysprobe: map[string]any{"network_config.enabled": true}, wantEnable: true},
-		{name: "effective baseline", core: map[string]any{"network_path.connections_monitoring.baseline_tests.enabled": true}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": true}, wantEnable: true},
+		{name: "baseline disabled has no impact", core: map[string]any{"network_path.connections_monitoring.baseline_tests_enabled": false}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": true}},
+		{name: "baseline outside CNM", core: map[string]any{"network_path.connections_monitoring.baseline_tests_enabled": true}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": false}},
+		{name: "effective baseline with implicit system probe", core: map[string]any{"network_path.connections_monitoring.baseline_tests_enabled": true}, sysprobe: map[string]any{"network_config.enabled": true}, wantEnable: true},
+		{name: "effective baseline", core: map[string]any{"network_path.connections_monitoring.baseline_tests_enabled": true}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": true}, wantEnable: true},
 		{name: "effective standard", core: map[string]any{"network_path.connections_monitoring.enabled": true}, sysprobe: map[string]any{"system_probe_config.enabled": true, "network_config.enabled": true}, wantEnable: true},
 		{name: "explicit traceroute remains supported", sysprobe: map[string]any{"traceroute.enabled": true}, wantEnable: true, checkDefaultInjector: true},
 	}

releasenotes/notes/add-cnm-baseline-dynamic-tests-ac7c4a3d73c865b4.yaml

@@ -2,6 +2,6 @@
 features:
   - |
     Add opt-in baseline Dynamic Tests for Cloud Network Monitoring. When
-    ``network_path.connections_monitoring.baseline_tests.enabled`` is enabled,
+    ``network_path.connections_monitoring.baseline_tests_enabled`` is enabled,
     the Agent runs a small, bounded set of one-time path tests for eligible
     connections while full recurring Dynamic Tests remain disabled.