Merge branch 'main' into templates-update-20230703-115303

Author: matthewjhowells

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/TracePayload.cs

@@ -18,9 +18,6 @@ public class TracePayload
         private ResourceModel _resourceModel;
         private List<SpanModel> _spans = null;
 
-        // Temporary method to allow hard coding the Bugsnag-Span-Sampling header until sampling is properly implemented
-        public int BatchSize;
-
         private string _jsonbody;
 
         public TracePayload(ResourceModel resourceModel, List<Span> spans)
@@ -34,7 +31,6 @@ public TracePayload(ResourceModel resourceModel, List<Span> spans)
                 {
                     _spans.Add(new SpanModel(span));
                 }
-                BatchSize = spans.Count;
                 SamplingHistogram = CalculateSamplingHistorgram(spans);
                 Headers["Bugsnag-Span-Sampling"] = BuildSamplingHistogramHeader(this);
             }
@@ -51,15 +47,6 @@ private TracePayload(Dictionary<string, string> headers, string cachedJson, stri
             _jsonbody = cachedJson;
         }
 
-        public override bool Equals(object obj) => (obj is TracePayload other) && Equals(other);
-
-        public bool Equals(TracePayload other)
-        {
-            return GetJsonBody() == other.GetJsonBody() &&
-                Headers.Count == other.Headers.Count &&
-                !Headers.Except(other.Headers).Any();
-        }
-
         private static SortedList<double, int> CalculateSamplingHistorgram(List<Span> spans)
         {
             var histogram = new Dictionary<double, int>();
@@ -158,12 +145,20 @@ private static string BuildSamplingHistogramHeader(TracePayload payload)
             builder.Remove(builder.Length - 1, 1);
             return builder.ToString();
         }
+
+        public bool PayloadsAreEqual(TracePayload other)
+        {
+            return GetJsonBody() == other.GetJsonBody() &&
+                Headers.Count == other.Headers.Count &&
+                !Headers.Except(other.Headers).Any();
+        }
+
     }
 
     [Serializable]
     internal class TracePayloadBody
     {
         public ResourceSpanModel[] resourceSpans;
     }
-        
+
 }

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Public/BugsnagPerformance.cs

@@ -90,7 +90,6 @@ private BugsnagPerformance()
 
         internal class SceneLoadSpanContainer
         {
-            public string SceneName;
             public List<Span> Spans = new List<Span>();
         }
 

BugsnagPerformance/Assets/UnitTests/TracePayloadTests.cs

@@ -11,6 +11,7 @@ namespace Tests
 {
     public class TracePayloadTests
     {
+
         [Test]
         public void TestPersistenceNoHeaders()
         {
@@ -25,7 +26,7 @@ public void TestPersistenceNoHeaders()
             var loadedPayload = TracePayload.Deserialize(payload.PayloadId, stream);
             stream.Close();
 
-            Assert.AreEqual(payload, loadedPayload);
+            Assert.IsTrue(payload.PayloadsAreEqual(loadedPayload));
             Assert.AreEqual("1:1", loadedPayload.Headers["Bugsnag-Span-Sampling"]);
 
             Directory.Delete(dir, true);
@@ -46,7 +47,7 @@ public void TestPersistenceOneHeader()
             var loadedPayload = TracePayload.Deserialize(payload.PayloadId, stream);
             stream.Close();
 
-            Assert.AreEqual(payload, loadedPayload);
+            Assert.IsTrue(payload.PayloadsAreEqual(loadedPayload));
             Assert.AreEqual("1:1", loadedPayload.Headers["Bugsnag-Span-Sampling"]);
 
             Directory.Delete(dir, true);
@@ -69,7 +70,7 @@ public void TestPersistenceMultipleHeaders()
             var loadedPayload = TracePayload.Deserialize(payload.PayloadId, stream);
             stream.Close();
 
-            Assert.AreEqual(payload, loadedPayload);
+            Assert.IsTrue(payload.PayloadsAreEqual(loadedPayload));
             Assert.AreEqual("1:1", loadedPayload.Headers["Bugsnag-Span-Sampling"]);
 
             Directory.Delete(dir, true);

Gemfile

@@ -4,7 +4,7 @@ gem 'rake'
 
 unless Gem.win_platform?
   # Use official Maze Runner release
-  gem 'bugsnag-maze-runner', '~> 8.0'
+  gem 'bugsnag-maze-runner', '~> 8.1.3'
 
   # Use a specific Maze Runner branch
   #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'