Clarify network path scheduling modes

Author: AlexandreYang

comp/networkpath/npcollector/impl/baseline.go

@@ -9,6 +9,8 @@ import (
 	"sort"
 
 	"github.com/DataDog/datadog-agent/comp/networkpath/npcollector/impl/common"
+	npmodel "github.com/DataDog/datadog-agent/comp/networkpath/npcollector/model"
+	"github.com/DataDog/datadog-agent/pkg/networkpath/payload"
 )
 
 const baselineSelectionsPerSnapshot = 3
@@ -56,3 +58,21 @@ func addBaselineCandidate(selected []baselineCandidate, candidate baselineCandid
 	sort.Slice(selected, func(i, j int) bool { return selected[i].betterThan(selected[j]) })
 	return selected
 }
+
+func addBaselinePath(selected []baselineCandidate, path common.Pathtest, signals npmodel.BaselineSignals) []baselineCandidate {
+	path.DynamicTestProfile = payload.DynamicTestProfileBaseline
+	return addBaselineCandidate(selected, baselineCandidate{
+		path:       path,
+		pathHash:   path.GetHash(),
+		diagnostic: signals.Diagnostic,
+		bytes:      signals.Bytes,
+	})
+}
+
+func (s *npCollectorImpl) scheduleBaselinePaths(selected []baselineCandidate) {
+	for i := range selected {
+		if err := s.scheduleOne(&selected[i].path); err != nil {
+			s.logger.Errorf("Error scheduling baseline pathtest: %s", err)
+		}
+	}
+}

comp/networkpath/npcollector/impl/npcollector.go

@@ -327,35 +327,30 @@ func (s *npCollectorImpl) scheduleNetworkPathTests(origin payload.PathOrigin, co
 		}
 		pathtest := s.makePathtest(conn, origin)
 		if baseline {
-			pathtest.DynamicTestProfile = payload.DynamicTestProfileBaseline
-			selected = addBaselineCandidate(selected, baselineCandidate{
-				path:       pathtest,
-				pathHash:   pathtest.GetHash(),
-				diagnostic: conn.Baseline.Diagnostic,
-				bytes:      conn.Baseline.Bytes,
-			})
+			selected = addBaselinePath(selected, pathtest, conn.Baseline)
 			continue
 		}
 
-		pathtest.TestConfigID = evaluation.testConfigID
-		pathtest.Tags = evaluation.tags
-		if evaluation.testConfigID != "" {
-			pathtest.TestConfigSource = payload.TestConfigSourceRemote
-		}
-		err := s.scheduleOne(&pathtest)
-		if err != nil {
+		if err := s.scheduleNetworkPathTest(pathtest, evaluation); err != nil {
 			s.logger.Errorf("Error scheduling pathtests: %s", err)
 		}
 	}
-	for i := range selected {
-		if err := s.scheduleOne(&selected[i].path); err != nil {
-			s.logger.Errorf("Error scheduling baseline pathtest: %s", err)
-		}
+	if baseline {
+		s.scheduleBaselinePaths(selected)
 	}
 	_ = s.statsdClient.Count(common.NetworkPathCollectorMetricPrefix+"schedule.conns_received", int64(connCount), []string{}, 1)
 	_ = s.statsdClient.Gauge(common.NetworkPathCollectorMetricPrefix+"schedule.duration", s.TimeNowFn().Sub(startTime).Seconds(), nil, 1)
 }
 
+func (s *npCollectorImpl) scheduleNetworkPathTest(pathtest common.Pathtest, evaluation pathEvaluation) error {
+	pathtest.TestConfigID = evaluation.testConfigID
+	pathtest.Tags = evaluation.tags
+	if evaluation.testConfigID != "" {
+		pathtest.TestConfigSource = payload.TestConfigSourceRemote
+	}
+	return s.scheduleOne(&pathtest)
+}
+
 // scheduleOne schedules pathtests.
 // It shouldn't block, if the input channel is full, an error is returned.
 func (s *npCollectorImpl) scheduleOne(pathtest *common.Pathtest) error {