Changed ExtraData from an Array to an IEnumerable

src/Sentry.Maui/BreadcrumbEvent.cs

@@ -19,32 +19,53 @@ public sealed class BreadcrumbEvent
     /// Any extra data to be included in the breadcrumb. This would typically be event specific information (for example
     /// it could include the X, Y coordinates of a tap event).
     /// </summary>
-    public (string Key, string Value)[] ExtraData { get; }
+    public IEnumerable<KeyValuePair<string, string>> ExtraData { get; }
+
+    /// <summary>
+    /// Creates a new BreadcrumbEvent
+    /// </summary>
+    public BreadcrumbEvent(object? sender, string eventName)
+        : this(sender, eventName, Array.Empty<KeyValuePair<string, string>>())
+    {
+    }
 
     /// <summary>
     /// Creates a new BreadcrumbEvent
     /// </summary>
     public BreadcrumbEvent(
         object? sender,
         string eventName,
-        params (string Key, string Value)[] extraData)
+        params IEnumerable<KeyValuePair<string, string>> extraData)
     {
         Sender = sender;
         EventName = eventName;
         ExtraData = extraData;
     }
 
+    /// <summary>
+    /// Creates a new BreadcrumbEvent
+    /// </summary>
+    public BreadcrumbEvent(
+        object? sender,
+        string eventName,
+        params IEnumerable<(string key, string value)> extraData) : this(sender, eventName, extraData.Select(
+            e => new KeyValuePair<string, string>(e.key, e.value)))
+    {
+    }
+
     /// <summary>
     /// This constructor remains for backward compatibility.
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="eventName"></param>
     /// <param name="extraData"></param>
-    [Obsolete("Use the simpler constructor with params (string Key, string Value)[] extraData instead.")]
+    [Obsolete("Use one of the other simpler constructors instead.")]
     public BreadcrumbEvent(
         object? sender,
         string eventName,
-        IEnumerable<(string Key, string Value)>[] extraData) : this(sender, eventName, extraData.SelectMany(e => e).ToArray())
+        IEnumerable<(string Key, string Value)>[] extraData) : this(sender, eventName, extraData.SelectMany(
+            x => x.Select(pair => new KeyValuePair<string, string>(pair.Key, pair.Value)))
+        )
     {
     }
 }

src/Sentry.Maui/Internal/MauiButtonEventsBinder.cs

@@ -3,12 +3,12 @@ namespace Sentry.Maui.Internal;
 /// <inheritdoc />
 public class MauiButtonEventsBinder : IMauiElementEventBinder
 {
-    private Action<BreadcrumbEvent>? addBreadcrumbCallback;
+    private Action<BreadcrumbEvent>? _addBreadcrumbCallback;
 
     /// <inheritdoc />
     public void Bind(VisualElement element, Action<BreadcrumbEvent> addBreadcrumb)
     {
-        addBreadcrumbCallback = addBreadcrumb;
+        _addBreadcrumbCallback = addBreadcrumb;
 
         if (element is Button button)
         {
@@ -30,11 +30,11 @@ public void UnBind(VisualElement element)
     }
 
     private void OnButtonOnClicked(object? sender, EventArgs _)
-        => addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Clicked)));
+        => _addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Clicked)));
 
     private void OnButtonOnPressed(object? sender, EventArgs _)
-        => addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Pressed)));
+        => _addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Pressed)));
 
     private void OnButtonOnReleased(object? sender, EventArgs _)
-        => addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Released)));
+        => _addBreadcrumbCallback?.Invoke(new(sender, nameof(Button.Released)));
 }

test/Sentry.Maui.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt

@@ -13,19 +13,17 @@ namespace Sentry.Maui
 {
     public sealed class BreadcrumbEvent
     {
-        [System.Obsolete("Use the simpler constructor with params (string Key, string Value)[] extraData in" +
-            "stead.")]
+        public BreadcrumbEvent(object? sender, string eventName) { }
+        public BreadcrumbEvent(object? sender, string eventName, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> extraData) { }
         public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.TupleElementNames(new string[] {
-                "Key",
-                "Value"})] System.Collections.Generic.IEnumerable<System.ValueTuple<string, string>>[] extraData) { }
+                "key",
+                "value"})] System.Collections.Generic.IEnumerable<System.ValueTuple<string, string>> extraData) { }
+        [System.Obsolete("Use one of the other simpler constructors instead.")]
         public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.TupleElementNames(new string[] {
                 "Key",
-                "Value"})] params System.ValueTuple<string, string>[] extraData) { }
+                "Value"})] System.Collections.Generic.IEnumerable<System.ValueTuple<string, string>>[] extraData) { }
         public string EventName { get; }
-        [System.Runtime.CompilerServices.TupleElementNames(new string[] {
-                "Key",
-                "Value"})]
-        public System.ValueTuple<string, string>[] ExtraData { get; }
+        public System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> ExtraData { get; }
         public object? Sender { get; }
     }
     public interface IMauiElementEventBinder

test/Sentry.Maui.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt

@@ -13,19 +13,17 @@ namespace Sentry.Maui
 {
     public sealed class BreadcrumbEvent
     {
-        [System.Obsolete("Use the simpler constructor with params (string Key, string Value)[] extraData in" +
-            "stead.")]
+        public BreadcrumbEvent(object? sender, string eventName) { }
+        public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.ParamCollection] System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> extraData) { }
+        public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.ParamCollection] [System.Runtime.CompilerServices.TupleElementNames(new string[] {
+                "key",
+                "value"})] System.Collections.Generic.IEnumerable<System.ValueTuple<string, string>> extraData) { }
+        [System.Obsolete("Use one of the other simpler constructors instead.")]
         public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.TupleElementNames(new string[] {
                 "Key",
                 "Value"})] System.Collections.Generic.IEnumerable<System.ValueTuple<string, string>>[] extraData) { }
-        public BreadcrumbEvent(object? sender, string eventName, [System.Runtime.CompilerServices.TupleElementNames(new string[] {
-                "Key",
-                "Value"})] params System.ValueTuple<string, string>[] extraData) { }
         public string EventName { get; }
-        [System.Runtime.CompilerServices.TupleElementNames(new string[] {
-                "Key",
-                "Value"})]
-        public System.ValueTuple<string, string>[] ExtraData { get; }
+        public System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, string>> ExtraData { get; }
         public object? Sender { get; }
     }
     public interface IMauiElementEventBinder

test/Sentry.Maui.Tests/MauiEventsBinderTests.cs

@@ -28,7 +28,7 @@ public void OnBreadcrumbCreateCallback_CreatesBreadcrumb()
             Assert.Equal(MauiEventsBinder.UserType, crumb.Type);
             Assert.Equal(MauiEventsBinder.UserActionCategory, crumb.Category);
             Assert.NotNull(crumb.Data);
-            Assert.Equal(breadcrumbEvent.ExtraData.Length, crumb.Data.Count);
+            Assert.Equal(breadcrumbEvent.ExtraData.Count(), crumb.Data.Count);
             foreach (var (key, value) in breadcrumbEvent.ExtraData)
             {
                 crumb.Data.Should().Contain(kvp => kvp.Key == key && kvp.Value == value);