Fix test path and codeowners aggregation

Author: lukaszcl

tools/flakeguard/cmd/aggregate_results.go

@@ -56,6 +56,8 @@ var AggregateResultsCmd = &cobra.Command{
 		// Load test reports from JSON files and aggregate them
 		aggregatedReport, err := reports.LoadAndAggregate(
 			resultsPath,
+			reports.WithRepoPath(repoPath),
+			reports.WithCodeOwnersPath(codeOwnersPath),
 			reports.WithReportID(reportID),
 			reports.WithSplunk(splunkURL, splunkToken, splunkEvent),
 			reports.WithBranchName(branchName),
@@ -75,36 +77,9 @@ var AggregateResultsCmd = &cobra.Command{
 
 		// Start spinner for mapping test results to paths
 		s = spinner.New(spinner.CharSets[11], 100*time.Millisecond)
-		s.Suffix = " Mapping test results to paths..."
+		s.Suffix = " Filter failed tests..."
 		s.Start()
 
-		// Map test results to test paths
-		err = reports.MapTestResultsToPaths(aggregatedReport, repoPath)
-		if err != nil {
-			s.Stop()
-			log.Error().Stack().Err(err).Msg("Error mapping test results to paths")
-			os.Exit(ErrorExitCode)
-		}
-		s.Stop()
-		log.Debug().Msg("Successfully mapped paths to test results")
-
-		// Map test results to code owners if codeOwnersPath is provided
-		if codeOwnersPath != "" {
-			s = spinner.New(spinner.CharSets[11], 100*time.Millisecond)
-			s.Suffix = " Mapping test results to code owners..."
-			s.Start()
-			fmt.Println()
-
-			err = reports.MapTestResultsToOwners(aggregatedReport, codeOwnersPath)
-			if err != nil {
-				s.Stop()
-				log.Error().Stack().Err(err).Msg("Error mapping test results to code owners")
-				os.Exit(ErrorExitCode)
-			}
-			s.Stop()
-			log.Debug().Msg("Successfully mapped code owners to test results")
-		}
-
 		failedTests := reports.FilterTests(aggregatedReport.Results, func(tr reports.TestResult) bool {
 			return !tr.Skipped && tr.PassRatio < maxPassRatio
 		})

tools/flakeguard/reports/io.go

@@ -51,6 +51,8 @@ type aggregateOptions struct {
 	baseSha              string
 	headSha              string
 	repoURL              string
+	repoPath             string
+	codeownersPath       string
 	gitHubWorkflowName   string
 	gitHubWorkflowRunURL string
 }
@@ -101,6 +103,18 @@ func WithRepoURL(repoURL string) AggregateOption {
 	}
 }
 
+func WithRepoPath(repoPath string) AggregateOption {
+	return func(opts *aggregateOptions) {
+		opts.repoURL = repoPath
+	}
+}
+
+func WithCodeOwnersPath(codeOwnersPath string) AggregateOption {
+	return func(opts *aggregateOptions) {
+		opts.codeownersPath = codeOwnersPath
+	}
+}
+
 // WithGitHubWorkflowName sets the GitHub workflow name for the aggregated report.
 func WithGitHubWorkflowName(githubWorkflowName string) AggregateOption {
 	return func(opts *aggregateOptions) {
@@ -176,6 +190,28 @@ func LoadAndAggregate(resultsPath string, options ...AggregateOption) (*TestRepo
 		return nil, fmt.Errorf("error aggregating reports: %w", err)
 	}
 
+	// Map test results to test paths
+	err = MapTestResultsToPaths(aggregatedReport, opts.repoPath)
+	if err != nil {
+		return nil, fmt.Errorf("error mapping test results to paths: %w", err)
+	}
+
+	// Map test results to code owners if codeOwnersPath is provided
+	if opts.codeownersPath != "" {
+		err := MapTestResultsToOwners(aggregatedReport, opts.codeownersPath)
+		if err != nil {
+			return nil, fmt.Errorf("error mapping test results to code owners: %w", err)
+		}
+	}
+
+	sendToSplunk := opts.splunkURL != ""
+	if sendToSplunk {
+		err = sendDataToSplunk(&opts, *aggregatedReport)
+		if err != nil {
+			return aggregatedReport, fmt.Errorf("error sending data to Splunk: %w", err)
+		}
+	}
+
 	return aggregatedReport, nil
 }
 
@@ -444,7 +480,6 @@ func aggregate(reportChan <-chan *TestReport, errChan <-chan error, opts *aggreg
 		testMap       = make(map[string]TestResult)
 		excludedTests = map[string]struct{}{}
 		selectedTests = map[string]struct{}{}
-		sendToSplunk  = opts.splunkURL != ""
 	)
 
 	for report := range reportChan {
@@ -497,12 +532,6 @@ func aggregate(reportChan <-chan *TestReport, errChan <-chan error, opts *aggreg
 	fullReport.Results = aggregatedResults
 	fullReport.GenerateSummaryData()
 
-	if sendToSplunk {
-		err = sendDataToSplunk(opts, *fullReport)
-		if err != nil {
-			return fullReport, fmt.Errorf("error sending data to Splunk: %w", err)
-		}
-	}
 	return fullReport, err
 }
 
@@ -633,6 +662,7 @@ func sendDataToSplunk(opts *aggregateOptions, report TestReport) error {
 		}
 		log.Info().Msgf("Example Run. See '%s' for the results that would be sent to splunk", exampleSplunkReportFileName)
 	} else {
+		fmt.Printf("Final sent: %v", reportData)
 		resp, err := client.R().SetBody(reportData).Post("")
 		if err != nil {
 			splunkErrs = append(splunkErrs, fmt.Errorf("error sending report '%s' to Splunk: %w", report.ID, err))
@@ -680,6 +710,8 @@ func batchSplunkResults(results []SplunkTestResult) (batchData bytes.Buffer, res
 		}
 		resultTestNames = append(resultTestNames, result.Event.Data.TestName)
 	}
+	fmt.Println("Formatted Batch Data:")
+	fmt.Println(batchData.String())
 	return batchData, resultTestNames, nil
 }