Abandon ValueTask (#611)

Author: bruno-garcia

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## vNext
 
+* Abandon ValueTask #611
 * Fix Cache deleted on HttpTransport exception. (#610) @lucas-zimerman
 * Add SentryScopeStateProcessor #603
 * Add net5.0 TFM to libraries #606

benchmarks/Sentry.Benchmarks/BackgroundWorkerFlushBenchmarks.cs

@@ -12,7 +12,7 @@ public class BackgroundWorkerFlushBenchmarks
     {
         private class FakeTransport : ITransport
         {
-            public ValueTask SendEnvelopeAsync(Envelope envelope, CancellationToken cancellationToken = default)
+            public Task SendEnvelopeAsync(Envelope envelope, CancellationToken cancellationToken = default)
                 => default;
         }
 
@@ -40,6 +40,6 @@ public void IterationSetup()
         public int Items;
 
         [Benchmark(Description = "Enqueue event and FlushAsync")]
-        public ValueTask FlushAsync_QueueDepthAsync() => _backgroundWorker.FlushAsync(TimeSpan.FromSeconds(10));
+        public Task FlushAsync_QueueDepthAsync() => _backgroundWorker.FlushAsync(TimeSpan.FromSeconds(10));
     }
 }

src/Sentry.NLog/SentryTarget.cs

@@ -283,7 +283,6 @@ protected override void FlushAsync(AsyncContinuation asyncContinuation)
         {
             _ = HubAccessor()
                     .FlushAsync(Options.FlushTimeout)
-                    .AsTask()
                     .ContinueWith(t => asyncContinuation(t.Exception));
         }
 

src/Sentry/Extensibility/DisabledHub.cs

@@ -33,7 +33,7 @@ public void ConfigureScope(Action<Scope> configureScope)
         /// <summary>
         /// No-Op.
         /// </summary>
-        public ValueTask ConfigureScopeAsync(Func<Scope, ValueTask> configureScope) => default;
+        public Task ConfigureScopeAsync(Func<Scope, Task> configureScope) => Task.CompletedTask;
 
         /// <summary>
         /// No-Op.
@@ -67,7 +67,7 @@ public void BindClient(ISentryClient client)
         /// <summary>
         /// No-Op.
         /// </summary>
-        public ValueTask FlushAsync(TimeSpan timeout) => default;
+        public Task FlushAsync(TimeSpan timeout) => Task.CompletedTask;
 
         /// <summary>
         /// No-Op.

src/Sentry/Extensibility/HubAdapter.cs

@@ -47,7 +47,7 @@ public void ConfigureScope(Action<Scope> configureScope)
         /// Forwards the call to <see cref="SentrySdk"/>.
         /// </summary>
         [DebuggerStepThrough]
-        public ValueTask ConfigureScopeAsync(Func<Scope, ValueTask> configureScope)
+        public Task ConfigureScopeAsync(Func<Scope, Task> configureScope)
             => SentrySdk.ConfigureScopeAsync(configureScope);
 
         /// <summary>
@@ -137,7 +137,7 @@ public SentryId CaptureEvent(SentryEvent evt, Scope? scope)
         /// </summary>
         [DebuggerStepThrough]
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public ValueTask FlushAsync(TimeSpan timeout)
+        public Task FlushAsync(TimeSpan timeout)
             => SentrySdk.FlushAsync(timeout);
 
         /// <summary>

src/Sentry/Extensibility/IBackgroundWorker.cs

@@ -20,7 +20,7 @@ internal interface IBackgroundWorker
         /// </summary>
         /// <param name="timeout">How long to wait for flush to finish.</param>
         /// <returns>A task to await for the flush operation.</returns>
-        ValueTask FlushAsync(TimeSpan timeout);
+        Task FlushAsync(TimeSpan timeout);
 
         /// <summary>
         /// Current count of items queued up.

src/Sentry/Extensibility/ITransport.cs

@@ -14,6 +14,6 @@ internal interface ITransport
         /// </summary>
         /// <param name="envelope">The envelope to send to Sentry.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        ValueTask SendEnvelopeAsync(Envelope envelope, CancellationToken cancellationToken = default);
+        Task SendEnvelopeAsync(Envelope envelope, CancellationToken cancellationToken = default);
     }
 }

src/Sentry/ISentryClient.cs

@@ -33,6 +33,6 @@ public interface ISentryClient
         /// </summary>
         /// <param name="timeout">How long to wait for flush to finish.</param>
         /// <returns>A task to await for the flush operation.</returns>
-        ValueTask FlushAsync(TimeSpan timeout);
+        Task FlushAsync(TimeSpan timeout);
     }
 }

src/Sentry/ISentryScopeManager.cs

@@ -23,7 +23,7 @@ public interface ISentryScopeManager
         /// </summary>
         /// <param name="configureScope">The configure scope.</param>
         /// <returns>A task that completes when the callback is done or a completed task if the SDK is disabled.</returns>
-        ValueTask ConfigureScopeAsync(Func<Scope, ValueTask> configureScope);
+        Task ConfigureScopeAsync(Func<Scope, Task> configureScope);
 
         /// <summary>
         /// Binds the client to the current scope.

src/Sentry/Internal/BackgroundWorker.cs

@@ -68,7 +68,7 @@ public bool EnqueueEnvelope(Envelope envelope)
             return true;
         }
 
-        private async ValueTask WorkerAsync()
+        private async Task WorkerAsync()
         {
             var cancellation = _shutdownSource.Token;
 
@@ -179,7 +179,7 @@ private async ValueTask WorkerAsync()
             }
         }
 
-        public async ValueTask FlushAsync(TimeSpan timeout)
+        public async Task FlushAsync(TimeSpan timeout)
         {
             if (_disposed)
             {