Added missing conversion to json model

elastic · Jan 24, 2024 · b57fa2b · b57fa2b
1 parent 3fb4835
commit b57fa2b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 31 deletions.
diff --git a/model/modeljson/internal/marshal_fastjson.go b/model/modeljson/internal/marshal_fastjson.go
diff --git a/model/modeljson/internal/transaction.go b/model/modeljson/internal/transaction.go
@@ -18,21 +18,22 @@
 package modeljson
 
 type Transaction struct {
-	SpanCount           SpanCount                     `json:"span_count,omitempty"`
-	UserExperience      *UserExperience               `json:"experience,omitempty"`
-	Custom              KeyValueSlice                 `json:"custom,omitempty"`
-	Marks               map[string]map[string]float64 `json:"marks,omitempty"`
-	Message             *Message                      `json:"message,omitempty"`
-	Type                string                        `json:"type,omitempty"`
-	Name                string                        `json:"name,omitempty"`
-	Result              string                        `json:"result,omitempty"`
-	ID                  string                        `json:"id,omitempty"`
-	DurationHistogram   Histogram                     `json:"duration.histogram,omitempty"`
-	DroppedSpansStats   []DroppedSpanStats            `json:"dropped_spans_stats,omitempty"`
-	DurationSummary     SummaryMetric                 `json:"duration.summary,omitempty"`
-	RepresentativeCount float64                       `json:"representative_count,omitempty"`
-	Sampled             bool                          `json:"sampled,omitempty"`
-	Root                bool                          `json:"root,omitempty"`
+	SpanCount             SpanCount                     `json:"span_count,omitempty"`
+	UserExperience        *UserExperience               `json:"experience,omitempty"`
+	Custom                KeyValueSlice                 `json:"custom,omitempty"`
+	Marks                 map[string]map[string]float64 `json:"marks,omitempty"`
+	Message               *Message                      `json:"message,omitempty"`
+	Type                  string                        `json:"type,omitempty"`
+	Name                  string                        `json:"name,omitempty"`
+	Result                string                        `json:"result,omitempty"`
+	ID                    string                        `json:"id,omitempty"`
+	DurationHistogram     Histogram                     `json:"duration.histogram,omitempty"`
+	DroppedSpansStats     []DroppedSpanStats            `json:"dropped_spans_stats,omitempty"`
+	DurationSummary       SummaryMetric                 `json:"duration.summary,omitempty"`
+	RepresentativeCount   float64                       `json:"representative_count,omitempty"`
+	Sampled               bool                          `json:"sampled,omitempty"`
+	Root                  bool                          `json:"root,omitempty"`
+	ProfilerStackTraceIds []string                      `json:"profiler_stack_trace_ids,omitempty"`
 }
 
 type SpanCount struct {

diff --git a/model/modeljson/transaction.pb.json.go b/model/modeljson/transaction.pb.json.go
@@ -26,13 +26,14 @@ import (
 
 func TransactionModelJSON(e *modelpb.Transaction, out *modeljson.Transaction, metricset bool) {
 	*out = modeljson.Transaction{
-		ID:                  e.Id,
-		Type:                e.Type,
-		Name:                e.Name,
-		Result:              e.Result,
-		Sampled:             e.Sampled,
-		Root:                e.Root,
-		RepresentativeCount: e.RepresentativeCount,
+		ID:                    e.Id,
+		Type:                  e.Type,
+		Name:                  e.Name,
+		Result:                e.Result,
+		Sampled:               e.Sampled,
+		Root:                  e.Root,
+		RepresentativeCount:   e.RepresentativeCount,
+		ProfilerStackTraceIds: e.ProfilerStackTraceIds,
 	}
 
 	if e.Custom != nil {

diff --git a/model/modeljson/transaction.pb.json_test.go b/model/modeljson/transaction.pb.json_test.go
@@ -106,9 +106,10 @@ func TestTransactionToModelJSON(t *testing.T) {
 					Count: 6,
 					Sum:   7,
 				},
-				RepresentativeCount: 8,
-				Sampled:             true,
-				Root:                true,
+				RepresentativeCount:   8,
+				Sampled:               true,
+				Root:                  true,
+				ProfilerStackTraceIds: []string{"foo", "foo", "bar"},
 			},
 			expectedNoMetricset: &modeljson.Transaction{
 				SpanCount: modeljson.SpanCount{
@@ -134,9 +135,10 @@ func TestTransactionToModelJSON(t *testing.T) {
 					Count: 6,
 					Sum:   7,
 				},
-				RepresentativeCount: 8,
-				Sampled:             true,
-				Root:                true,
+				RepresentativeCount:   8,
+				Sampled:               true,
+				Root:                  true,
+				ProfilerStackTraceIds: []string{"foo", "foo", "bar"},
 			},
 			expectedMetricset: &modeljson.Transaction{
 				SpanCount: modeljson.SpanCount{
@@ -174,9 +176,10 @@ func TestTransactionToModelJSON(t *testing.T) {
 					Count: 6,
 					Sum:   7,
 				},
-				RepresentativeCount: 8,
-				Sampled:             true,
-				Root:                true,
+				RepresentativeCount:   8,
+				Sampled:               true,
+				Root:                  true,
+				ProfilerStackTraceIds: []string{"foo", "foo", "bar"},
 			},
 		},
 	}