Better exception message when a continuation times out

rabbitmq · May 1, 2024 · ced76d1 · ced76d1
1 parent 5325127
commit ced76d1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/projects/RabbitMQ.Client/client/impl/AsyncRpcContinuations.cs b/projects/RabbitMQ.Client/client/impl/AsyncRpcContinuations.cs
@@ -68,7 +68,8 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc
                 {
                     // Cancellation was successful, does this mean we set a TimeoutException
                     // in the same manner as BlockingCell used to
-                    tcs.SetException(new TimeoutException("TODO LRB rabbitmq/rabbitmq-dotnet-client#1347"));
+                    string msg = $"operation '{GetType().FullName}' timed out after {continuationTimeout}";
+                    tcs.TrySetException(new TimeoutException(msg));
                 }
             }, _tcs);
 #else
@@ -79,7 +80,8 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc
                 {
                     // Cancellation was successful, does this mean we set a TimeoutException
                     // in the same manner as BlockingCell used to
-                    tcs.SetException(new TimeoutException("TODO LRB rabbitmq/rabbitmq-dotnet-client#1347"));
+                    string msg = $"operation '{GetType().FullName}' timed out after {continuationTimeout}";
+                    tcs.TrySetException(new TimeoutException(msg));
                 }
             }, state: _tcs, useSynchronizationContext: false);
 #endif
@@ -109,7 +111,7 @@ public ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter GetAwaiter()
 
         public virtual void HandleChannelShutdown(ShutdownEventArgs reason)
         {
-            _tcs.SetException(new OperationInterruptedException(reason));
+            _tcs.TrySetException(new OperationInterruptedException(reason));
         }
 
         protected virtual void Dispose(bool disposing)