PLAT-12684 make finished span queue thread safe (#132)

richardelms · web-flow · commit 3903e714d285 · 2024-09-06T09:40:50.000+02:00
* fix

* changelog
diff --git a/BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Tracer.cs b/BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Tracer.cs
@@ -186,11 +186,11 @@ private void DeliverBatch()
                 new Thread(() =>
                 {
                     List<Span> batch = new List<Span>();
-                    foreach (var finishedSpan in _finishedSpanQueue)
+                    lock (_queueLock)
                     {
-                        batch.Add(finishedSpan);
+                        batch.AddRange(_finishedSpanQueue);
+                        _finishedSpanQueue.Clear();
                     }
-                    _finishedSpanQueue.Clear();
                     if (batch.Count == 0)
                     {
                         return;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## TBD
+
+### Bug Fixes
+
+- Fix an issue where the access to the finished span queue in the tracer was not thread safe. [#132](https://github.com/bugsnag/bugsnag-unity-performance/pull/132)
+
 ## v1.5.0 (2024-09-03)
 
 ### Additions

Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,11 @@ private void DeliverBatch()`
`186`	`186`	`new Thread(() =>`
`187`	`187`	`{`
`188`	`188`	`List<Span> batch = new List<Span>();`
`189`		`- foreach (var finishedSpan in _finishedSpanQueue)`
	`189`	`+ lock (_queueLock)`
`190`	`190`	`{`
`191`		`- batch.Add(finishedSpan);`
	`191`	`+ batch.AddRange(_finishedSpanQueue);`
	`192`	`+ _finishedSpanQueue.Clear();`
`192`	`193`	`}`
`193`		`- _finishedSpanQueue.Clear();`
`194`	`194`	`if (batch.Count == 0)`
`195`	`195`	`{`
`196`	`196`	`return;`