Add support for rerun report ID in test report generation

Author: lukaszcl

tools/flakeguard/cmd/generate_test_report.go

@@ -34,6 +34,7 @@ var GenerateTestReportCmd = &cobra.Command{
 		githubWorkflowName, _ := cmd.Flags().GetString("github-workflow-name")
 		githubWorkflowRunURL, _ := cmd.Flags().GetString("github-workflow-run-url")
 		reportID, _ := cmd.Flags().GetString("report-id")
+		rerunOfReportID, _ := cmd.Flags().GetString("rerun-of-report-id")
 		genReportID, _ := cmd.Flags().GetBool("gen-report-id")
 
 		goProject, err := utils.GetGoProjectName(projectPath)
@@ -89,6 +90,7 @@ var GenerateTestReportCmd = &cobra.Command{
 				reports.WithProjectPath(projectPath),
 				reports.WithRepoPath(repoPath),
 				reports.WithCodeOwnersPath(codeOwnersPath),
+				reports.WithRerunOfReportID(rerunOfReportID),
 				reports.WithReportID(reportID),
 				reports.WithGeneratedReportID(genReportID),
 				reports.WithGoRaceDetection(useRace),
@@ -142,6 +144,7 @@ var GenerateTestReportCmd = &cobra.Command{
 			reports.WithProjectPath(projectPath),
 			reports.WithRepoPath(repoPath),
 			reports.WithCodeOwnersPath(codeOwnersPath),
+			reports.WithRerunOfReportID(rerunOfReportID),
 			reports.WithReportID(reportID),
 			reports.WithGeneratedReportID(genReportID),
 			reports.WithGoRaceDetection(useRace),
@@ -190,6 +193,7 @@ func init() {
 	GenerateTestReportCmd.Flags().String("github-workflow-run-url", "", "GitHub workflow run URL for the test report")
 	GenerateTestReportCmd.Flags().String("report-id", "", "Optional identifier for the test report. Will be generated if not provided")
 	GenerateTestReportCmd.Flags().Bool("gen-report-id", false, "Generate a random report ID")
+	GenerateTestReportCmd.Flags().String("rerun-of-report-id", "", "Optional identifier for the report this is a rerun of")
 	GenerateTestReportCmd.Flags().Bool("race", false, "Enable the race detector")
 
 	if err := GenerateTestReportCmd.MarkFlagRequired("test-results-dir"); err != nil {

tools/flakeguard/reports/test_report.go

@@ -16,6 +16,7 @@ import (
 type reportOptions struct {
 	maxPassRatio         float64
 	reportID             string
+	rerunOfReportID      string
 	projectPath          string
 	goProjectName        string
 	raceDetection        bool
@@ -52,6 +53,12 @@ func WithReportID(reportID string) TestReportOption {
 	}
 }
 
+func WithRerunOfReportID(rerunOfReportID string) TestReportOption {
+	return func(opts *reportOptions) {
+		opts.rerunOfReportID = rerunOfReportID
+	}
+}
+
 func WithGeneratedReportID(genReportID bool) TestReportOption {
 	return func(opts *reportOptions) {
 		if !genReportID {
@@ -169,6 +176,7 @@ func NewTestReport(results []TestResult, opts ...TestReportOption) (TestReport,
 
 	r := TestReport{
 		ID:                   defaultOpts.reportID,
+		RerunOfReportID:      defaultOpts.rerunOfReportID,
 		ProjectPath:          defaultOpts.projectPath,
 		GoProject:            defaultOpts.goProjectName,
 		BranchName:           defaultOpts.branchName,
@@ -212,6 +220,7 @@ func NewTestReport(results []TestResult, opts ...TestReportOption) (TestReport,
 // TestReport reports on the parameters and results of one to many test runs
 type TestReport struct {
 	ID                   string       `json:"id,omitempty"`
+	RerunOfReportID      string       `json:"rerun_of_report_id,omitempty"` // references the ID of the original/base report from which this re-run was created.
 	ProjectPath          string       `json:"project_path"`
 	GoProject            string       `json:"go_project"`
 	BranchName           string       `json:"branch_name,omitempty"`