Hub.IsEnabled set to false when Hub disposed (#1021)

* IsEnabled set to false when Hub disposed * Review changes * Hub over-dispose test Co-authored-by: Bruno Garcia <bruno@brunogarcia.com>
getsentry · Jun 3, 2021 · 29d301a · 29d301a
1 parent 92dd408
commit 29d301a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/Sentry/Internal/Hub.cs b/src/Sentry/Internal/Hub.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Sentry.Extensibility;
 using Sentry.Integrations;
@@ -19,7 +20,8 @@ internal class Hub : IHub, IDisposable
 
         internal SentryScopeManager ScopeManager { get; }
 
-        public bool IsEnabled => true;
+        private int _isEnabled = 1;
+        public bool IsEnabled => _isEnabled == 1;
 
         internal Hub(ISentryClient client, SentryOptions options)
         {
@@ -247,6 +249,11 @@ public void Dispose()
         {
             _options.DiagnosticLogger?.LogInfo("Disposing the Hub.");
 
+            if (Interlocked.Exchange(ref _isEnabled, 0) != 1)
+            {
+                return;
+            }
+
             if (_integrations?.Length > 0)
             {
                 foreach (var integration in _integrations)

diff --git a/test/Sentry.Tests/HubTests.cs b/test/Sentry.Tests/HubTests.cs
@@ -639,5 +639,40 @@ public void CaptureTransaction_AfterTransactionFinishes_ResetsTransactionOnScope
             // Assert
             hub.WithScope(scope => scope.Transaction.Should().BeNull());
         }
+
+        [Fact]
+        public void Dispose_IsEnabled_SetToFalse()
+        {
+            // Arrange
+            var hub = new Hub(new SentryOptions
+            {
+                Dsn = DsnSamples.ValidDsnWithSecret
+            });
+
+            hub.IsEnabled.Should().BeTrue();
+
+            // Act
+            hub.Dispose();
+
+            // Assert
+            hub.IsEnabled.Should().BeFalse();
+        }
+
+        [Fact]
+        public void Dispose_CalledSecondTime_ClientDisposedOnce()
+        {
+            var client = Substitute.For<ISentryClient, IDisposable>();
+            var hub = new Hub(client, new SentryOptions
+            {
+                Dsn = DsnSamples.ValidDsnWithSecret
+            });
+
+            // Act
+            hub.Dispose();
+            hub.Dispose();
+
+            // Assert
+            (client as IDisposable).Received(1).Dispose();
+        }
     }
 }