Add received to Event (#85)

Co-authored-by: kruskall <[email protected]>
elastic · Jun 23, 2023 · 6dfa24c · 6dfa24c
1 parent e3ce836
commit 6dfa24c
Show file tree

Hide file tree

Showing 8 changed files with 175 additions and 44 deletions.
diff --git a/model/internal/modeljson/document.go b/model/internal/modeljson/document.go
@@ -85,3 +85,7 @@ func (t Time) MarshalFastJSON(w *fastjson.Writer) error {
 	w.RawByte('"')
 	return nil
 }
+
+func (t Time) isZero() bool {
+	return time.Time(t).IsZero()
+}
diff --git a/model/internal/modeljson/event.go b/model/internal/modeljson/event.go
@@ -23,6 +23,7 @@ type Event struct {
 	Dataset      string        `json:"dataset,omitempty"`
 	Kind         string        `json:"kind,omitempty"`
 	Category     string        `json:"category,omitempty"`
+	Received     Time          `json:"received,omitempty"`
 	Type         string        `json:"type,omitempty"`
 	SuccessCount SummaryMetric `json:"success_count,omitempty"`
 	Duration     int64         `json:"duration,omitempty"`

diff --git a/model/internal/modeljson/marshal_fastjson.go b/model/internal/modeljson/marshal_fastjson.go
diff --git a/model/modelpb/event.pb.go b/model/modelpb/event.pb.go
diff --git a/model/modelpb/event.pb.json.go b/model/modelpb/event.pb.json.go
@@ -17,7 +17,9 @@
 
 package modelpb
 
-import "github.com/elastic/apm-data/model/internal/modeljson"
+import (
+	"github.com/elastic/apm-data/model/internal/modeljson"
+)
 
 func (e *Event) toModelJSON(out *modeljson.Event) {
 	*out = modeljson.Event{
@@ -36,4 +38,7 @@ func (e *Event) toModelJSON(out *modeljson.Event) {
 			Sum:   e.SuccessCount.Sum,
 		}
 	}
+	if e.Received.IsValid() {
+		out.Received = modeljson.Time(e.Received.AsTime())
+	}
 }
diff --git a/model/modelpb/event.pb.json_test.go b/model/modelpb/event.pb.json_test.go
@@ -25,9 +25,17 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/durationpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+const (
+	testTime = "2006-01-02T15:04:05Z"
 )
 
 func TestEventToModelJSON(t *testing.T) {
+	now, err := time.Parse(time.RFC3339, testTime)
+	require.NoError(t, err)
+
 	testCases := map[string]struct {
 		proto    *Event
 		expected *modeljson.Event
@@ -50,6 +58,7 @@ func TestEventToModelJSON(t *testing.T) {
 				},
 				Duration: durationpb.New(3 * time.Second),
 				Severity: 4,
+				Received: timestamppb.New(now),
 			},
 			expected: &modeljson.Event{
 				Outcome:  "outcome",
@@ -64,14 +73,18 @@ func TestEventToModelJSON(t *testing.T) {
 				},
 				Duration: int64(3 * time.Second),
 				Severity: 4,
+				Received: modeljson.Time(now),
 			},
 		},
 	}
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			var out modeljson.Event
 			tc.proto.toModelJSON(&out)
-			diff := cmp.Diff(*tc.expected, out)
+			diff := cmp.Diff(*tc.expected, out,
+				cmp.Comparer(func(a modeljson.Time, b modeljson.Time) bool {
+					return time.Time(a).Equal(time.Time(b))
+				}))
 			require.Empty(t, diff)
 		})
 	}

diff --git a/model/modelpb/event_vtproto.pb.go b/model/modelpb/event_vtproto.pb.go
diff --git a/model/proto/event.proto b/model/proto/event.proto
@@ -20,6 +20,7 @@ syntax = "proto3";
 package elastic.apm.v1;
 
 import "google/protobuf/duration.proto";
+import "google/protobuf/timestamp.proto";
 import "metricset.proto";
 
 option go_package = "github.com/elastic/apm-data/model/modelpb";
@@ -36,4 +37,6 @@ message Event {
   SummaryMetric success_count = 7;
   google.protobuf.Duration duration = 8;
   int64 severity = 9;
+
+  google.protobuf.Timestamp received = 10;
 }