Fix pre-serialized event drops spans and user fields

cursoragent · cursoragent · commit 2b9dc349048d · 2026-03-02T10:57:48.000Z
diff --git a/interfaces.go b/interfaces.go
@@ -641,7 +641,6 @@ func (e *Event) preSerializedMarshalJSON() ([]byte, error) {
 			Contexts    json.RawMessage `json:"contexts,omitempty"`
 			Breadcrumbs json.RawMessage `json:"breadcrumbs,omitempty"`
 			Exception   json.RawMessage `json:"exception,omitempty"`
-			Spans       json.RawMessage `json:"spans,omitempty"`
 			User        json.RawMessage `json:"user,omitempty"`
 		}
 		return json.Marshal(safeTransaction{
@@ -904,7 +903,7 @@ func (e *Event) MakeSerializationSafe() {
 		}
 	}
 
-	if len(e.User.Data) > 0 {
+	if !e.User.IsEmpty() {
 		if b, err := json.Marshal(e.User); err == nil {
 			e.serializedUser = b
 		}
diff --git a/interfaces_test.go b/interfaces_test.go
@@ -1028,6 +1028,73 @@ func TestMakeSerializationSafe(t *testing.T) {
 		}
 	})
 
+	t.Run("pre-serializes User when Data is empty", func(t *testing.T) {
+		event := &Event{
+			Extra: map[string]interface{}{"key": "value"},
+			User:  User{ID: "1", Email: "user@example.com"},
+		}
+		event.MakeSerializationSafe()
+
+		if event.serializedUser == nil {
+			t.Fatal("serializedUser should be set")
+		}
+
+		jsonData, err := json.Marshal(event)
+		if err != nil {
+			t.Fatalf("marshal failed: %v", err)
+		}
+
+		var got map[string]interface{}
+		if err := json.Unmarshal(jsonData, &got); err != nil {
+			t.Fatalf("unmarshal failed: %v", err)
+		}
+
+		user, ok := got["user"].(map[string]interface{})
+		if !ok {
+			t.Fatalf("expected user field in JSON, got %s", jsonData)
+		}
+		if user["id"] != "1" {
+			t.Errorf("expected user.id=1, got %v", user["id"])
+		}
+		if user["email"] != "user@example.com" {
+			t.Errorf("expected user.email=user@example.com, got %v", user["email"])
+		}
+	})
+
+	t.Run("pre-serializes transaction spans", func(t *testing.T) {
+		event := &Event{
+			Type: transactionType,
+			Contexts: map[string]Context{
+				"trace": TraceContext{
+					TraceID: TraceIDFromHex("90d57511038845dcb4164a70fc3a7fdb"),
+					SpanID:  SpanIDFromHex("f7f3fd754a9040eb"),
+				}.Map(),
+			},
+			Spans: []*Span{{
+				TraceID:   TraceIDFromHex("90d57511038845dcb4164a70fc3a7fdb"),
+				SpanID:    SpanIDFromHex("4aaf45ea7db94520"),
+				StartTime: time.Unix(1, 0).UTC(),
+				EndTime:   time.Unix(2, 0).UTC(),
+			}},
+		}
+		event.MakeSerializationSafe()
+
+		jsonData, err := json.Marshal(event)
+		if err != nil {
+			t.Fatalf("marshal failed: %v", err)
+		}
+
+		var got map[string]interface{}
+		if err := json.Unmarshal(jsonData, &got); err != nil {
+			t.Fatalf("unmarshal failed: %v", err)
+		}
+
+		spans, ok := got["spans"].([]interface{})
+		if !ok || len(spans) != 1 {
+			t.Fatalf("expected one span in JSON, got %s", jsonData)
+		}
+	})
+
 	t.Run("marshaled output matches original event", func(t *testing.T) {
 		event := &Event{
 			EventID: "12345678901234567890123456789012",

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,6 @@ func (e *Event) preSerializedMarshalJSON() ([]byte, error) {`
`641`	`641`	Contexts json.RawMessage `json:"contexts,omitempty"`
`642`	`642`	Breadcrumbs json.RawMessage `json:"breadcrumbs,omitempty"`
`643`	`643`	Exception json.RawMessage `json:"exception,omitempty"`
`644`		- Spans json.RawMessage `json:"spans,omitempty"`
`645`	`644`	User json.RawMessage `json:"user,omitempty"`
`646`	`645`	`}`
`647`	`646`	`return json.Marshal(safeTransaction{`
`@@ -904,7 +903,7 @@ func (e *Event) MakeSerializationSafe() {`
`904`	`903`	`}`
`905`	`904`	`}`
`906`	`905`
`907`		`- if len(e.User.Data) > 0 {`
	`906`	`+ if !e.User.IsEmpty() {`
`908`	`907`	`if b, err := json.Marshal(e.User); err == nil {`
`909`	`908`	`e.serializedUser = b`
`910`	`909`	`}`