Push SentryTransaction extras into the Contexts.Trace.Data element

Author: aritchie

src/Sentry/Protocol/Trace.cs

@@ -7,7 +7,7 @@ namespace Sentry.Protocol;
 /// <summary>
 /// Trace context data.
 /// </summary>
-public class Trace : ITraceContext, ISentryJsonSerializable, ICloneable<Trace>, IUpdatable<Trace>
+public class Trace : ITraceContext, IHasExtra, ISentryJsonSerializable, ICloneable<Trace>, IUpdatable<Trace>
 {
     /// <summary>
     /// Tells Sentry which type of context this is.
@@ -103,6 +103,7 @@ public void WriteTo(Utf8JsonWriter writer, IDiagnosticLogger? logger)
         writer.WriteString("origin", Origin ?? Internal.OriginHelper.Manual);
         writer.WriteStringIfNotWhiteSpace("description", Description);
         writer.WriteStringIfNotWhiteSpace("status", Status?.ToString().ToSnakeCase());
+        writer.WriteDictionaryIfNotEmpty("data", _extra, logger);
 
         writer.WriteEndObject();
     }
@@ -120,6 +121,7 @@ public static Trace FromJson(JsonElement json)
         var description = json.GetPropertyOrNull("description")?.GetString();
         var status = json.GetPropertyOrNull("status")?.GetString()?.Replace("_", "").ParseEnum<SpanStatus>();
         var isSampled = json.GetPropertyOrNull("sampled")?.GetBoolean();
+        var extra = json.GetPropertyOrNull("data")?.GetDictionaryOrNull() ?? new();
 
         return new Trace
         {
@@ -130,7 +132,19 @@ public static Trace FromJson(JsonElement json)
             Origin = origin,
             Description = description,
             Status = status,
-            IsSampled = isSampled
+            IsSampled = isSampled,
+            _extra = extra
         };
     }
+
+
+    // not readonly for serialization
+    private Dictionary<string, object?> _extra = new();
+
+    /// <inheritdoc />
+    public IReadOnlyDictionary<string, object?> Extra => _extra;
+
+    /// <inheritdoc />
+    public void SetExtra(string key, object? value)
+        => _extra[key] = value;
 }

src/Sentry/SentryTransaction.cs

@@ -179,11 +179,9 @@ public IReadOnlyList<string> Fingerprint
     /// <inheritdoc />
     public IReadOnlyCollection<Breadcrumb> Breadcrumbs => _breadcrumbs;
 
-    // Not readonly because of deserialization
-    private Dictionary<string, object?> _extra = new();
 
     /// <inheritdoc />
-    public IReadOnlyDictionary<string, object?> Extra => _extra;
+    public IReadOnlyDictionary<string, object?> Extra => Contexts.Trace.Extra;
 
     // Not readonly because of deserialization
     private Dictionary<string, string> _tags = new();
@@ -270,7 +268,6 @@ public SentryTransaction(ITransactionTracer tracer)
         Sdk = tracer.Sdk;
         Fingerprint = tracer.Fingerprint;
         _breadcrumbs = tracer.Breadcrumbs.ToList();
-        _extra = tracer.Extra.ToDict();
         _tags = tracer.Tags.ToDict();
 
         _spans = FromTracerSpans(tracer);
@@ -340,7 +337,7 @@ public void AddBreadcrumb(Breadcrumb breadcrumb) =>
 
     /// <inheritdoc />
     public void SetExtra(string key, object? value) =>
-        _extra[key] = value;
+        Contexts.Trace.SetExtra(key, value);
 
     /// <inheritdoc />
     public void SetTag(string key, string value) =>
@@ -401,7 +398,6 @@ public void WriteTo(Utf8JsonWriter writer, IDiagnosticLogger? logger)
         writer.WriteSerializable("sdk", Sdk, logger);
         writer.WriteStringArrayIfNotEmpty("fingerprint", _fingerprint);
         writer.WriteArrayIfNotEmpty("breadcrumbs", _breadcrumbs, logger);
-        writer.WriteDictionaryIfNotEmpty("extra", _extra, logger);
         writer.WriteStringDictionaryIfNotEmpty("tags", _tags!);
         writer.WriteArrayIfNotEmpty("spans", _spans, logger);
         writer.WriteDictionaryIfNotEmpty("measurements", _measurements, logger);
@@ -434,8 +430,6 @@ public static SentryTransaction FromJson(JsonElement json)
             .EnumerateArray().Select(j => j.GetString()!).ToArray();
         var breadcrumbs = json.GetPropertyOrNull("breadcrumbs")?
             .EnumerateArray().Select(Breadcrumb.FromJson).ToList() ?? new();
-        var extra = json.GetPropertyOrNull("extra")?
-            .GetDictionaryOrNull() ?? new();
         var tags = json.GetPropertyOrNull("tags")?
             .GetStringDictionaryOrNull()?.WhereNotNullValue().ToDict() ?? new();
         var measurements = json.GetPropertyOrNull("measurements")?
@@ -459,7 +453,6 @@ public static SentryTransaction FromJson(JsonElement json)
             Sdk = sdk,
             _fingerprint = fingerprint,
             _breadcrumbs = breadcrumbs,
-            _extra = extra,
             _tags = tags,
             _measurements = measurements,
             _spans = spans