Better exception message when a continuation times out

lukebakken · lukebakken · commit 5070a0fcbde2 · 2024-05-01T08:52:52.000-07:00
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)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc`
`68`	`68`	`{`
`69`	`69`	`// Cancellation was successful, does this mean we set a TimeoutException`
`70`	`70`	`// in the same manner as BlockingCell used to`
`71`		`- tcs.SetException(new TimeoutException("TODO LRB rabbitmq/rabbitmq-dotnet-client#1347"));`
	`71`	`+ string msg = $"operation '{GetType().FullName}' timed out after {continuationTimeout}";`
	`72`	`+ tcs.TrySetException(new TimeoutException(msg));`
`72`	`73`	`}`
`73`	`74`	`}, _tcs);`
`74`	`75`	`#else`
`@@ -79,7 +80,8 @@ public AsyncRpcContinuation(TimeSpan continuationTimeout, CancellationToken canc`
`79`	`80`	`{`
`80`	`81`	`// Cancellation was successful, does this mean we set a TimeoutException`
`81`	`82`	`// in the same manner as BlockingCell used to`
`82`		`- tcs.SetException(new TimeoutException("TODO LRB rabbitmq/rabbitmq-dotnet-client#1347"));`
	`83`	`+ string msg = $"operation '{GetType().FullName}' timed out after {continuationTimeout}";`
	`84`	`+ tcs.TrySetException(new TimeoutException(msg));`
`83`	`85`	`}`
`84`	`86`	`}, state: _tcs, useSynchronizationContext: false);`
`85`	`87`	`#endif`
`@@ -109,7 +111,7 @@ public ConfiguredTaskAwaitable<T>.ConfiguredTaskAwaiter GetAwaiter()`
`109`	`111`
`110`	`112`	`public virtual void HandleChannelShutdown(ShutdownEventArgs reason)`
`111`	`113`	`{`
`112`		`- _tcs.SetException(new OperationInterruptedException(reason));`
	`114`	`+ _tcs.TrySetException(new OperationInterruptedException(reason));`
`113`	`115`	`}`
`114`	`116`
`115`	`117`	`protected virtual void Dispose(bool disposing)`