switch data_stream to object notation

elastic · Jul 20, 2023 · b6e2dd5 · b6e2dd5
1 parent 88a3977
commit b6e2dd5
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 20 deletions.
diff --git a/model/internal/modeljson/document.go b/model/internal/modeljson/document.go
@@ -68,12 +68,10 @@ type Document struct {
 	Process     *Process     `json:"process,omitempty"`
 	Event       *Event       `json:"event,omitempty"`
 
-	Timestamp           Time   `json:"@timestamp"`
-	DataStreamType      string `json:"data_stream.type,omitempty"`
-	DataStreamDataset   string `json:"data_stream.dataset,omitempty"`
-	DataStreamNamespace string `json:"data_stream.namespace,omitempty"`
-	Message             string `json:"message,omitempty"`
-	DocCount            int64  `json:"_doc_count,omitempty"`
+	Timestamp  Time        `json:"@timestamp"`
+	DataStream *DataStream `json:"data_stream"`
+	Message    string      `json:"message,omitempty"`
+	DocCount   int64       `json:"_doc_count,omitempty"`
 }
 
 type Time time.Time
@@ -88,3 +86,9 @@ func (t Time) MarshalFastJSON(w *fastjson.Writer) error {
 func (t Time) isZero() bool {
 	return time.Time(t).IsZero()
 }
+
+type DataStream struct {
+	Type      string `json:"type,omitempty"`
+	Dataset   string `json:"dataset,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
+}
diff --git a/model/internal/modeljson/marshal_fastjson.go b/model/internal/modeljson/marshal_fastjson.go
diff --git a/model/modelpb/apmevent.pb.json.go b/model/modelpb/apmevent.pb.json.go
@@ -65,9 +65,9 @@ func (e *APMEvent) MarshalFastJSON(w *fastjson.Writer) error {
 	}
 
 	if e.DataStream != nil {
-		doc.DataStreamType = e.DataStream.Type
-		doc.DataStreamDataset = e.DataStream.Dataset
-		doc.DataStreamNamespace = e.DataStream.Namespace
+		doc.DataStream.Type = e.DataStream.Type
+		doc.DataStream.Dataset = e.DataStream.Dataset
+		doc.DataStream.Namespace = e.DataStream.Namespace
 	}
 
 	var transaction modeljson.Transaction