Merge pull request #1241 from sultan-duisenbay/resultstore_build_over…

…ride

Add build override feature

pkg/updater/resultstore/resultstore.go

@@ -98,7 +98,7 @@ func ResultStoreColumnReader(client *DownloadClient, reprocess time.Duration) up
 
 		for _, pr := range processedResults {
 			// TODO: Make group ID something other than start time.
-			inflatedCol := processGroup(pr)
+			inflatedCol := processGroup(tg, pr)
 			receivers <- *inflatedCol
 		}
 		return nil
@@ -184,6 +184,7 @@ func isolateActions(log logrus.FieldLogger, multiActionResults map[string]*multi
 	}
 	return singleActionResults
 }
+
 func timestampMilliseconds(t *timestamppb.Timestamp) float64 {
 	return float64(t.GetSeconds())*1000.0 + float64(t.GetNanos())/1000.0
 }
@@ -205,19 +206,25 @@ var convertStatus = map[resultstorepb.Status]statuspb.TestStatus{
 	resultstorepb.Status_SKIPPED:            statuspb.TestStatus_PASS_WITH_SKIPS,
 }
 
-func processGroup(result *processedResult) *updater.InflatedColumn {
+// processGroup will convert grouped invocations into columns
+func processGroup(tg *configpb.TestGroup, result *processedResult) *updater.InflatedColumn {
 	if result == nil || result.InvocationProto == nil {
 		return nil
 	}
 
 	started := result.InvocationProto.GetTiming().GetStartTime()
 	groupID := result.InvocationProto.GetId().GetInvocationId()
+	build := identifyBuild(tg, result)
+	// override build by invocation ID
+	if build == "" {
+		build = groupID
+	}
 	hint, err := started.AsTime().MarshalText()
 	if err != nil {
 		hint = []byte{}
 	}
 	col := &statepb.Column{
-		Build:   groupID,
+		Build:   build,
 		Name:    groupID,
 		Started: timestampMilliseconds(started),
 		Hint:    string(hint),
@@ -253,6 +260,29 @@ func processGroup(result *processedResult) *updater.InflatedColumn {
 	}
 }
 
+// identifyBuild applies build override configurations and assigns a build
+// Returns an empty string if no configurations are present or no configs are correctly set.
+// i.e. no key is found in properties.
+func identifyBuild(tg *configpb.TestGroup, pr *processedResult) string {
+	switch {
+	case tg.GetBuildOverrideConfigurationValue() != "":
+		key := tg.GetBuildOverrideConfigurationValue()
+		for _, property := range pr.InvocationProto.GetProperties() {
+			if property.GetKey() == key {
+				return property.GetValue()
+			}
+		}
+		return ""
+	case tg.GetBuildOverrideStrftime() != "":
+		layout := updater.FormatStrftime(tg.BuildOverrideStrftime)
+		timing := pr.InvocationProto.GetTiming().GetStartTime()
+		startTime := time.Unix(timing.Seconds, int64(timing.Nanos)).UTC()
+		return startTime.Format(layout)
+	default:
+		return ""
+	}
+}
+
 func queryAfter(query string, when time.Time) string {
 	if query == "" {
 		return ""

pkg/updater/resultstore/resultstore_test.go

@@ -813,7 +813,7 @@ func TestProcessGroup(t *testing.T) {
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := processGroup(tc.result)
+			got := processGroup(nil, tc.result)
 			if diff := cmp.Diff(tc.want, got, protocmp.Transform()); diff != "" {
 				t.Errorf("processGroup() differed (-want, +got): %s", diff)
 			}
@@ -1077,3 +1077,94 @@ func TestUpdateStop(t *testing.T) {
 		})
 	}
 }
+
+func TestIdentifyBuild(t *testing.T) {
+	cases := []struct {
+		name   string
+		result *processedResult
+		tg     *configpb.TestGroup
+		want   string
+	}{
+		{
+			name: "no override configurations",
+			result: &processedResult{
+				InvocationProto: &resultstore.Invocation{
+					Name: invocationName("id-123"),
+					Id: &resultstore.Invocation_Id{
+						InvocationId: "id-123",
+					},
+				},
+			},
+			want: "",
+		},
+		{
+			name: "override by non-existent property key",
+			result: &processedResult{
+				InvocationProto: &resultstore.Invocation{
+					Name: invocationName("id-1234"),
+					Id: &resultstore.Invocation_Id{
+						InvocationId: "id-1234",
+					},
+					Properties: []*resultstore.Property{
+						{Key: "Luigi", Value: "Peaches"},
+						{Key: "Bowser", Value: "Pingui"},
+					},
+				},
+			},
+			tg: &configpb.TestGroup{
+				BuildOverrideConfigurationValue: "Mario",
+			},
+			want: "",
+		},
+		{
+			name: "override by existent property key",
+			result: &processedResult{
+				InvocationProto: &resultstore.Invocation{
+					Name: invocationName("id-1234"),
+					Id: &resultstore.Invocation_Id{
+						InvocationId: "id-1234",
+					},
+					Properties: []*resultstore.Property{
+						{Key: "Luigi", Value: "Peaches"},
+						{Key: "Bowser", Value: "Pingui"},
+						{Key: "Waluigi", Value: "Wapeaches"},
+					},
+				},
+			},
+			tg: &configpb.TestGroup{
+				BuildOverrideConfigurationValue: "Waluigi",
+			},
+			want: "Wapeaches",
+		},
+		{
+			name: "override by build time strf",
+			result: &processedResult{
+				InvocationProto: &resultstore.Invocation{
+					Name: invocationName("id-1234"),
+					Id: &resultstore.Invocation_Id{
+						InvocationId: "id-1234",
+					},
+					Timing: &resultstore.Timing{
+						StartTime: &timestamppb.Timestamp{
+							Seconds: 1689881216,
+							Nanos:   27847,
+						},
+					},
+				},
+			},
+			tg: &configpb.TestGroup{
+				BuildOverrideStrftime: "%Y-%m-%d-%H",
+			},
+			want: "2023-07-20-19",
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := identifyBuild(tc.tg, tc.result)
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("queryAfter(...) differed (-want, +got): %s", diff)
+			}
+		})
+	}
+}

pkg/updater/updater.go

@@ -870,10 +870,10 @@ func deletedColumn(latestColumn InflatedColumn) []InflatedColumn {
 	}
 }
 
-// formatStrftime replaces python codes with what go expects.
+// FormatStrftime replaces python codes with what go expects.
 //
 // aka %Y-%m-%d becomes 2006-01-02
-func formatStrftime(in string) string {
+func FormatStrftime(in string) string {
 	replacements := map[string]string{
 		"%p": "PM",
 		"%Y": "2006",
@@ -898,7 +898,7 @@ func overrideBuild(tg *configpb.TestGroup, cols []InflatedColumn) {
 	if fmt == "" {
 		return
 	}
-	fmt = formatStrftime(fmt)
+	fmt = FormatStrftime(fmt)
 	for _, col := range cols {
 		started := int64(col.Column.Started)
 		when := time.Unix(started/1000, (started%1000)*int64(time.Millisecond/time.Nanosecond))

pkg/updater/updater_test.go

@@ -2149,7 +2149,7 @@ func TestFormatStrftime(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			if got := formatStrftime(tc.name); got != tc.want {
+			if got := FormatStrftime(tc.name); got != tc.want {
 				t.Errorf("formatStrftime(%q) got %q want %q", tc.name, got, tc.want)
 			}
 		})