Fix failing tests

heartbeat/hbtest/hbtestutil.go

@@ -172,6 +172,7 @@ func BaseChecks(ip string, status string, typ string) validator.Validator {
 	}
 
 	return lookslike.Compose(
+		HasEventType,
 		lookslike.MustCompile(map[string]interface{}{
 			"monitor": map[string]interface{}{
 				"ip":          ipCheck,
@@ -187,6 +188,12 @@ func BaseChecks(ip string, status string, typ string) validator.Validator {
 	)
 }
 
+var HasEventType = lookslike.MustCompile(map[string]interface{}{
+	"event": map[string]interface{}{
+		"type": isdef.Optional(isdef.IsNonEmptyString),
+	},
+})
+
 // SummaryStateChecks validates the "summary" + "state" fields
 func SummaryStateChecks(up uint16, down uint16) validator.Validator {
 	return lookslike.Compose(

heartbeat/monitors/mocks.go

@@ -195,6 +195,7 @@ func baseMockEventMonitorValidator(id string, name string, status string) valida
 
 func mockEventMonitorValidator(id string, name string) validator.Validator {
 	return lookslike.Strict(lookslike.Compose(
+		hbtest.HasEventType,
 		baseMockEventMonitorValidator(id, name, "up"),
 		hbtestllext.MonitorTimespanValidator,
 		hbtest.SummaryStateChecks(1, 0),

heartbeat/monitors/wrappers/summarizer/summarizer.go

@@ -60,6 +60,10 @@ type JobSummary struct {
 	RetryGroup   string                   `json:"retry_group"`
 }
 
+func (js *JobSummary) String() string {
+	return fmt.Sprintf("<JobSummary status=%s attempt=%d/%d, final=%t, up=%d/%d retryGroup=%s>", js.Status, js.Attempt, js.MaxAttempts, js.FinalAttempt, js.Up, js.Down, js.RetryGroup)
+}
+
 func NewSummarizer(rootJob jobs.Job, sf stdfields.StdMonitorFields, mst *monitorstate.Tracker) *Summarizer {
 	plugins := make([]SumPlugin, 0, 2)
 	if sf.Type == "browser" {
@@ -209,10 +213,16 @@ func (ssp *StateStatusPlugin) OnSummary(event *beat.Event) (retry bool) {
 	// dereference the pointer since the pointer is pointed at the next step
 	// after this
 	jsCopy := *ssp.js
-	eventext.MergeEventFields(event, mapstr.M{
+
+	fields := mapstr.M{
+		"event":   mapstr.M{"type": "heartbeat/summary"},
 		"summary": &jsCopy,
 		"state":   ms,
-	})
+	}
+	if ssp.sf.Type == "browser" {
+		fields["synthetics"] = mapstr.M{"type": "heartbeat/summary"}
+	}
+	eventext.MergeEventFields(event, fields)
 
 	if retry {
 		// mutate the js into the state for the next attempt

heartbeat/monitors/wrappers/summarizer/summarizer_test.go

@@ -51,56 +51,64 @@ func TestSummarizer(t *testing.T) {
 		// The expected states on each event
 		expectedStates string
 		// the attempt number of the given event
-		expectedAttempts string
+		expectedAttempts  string
+		expectedSummaries int
 	}{
 		{
 			"start down, transition to up",
 			2,
 			"du",
 			"du",
 			"12",
+			2,
 		},
 		{
 			"start up, stay up",
 			2,
 			"uuuuuuuu",
 			"uuuuuuuu",
 			"11111111",
+			8,
 		},
 		{
 			"start down, stay down",
 			2,
 			"dddddddd",
 			"dddddddd",
 			"12121212",
+			8,
 		},
 		{
 			"start up - go down with one retry - thenrecover",
 			2,
 			"udddduuu",
 			"uuddduuu",
 			"11212111",
+			8,
 		},
 		{
 			"start up, transient down, recover",
 			2,
 			"uuuduuuu",
 			"uuuuuuuu",
 			"11112111",
+			8,
 		},
 		{
 			"start up, multiple transient down, recover",
 			2,
 			"uuudududu",
 			"uuuuuuuuu",
 			"111121212",
+			9,
 		},
 		{
 			"no retries, single down",
 			1,
 			"uuuduuuu",
 			"uuuduuuu",
 			"11111111",
+			8,
 		},
 	}
 
@@ -135,6 +143,8 @@ func TestSummarizer(t *testing.T) {
 			rcvdStatuses := ""
 			rcvdStates := ""
 			rcvdAttempts := ""
+			rcvdEvents := []*beat.Event{}
+			rcvdSummaries := []*JobSummary{}
 			i := 0
 			var lastSummary *JobSummary
 			for {
@@ -144,6 +154,7 @@ func TestSummarizer(t *testing.T) {
 				wrapped := s.Wrap(job)
 				events, _ := jobs.ExecJobAndConts(t, wrapped)
 				for _, event := range events {
+					rcvdEvents = append(rcvdEvents, event)
 					eventStatus, _ := event.GetValue("monitor.status")
 					eventStatusStr := eventStatus.(string)
 					rcvdStatuses += eventStatusStr[:1]
@@ -155,8 +166,18 @@ func TestSummarizer(t *testing.T) {
 					}
 					summaryIface, _ := event.GetValue("summary")
 					summary := summaryIface.(*JobSummary)
+					duration, _ := event.GetValue("monitor.duration.us")
+
+					// Ensure that only summaries have a duration
+					if summary != nil {
+						rcvdSummaries = append(rcvdSummaries, summary)
+						require.GreaterOrEqual(t, duration, int64(0))
+					} else {
+						require.Nil(t, duration)
+					}
 
 					if summary == nil {
+						// note missing summaries
 						rcvdAttempts += "!"
 					} else if lastSummary != nil {
 						if summary.Attempt > 1 {
@@ -165,6 +186,7 @@ func TestSummarizer(t *testing.T) {
 							require.NotEqual(t, lastSummary.RetryGroup, summary.RetryGroup)
 						}
 					}
+
 					rcvdAttempts += fmt.Sprintf("%d", summary.Attempt)
 					lastSummary = summary
 				}
@@ -176,6 +198,8 @@ func TestSummarizer(t *testing.T) {
 			require.Equal(t, tt.statusSequence, rcvdStatuses)
 			require.Equal(t, tt.expectedStates, rcvdStates)
 			require.Equal(t, tt.expectedAttempts, rcvdAttempts)
+			require.Len(t, rcvdEvents, len(tt.statusSequence))
+			require.Len(t, rcvdSummaries, tt.expectedSummaries)
 		})
 	}
 }