Refactor client error handling (#479)

Author: JamesNK

src/Grpc.Net.Client/GrpcChannel.cs

@@ -45,6 +45,7 @@ public sealed class GrpcChannel : ChannelBase, IDisposable
         internal int? SendMaxMessageSize { get; }
         internal int? ReceiveMaxMessageSize { get; }
         internal ILoggerFactory LoggerFactory { get; }
+        internal bool ThrowOperationCanceledExceptionOnCancellation { get; }
         internal bool? IsSecure { get; }
         internal List<CallCredentials>? CallCredentials { get; }
         internal Dictionary<string, ICompressionProvider> CompressionProviders { get; }
@@ -71,6 +72,7 @@ internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(addr
             CompressionProviders = ResolveCompressionProviders(channelOptions.CompressionProviders);
             MessageAcceptEncoding = GrpcProtocolHelpers.GetMessageAcceptEncoding(CompressionProviders);
             LoggerFactory = channelOptions.LoggerFactory ?? NullLoggerFactory.Instance;
+            ThrowOperationCanceledExceptionOnCancellation = channelOptions.ThrowOperationCanceledExceptionOnCancellation;
 
             if (channelOptions.Credentials != null)
             {

src/Grpc.Net.Client/GrpcChannelOptions.cs

@@ -16,6 +16,7 @@
 
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using Grpc.Core;
@@ -75,6 +76,14 @@ public sealed class GrpcChannelOptions
         /// </remarks>
         public bool DisposeHttpClient { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether clients will throw <see cref="OperationCanceledException"/> for a call when its
+        /// <see cref="CallOptions.CancellationToken"/> is triggered or its <see cref="CallOptions.Deadline"/> is exceeded.
+        /// The default value is <c>false</c>.
+        /// Note: experimental API that can change or be removed without any prior notice.
+        /// </summary>
+        public bool ThrowOperationCanceledExceptionOnCancellation { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GrpcChannelOptions"/> class.
         /// </summary>

src/Grpc.Net.Client/Internal/GrpcCall.Log.cs

@@ -33,7 +33,7 @@ private static class Log
                 LoggerMessage.Define(LogLevel.Trace, new EventId(2, "ResponseHeadersReceived"), "Response headers received.");
 
             private static readonly Action<ILogger, StatusCode, string, Exception?> _grpcStatusError =
-                LoggerMessage.Define<StatusCode, string>(LogLevel.Error, new EventId(3, "GrpcStatusError"), "Server returned gRPC error status. Status code: '{StatusCode}', Message: '{StatusMessage}'.");
+                LoggerMessage.Define<StatusCode, string>(LogLevel.Error, new EventId(3, "GrpcStatusError"), "Call failed with gRPC error status. Status code: '{StatusCode}', Message: '{StatusMessage}'.");
 
             private static readonly Action<ILogger, Exception?> _finishedCall =
                 LoggerMessage.Define(LogLevel.Debug, new EventId(4, "FinishedCall"), "Finished gRPC call.");