.

Author: jamescrosswell

src/Sentry/Internal/CacheDirectoryCoordinator.cs

@@ -36,7 +36,7 @@ public CacheDirectoryCoordinator(string cacheDir, IDiagnosticLogger? logger, IFi
         }
     }
 
-    public bool TryAcquire(TimeSpan timeout)
+    public bool TryAcquire()
     {
         if (_acquired)
         {

src/Sentry/Internal/Http/CachingTransport.cs

@@ -82,7 +82,7 @@ private CachingTransport(ITransport innerTransport, SentryOptions options, bool
             options.TryGetIsolatedCacheDirectoryPath() ??
             throw new InvalidOperationException("Cache directory or DSN is not set.");
         _cacheCoordinator = new CacheDirectoryCoordinator(_isolatedCacheDirectoryPath, options.DiagnosticLogger, options.FileSystem);
-        if (!_cacheCoordinator.TryAcquire(TimeSpan.FromMilliseconds(100)))
+        if (!_cacheCoordinator.TryAcquire())
         {
             throw new InvalidOperationException("Cache directory already locked.");
         }
@@ -107,7 +107,7 @@ private void Initialize(bool startWorker)
             _worker = Task.Run(CachedTransportBackgroundTaskAsync);
 
             // Start a recycler in the background so as not to block initialisation
-            _recycler = Task.Run(SalvageAbandonedCacheSessions);
+            _recycler = Task.Run(() => SalvageAbandonedCacheSessions(_workerCts.Token), _workerCts.Token);
         }
         else
         {
@@ -187,7 +187,7 @@ private async Task CachedTransportBackgroundTaskAsync()
         _options.LogDebug("CachingTransport worker stopped.");
     }
 
-    private void SalvageAbandonedCacheSessions()
+    private void SalvageAbandonedCacheSessions(CancellationToken cancellationToken)
     {
         if (_options.GetBaseCacheDirectoryPath() is not { } baseCacheDir)
         {
@@ -197,22 +197,34 @@ private void SalvageAbandonedCacheSessions()
         const string searchPattern = $"{CacheDirectoryHelper.IsolatedCacheDirectoryPrefix}*";
         foreach (var dir in _fileSystem.EnumerateDirectories(baseCacheDir, searchPattern))
         {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return; // graceful exit on cancellation
+            }
+
             if (string.Equals(dir, _isolatedCacheDirectoryPath, StringComparison.OrdinalIgnoreCase))
             {
                 continue; // Ignore the current cache directory
             }
 
             _options.LogDebug("found abandoned cache: {0}", dir);
             using var coordinator = new CacheDirectoryCoordinator(dir, _options.DiagnosticLogger, _options.FileSystem);
-            if (coordinator.TryAcquire(TimeSpan.FromMilliseconds(100)))
+            if (!coordinator.TryAcquire())
             {
-                _options.LogDebug("Salvaging abandoned cache: {0}", dir);
-                foreach (var filePath in _fileSystem.EnumerateFiles(dir, "*.envelope", SearchOption.AllDirectories))
+                continue;
+            }
+
+            _options.LogDebug("Salvaging abandoned cache: {0}", dir);
+            foreach (var filePath in _fileSystem.EnumerateFiles(dir, "*.envelope", SearchOption.AllDirectories))
+            {
+                if (cancellationToken.IsCancellationRequested)
                 {
-                    var destinationPath = Path.Combine(_isolatedCacheDirectoryPath, Path.GetFileName(filePath));
-                    _options.LogDebug("Moving abandoned file back to cache: {0} to {1}.", filePath, destinationPath);
-                    MoveFileWithRetries(filePath, destinationPath, "abandoned");
+                    return; // graceful exit on cancellation
                 }
+
+                var destinationPath = Path.Combine(_isolatedCacheDirectoryPath, Path.GetFileName(filePath));
+                _options.LogDebug("Moving abandoned file back to cache: {0} to {1}.", filePath, destinationPath);
+                MoveFileWithRetries(filePath, destinationPath, "abandoned");
             }
         }
     }
@@ -582,6 +594,20 @@ public Task StopWorkerAsync()
         return _worker;
     }
 
+    private Task StopRecyclerAsync()
+    {
+        if (_recycler?.IsCompleted != false)
+        {
+            // already stopped
+            return Task.CompletedTask;
+        }
+
+        // Stop worker and wait until it finishes
+        _options.LogDebug("Stopping CachingTransport worker.");
+        _workerCts.Cancel();
+        return _recycler;
+    }
+
     public Task FlushAsync(CancellationToken cancellationToken = default)
     {
         _options.LogDebug("CachingTransport received request to flush the cache.");
@@ -600,6 +626,15 @@ public async ValueTask DisposeAsync()
             _options.LogError(ex, "Error stopping worker during dispose.");
         }
 
+        try
+        {
+            await StopRecyclerAsync().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _options.LogError(ex, "Error in recycler during dispose.");
+        }
+
         _workerSignal.Dispose();
         _workerCts.Dispose();
         _worker.Dispose();