Add StatusCode and Uri to HttpClientException for ease of use

Author: NickCraver

src/StackExchange.Utils.Http/Extensions.Modifier.cs

@@ -90,7 +90,7 @@ public static IRequestBuilder AddHeader(this IRequestBuilder builder, string nam
                 }
                 catch (Exception e)
                 {
-                    var wrapper = new HttpClientException("Unable to set header: " + name + " to '" + value + "'", e);
+                    var wrapper = new HttpClientException("Unable to set header: " + name + " to '" + value + "'", builder.Message.RequestUri, e);
                     builder.GetSettings().OnException(builder, new HttpExceptionArgs(builder, wrapper));
                 }
             }
@@ -131,7 +131,7 @@ public static IRequestBuilder AddHeaders(this IRequestBuilder builder, IDictiona
                 }
                 catch (Exception e)
                 {
-                    var wrapper = new HttpClientException("Unable to set header: " + kv.Key + " to '" + kv.Value + "'", e);
+                    var wrapper = new HttpClientException("Unable to set header: " + kv.Key + " to '" + kv.Value + "'", builder.Message.RequestUri, e);
                     builder.GetSettings().OnException(builder, new HttpExceptionArgs(builder, wrapper));
                 }
             }

src/StackExchange.Utils.Http/Http.cs

@@ -62,7 +62,7 @@ internal static async Task<HttpCallResponse<T>> SendAsync<T>(IRequestBuilder<T>
                         // This isn't ideal cntrol flow behavior, but it's the only way to get proper stacks
                         if (!response.IsSuccessStatusCode && !builder.Inner.IgnoredResponseStatuses.Contains(response.StatusCode))
                         {
-                            exception = new HttpClientException($"Response code was {(int)response.StatusCode} ({response.StatusCode}) from {response.RequestMessage.RequestUri}: {response.ReasonPhrase}");
+                            exception = new HttpClientException($"Response code was {(int)response.StatusCode} ({response.StatusCode}) from {response.RequestMessage.RequestUri}: {response.ReasonPhrase}", response.StatusCode, response.RequestMessage.RequestUri);
                             stackTraceString.SetValue(exception, new StackTrace(true).ToString());
                         }
                         else
@@ -76,8 +76,8 @@ internal static async Task<HttpCallResponse<T>> SendAsync<T>(IRequestBuilder<T>
             catch (TaskCanceledException ex)
             {
                 exception = cancellationToken.IsCancellationRequested
-                    ? new HttpClientException("HttpClient request cancelled by token request.", ex)
-                    : new HttpClientException("HttpClient request timed out. Timeout: " + builder.Inner.Timeout.TotalMilliseconds.ToString("N0") + "ms", ex);
+                    ? new HttpClientException("HttpClient request cancelled by token request.", builder.Inner.Message.RequestUri, ex)
+                    : new HttpClientException("HttpClient request timed out. Timeout: " + builder.Inner.Timeout.TotalMilliseconds.ToString("N0") + "ms", builder.Inner.Message.RequestUri, ex);
             }
             catch (Exception ex)
             {

src/StackExchange.Utils.Http/HttpCallResponse.cs

@@ -82,7 +82,7 @@ protected HttpCallResponse(HttpResponseMessage response, Exception error) : this
         /// <returns>The created <see cref="HttpCallResponse{T}"/>.</returns>
         public static HttpCallResponse<T> Create<T>(HttpRequestMessage request, Exception error = null)
         {
-            error = (error ?? new HttpClientException("Failed to send request for " + request.RequestUri))
+            error = (error ?? new HttpClientException("Failed to send request for " + request.RequestUri, request.RequestUri))
                 // Add these regardless of source
                 .AddLoggedData("Request URI", request.RequestUri);
 

src/StackExchange.Utils.Http/HttpClientException.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Runtime.Serialization;
 
 namespace StackExchange.Utils
@@ -8,9 +9,35 @@ namespace StackExchange.Utils
     /// </summary>
     public class HttpClientException : Exception
     {
+        /// <summary>
+        /// The status code, if known, for this exception.
+        /// </summary>
+        public HttpStatusCode? StatusCode { get; }
+
+        /// <summary>
+        /// The requested URI, if known, for this exception.
+        /// </summary>
+        public Uri Uri { get; }
+
         internal HttpClientException() { }
         internal HttpClientException(string message) : base(message) { }
         internal HttpClientException(string message, Exception innerException) : base(message, innerException) { }
         internal HttpClientException(SerializationInfo info, StreamingContext context) : base(info, context) { }
+
+        internal HttpClientException(string message, HttpStatusCode statusCode, Uri uri) : base(message)
+        {
+            StatusCode = statusCode;
+            Uri = uri;
+        }
+
+        internal HttpClientException(string message, Uri uri) : base(message)
+        {
+            Uri = uri;
+        }
+
+        internal HttpClientException(string message, Uri uri, Exception innerException) : base(message, innerException)
+        {
+            Uri = uri;
+        }
     }
 }