feat: introduce code for JSON encoding protobuf types

model/error.go

@@ -94,12 +94,20 @@ func (e *Error) toModelJSON(out *modeljson.Error) {
 
 func (e *Exception) toModelJSON(out *modeljson.Exception) {
 	*out = modeljson.Exception{
-		Message:    e.Message,
-		Module:     e.Module,
-		Code:       e.Code,
-		Attributes: e.Attributes,
-		Type:       e.Type,
-		Handled:    e.Handled,
+		Message: e.Message,
+		Module:  e.Module,
+		Code:    e.Code,
+		Type:    e.Type,
+		Handled: e.Handled,
+	}
+	if e.Attributes != nil {
+		if attr, ok := e.Attributes.(map[string]any); ok {
+			if n := len(attr); n > 0 {
+				out.Attributes = e.Attributes
+			}
+		} else {
+			out.Attributes = e.Attributes
+		}
 	}
 	if n := len(e.Cause); n > 0 {
 		out.Cause = make([]modeljson.Exception, n)

model/modelpb/agent.pb.json.go

@@ -0,0 +1,27 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package modelpb
+
+import "github.com/elastic/apm-data/model/internal/modeljson"
+
+func (a *Agent) toModelJSON(out *modeljson.Agent) {
+	out.Name = a.Name
+	out.Version = a.Version
+	out.EphemeralID = a.EphemeralId
+	out.ActivationMethod = a.ActivationMethod
+}

model/modelpb/agent.pb.json_test.go

@@ -0,0 +1,60 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package modelpb
+
+import (
+	"testing"
+
+	"github.com/elastic/apm-data/model/internal/modeljson"
+	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAgentToModelJSON(t *testing.T) {
+	testCases := map[string]struct {
+		proto    *Agent
+		expected *modeljson.Agent
+	}{
+		"empty": {
+			proto:    &Agent{},
+			expected: &modeljson.Agent{},
+		},
+		"full": {
+			proto: &Agent{
+				Name:             "name",
+				Version:          "version",
+				EphemeralId:      "ephemeralid",
+				ActivationMethod: "activationmethod",
+			},
+			expected: &modeljson.Agent{
+				Name:             "name",
+				Version:          "version",
+				EphemeralID:      "ephemeralid",
+				ActivationMethod: "activationmethod",
+			},
+		},
+	}
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			var out modeljson.Agent
+			tc.proto.toModelJSON(&out)
+			diff := cmp.Diff(*tc.expected, out)
+			require.Empty(t, diff)
+		})
+	}
+}

model/modelpb/apmevent.pb.json.go

@@ -0,0 +1,279 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package modelpb
+
+import (
+	"github.com/elastic/apm-data/model/internal/modeljson"
+	"go.elastic.co/fastjson"
+)
+
+func (e *APMEvent) MarshalJSON() ([]byte, error) {
+	var w fastjson.Writer
+	if err := e.MarshalFastJSON(&w); err != nil {
+		return nil, err
+	}
+	return w.Bytes(), nil
+}
+
+func (e *APMEvent) MarshalFastJSON(w *fastjson.Writer) error {
+	out := modeljson.Document{
+		Span: &modeljson.Span{
+			Message:     &modeljson.Message{},
+			Composite:   &modeljson.SpanComposite{},
+			Destination: &modeljson.SpanDestination{},
+			DB:          &modeljson.DB{},
+		},
+		Transaction: &modeljson.Transaction{
+			UserExperience: &modeljson.UserExperience{},
+			Message:        &modeljson.Message{},
+		},
+		Metricset: &modeljson.Metricset{},
+		Error: &modeljson.Error{
+			Exception: &modeljson.Exception{},
+			Log:       &modeljson.ErrorLog{},
+		},
+		TimestampStruct: &modeljson.Timestamp{},
+		Cloud:           &modeljson.Cloud{},
+		Service: &modeljson.Service{
+			Node:      &modeljson.ServiceNode{},
+			Language:  &modeljson.Language{},
+			Runtime:   &modeljson.Runtime{},
+			Framework: &modeljson.Framework{},
+			Origin:    &modeljson.ServiceOrigin{},
+			Target:    &modeljson.ServiceTarget{},
+		},
+		FAAS:       &modeljson.FAAS{},
+		Network:    &modeljson.Network{},
+		Container:  &modeljson.Container{},
+		User:       &modeljson.User{},
+		Device:     &modeljson.Device{},
+		Kubernetes: &modeljson.Kubernetes{},
+		Observer:   &modeljson.Observer{},
+		Agent:      &modeljson.Agent{},
+		HTTP: &modeljson.HTTP{
+			Request: &modeljson.HTTPRequest{
+				Body: &modeljson.HTTPRequestBody{},
+			},
+			Response: &modeljson.HTTPResponse{},
+		},
+		UserAgent: &modeljson.UserAgent{},
+		Parent:    &modeljson.Parent{},
+		Trace:     &modeljson.Trace{},
+		Host: &modeljson.Host{
+			OS: &modeljson.OS{},
+		},
+		URL:         &modeljson.URL{},
+		Log:         &modeljson.Log{},
+		Source:      &modeljson.Source{},
+		Client:      &modeljson.Client{},
+		Child:       &modeljson.Child{},
+		Destination: &modeljson.Destination{},
+		Session:     &modeljson.Session{},
+		Process:     &modeljson.Process{},
+		Event:       &modeljson.Event{},
+	}
+	e.updateModelJSON(&out)
+	return ErrInvalidLength
+	//return out.MarshalFastJSON(w)
+}
+
+//go:noinline
+func (e *APMEvent) updateModelJSON(doc *modeljson.Document) {
+	doc.Timestamp = modeljson.Time(e.Timestamp.AsTime())
+	doc.Message = e.Message
+
+	if n := len(e.Labels); n > 0 {
+		labels := make(map[string]modeljson.Label)
+		for k, label := range e.Labels {
+			if label != nil {
+				labels[sanitizeLabelKey(k)] = modeljson.Label{
+					Value:  label.Value,
+					Values: label.Values,
+				}
+			}
+		}
+		doc.Labels = labels
+	}
+
+	if n := len(e.NumericLabels); n > 0 {
+		numericLabels := make(map[string]modeljson.NumericLabel)
+		for k, label := range e.NumericLabels {
+			if label != nil {
+				numericLabels[sanitizeLabelKey(k)] = modeljson.NumericLabel{
+					Value:  label.Value,
+					Values: label.Values,
+				}
+			}
+		}
+		doc.NumericLabels = numericLabels
+	}
+
+	if e.DataStream != nil {
+		doc.DataStreamType = e.DataStream.Type
+		doc.DataStreamDataset = e.DataStream.Dataset
+		doc.DataStreamNamespace = e.DataStream.Namespace
+	}
+
+	if e.Processor != nil {
+		doc.Processor = modeljson.Processor{
+			Name:  e.Processor.Name,
+			Event: e.Processor.Event,
+		}
+	}
+
+	if e.Transaction != nil {
+		e.Transaction.toModelJSON(doc.Transaction, e.Processor.Name == "metric" && e.Processor.Event == "metric")
+	}
+
+	if e.Span != nil {
+		e.Span.toModelJSON(doc.Span)
+	}
+
+	if e.Metricset != nil {
+		e.Metricset.toModelJSON(doc.Metricset)
+		doc.DocCount = e.Metricset.DocCount
+	}
+
+	if e.Error != nil {
+		e.Error.toModelJSON(doc.Error)
+	}
+
+	if e.Event != nil {
+		e.Event.toModelJSON(doc.Event)
+	}
+
+	// Set high resolution timestamp.
+	//
+	// TODO(axw) change @timestamp to use date_nanos, and remove this field.
+	var timestampStruct modeljson.Timestamp
+	if !e.Timestamp.AsTime().IsZero() {
+		if e.Processor != nil {
+			processorName := e.Processor.Name
+			processorEvent := e.Processor.Event
+			if (processorName == "error" && processorEvent == "error") || (processorName == "transaction" && (processorEvent == "transaction" || processorEvent == "span")) {
+				timestampStruct.US = int(e.Timestamp.AsTime().UnixNano() / 1000)
+				doc.TimestampStruct = &timestampStruct
+			}
+		}
+	}
+
+	if e.Cloud != nil {
+		e.Cloud.toModelJSON(doc.Cloud)
+	}
+
+	if e.Faas != nil {
+		e.Faas.toModelJSON(doc.FAAS)
+	}
+
+	if e.Device != nil {
+		e.Device.toModelJSON(doc.Device)
+	}
+
+	if e.Network != nil {
+		e.Network.toModelJSON(doc.Network)
+	}
+
+	if e.Observer != nil {
+		e.Observer.toModelJSON(doc.Observer)
+	}
+
+	if e.Container != nil {
+		e.Container.toModelJSON(doc.Container)
+	}
+
+	if e.Kubernetes != nil {
+		e.Kubernetes.toModelJSON(doc.Kubernetes)
+	}
+
+	if e.Agent != nil {
+		e.Agent.toModelJSON(doc.Agent)
+	}
+
+	if e.Trace != nil {
+		doc.Trace.ID = e.Trace.Id
+	}
+
+	if e.User != nil {
+		e.User.toModelJSON(doc.User)
+	}
+
+	if e.Source != nil {
+		e.Source.toModelJSON(doc.Source)
+	}
+
+	if e.Parent != nil {
+		doc.Parent.ID = e.Parent.Id
+	}
+
+	if e.Child != nil {
+		doc.Child.ID = e.Child.Id
+	}
+
+	if e.Client != nil {
+		e.Client.toModelJSON(doc.Client)
+	}
+
+	if e.UserAgent != nil {
+		doc.UserAgent.Original = e.UserAgent.Original
+		doc.UserAgent.Name = e.UserAgent.Name
+	}
+
+	if e.Service != nil {
+		e.Service.toModelJSON(doc.Service)
+	}
+
+	if e.Http != nil {
+		e.Http.toModelJSON(doc.HTTP)
+	}
+
+	if e.Host != nil {
+		e.Host.toModelJSON(doc.Host)
+	}
+
+	if e.Url != nil {
+		e.Url.toModelJSON(doc.URL)
+	}
+
+	if e.Log != nil {
+		e.Log.toModelJSON(doc.Log)
+	}
+
+	if e.Process != nil {
+		e.Process.toModelJSON(doc.Process)
+	}
+
+	if e.Destination != nil {
+		e.Destination.toModelJSON(doc.Destination)
+	}
+
+	if e.Session != nil {
+		doc.Session.ID = e.Session.Id
+		doc.Session.Sequence = int(e.Session.Sequence)
+	}
+}
+
+func setNonZero[T comparable](to **T, from *T) {
+	if !isZero(*from) {
+		*to = from
+	}
+}
+
+func isZero[T comparable](t T) bool {
+	var zero T
+	return t == zero
+}