fixed webbackgroundworker

Author: bitsandfoxes

src/Sentry.Unity/UnityWebRequestTransport.cs

@@ -15,6 +15,7 @@ internal class WebBackgroundWorker : IBackgroundWorker
 {
     private readonly SentryMonoBehaviour _behaviour;
     private readonly UnityWebRequestTransport _transport;
+    private int _pendingItems;
 
     public WebBackgroundWorker(SentryUnityOptions options, SentryMonoBehaviour behaviour)
     {
@@ -24,13 +25,20 @@ public WebBackgroundWorker(SentryUnityOptions options, SentryMonoBehaviour behav
 
     public bool EnqueueEnvelope(Envelope envelope)
     {
-        _behaviour.QueueCoroutine(_transport.SendEnvelopeAsync(envelope));
+        _pendingItems++;
+        _behaviour.QueueCoroutine(SendAndTrack(envelope));
         return true;
     }
 
+    private IEnumerator SendAndTrack(Envelope envelope)
+    {
+        yield return _transport.SendEnvelopeAsync(envelope);
+        _pendingItems--;
+    }
+
     public Task FlushAsync(TimeSpan timeout) => Task.CompletedTask;
 
-    public int QueuedItems { get; }
+    public int QueuedItems => _pendingItems;
 }
 
 internal class UnityWebRequestTransport : HttpTransportBase

test/Scripts.Integration.Test/Scripts/IntegrationTester.cs

@@ -17,10 +17,10 @@ public void Start()
         switch (arg)
         {
             case "message-capture":
-                MessageCapture();
+                StartCoroutine(MessageCapture());
                 break;
             case "exception-capture":
-                ExceptionCapture();
+                StartCoroutine(ExceptionCapture());
                 break;
             case "crash-capture":
                 StartCoroutine(CrashCapture());
@@ -56,21 +56,17 @@ private void AddIntegrationTestContext(string testType)
         SentrySdk.AddBreadcrumb("Context configuration finished");
     }
 
-    private void MessageCapture()
+    private IEnumerator MessageCapture()
     {
         AddIntegrationTestContext("message-capture");
 
         var eventId = SentrySdk.CaptureMessage("Integration test message");
         Debug.Log($"EVENT_CAPTURED: {eventId}");
 
-        SentrySdk.FlushAsync(TimeSpan.FromSeconds(5)).GetAwaiter().GetResult();
-        Debug.Log("INTEGRATION_TEST_COMPLETE");
-#if !UNITY_WEBGL
-        Application.Quit(0);
-#endif
+        yield return CompleteAndQuit();
     }
 
-    private void ExceptionCapture()
+    private IEnumerator ExceptionCapture()
     {
         AddIntegrationTestContext("exception-capture");
 
@@ -84,10 +80,21 @@ private void ExceptionCapture()
             Debug.Log($"EVENT_CAPTURED: {eventId}");
         }
 
-        SentrySdk.FlushAsync(TimeSpan.FromSeconds(5)).GetAwaiter().GetResult();
+        yield return CompleteAndQuit();
+    }
+
+    private IEnumerator CompleteAndQuit()
+    {
+#if UNITY_WEBGL
+        // On WebGL, envelope sends are coroutine-based and need additional frames to
+        // complete. Wait to avoid a race where the test harness shuts down the browser
+        // before the send finishes.
+        yield return new WaitForSeconds(3);
+        Debug.Log("INTEGRATION_TEST_COMPLETE");
+#else
         Debug.Log("INTEGRATION_TEST_COMPLETE");
-#if !UNITY_WEBGL
         Application.Quit(0);
+        yield break;
 #endif
     }