Expose request, response and ElapsedTime in exceptions

matteocontrini · Oct 29, 2023 · c4023db · c4023db
1 parent 14e342e
commit c4023db
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/PlainHttp/HttpRequest.cs b/PlainHttp/HttpRequest.cs
@@ -103,10 +103,10 @@ public async Task<IHttpResponse> SendAsync(CancellationToken cancellationToken =
             // Covers both TaskCanceledException and OperationCanceledException
             if (ex is OperationCanceledException && !cancellationToken.IsCancellationRequested)
             {
-                throw new HttpRequestTimeoutException(this, ex);
+                throw new HttpRequestTimeoutException(this, stopwatch.Elapsed, ex);
             }
 
-            throw new HttpRequestException(this, ex);
+            throw new HttpRequestException(this, stopwatch.Elapsed, ex);
         }
     }
 

diff --git a/PlainHttp/HttpRequestException.cs b/PlainHttp/HttpRequestException.cs
@@ -2,17 +2,27 @@
 
 public class HttpRequestException : Exception
 {
-    public HttpRequestException(HttpRequest request, Exception innerException)
+    public IHttpRequest Request { get; }
+    public IHttpResponse? Response { get; }
+
+    private readonly TimeSpan elapsedTime;
+    public TimeSpan ElapsedTime => Response?.ElapsedTime ?? elapsedTime;
+
+    public HttpRequestException(IHttpRequest request, TimeSpan elapsedTime, Exception innerException)
         : base(CreateMessage(request, innerException), innerException)
     {
+        this.Request = request;
+        this.elapsedTime = elapsedTime;
     }
 
-    public HttpRequestException(string message, Exception innerException)
-        : base(message, innerException)
+    public HttpRequestException(IHttpRequest request, IHttpResponse response, Exception innerException)
+        : base(CreateMessage(request, innerException), innerException)
     {
+        this.Request = request;
+        this.Response = response;
     }
 
-    private static string CreateMessage(HttpRequest request, Exception innerException)
+    private static string CreateMessage(IHttpRequest request, Exception innerException)
     {
         return $"Failed request: [{request.ToString()}] [{innerException.Message}]";
     }

diff --git a/PlainHttp/HttpRequestTimeoutException.cs b/PlainHttp/HttpRequestTimeoutException.cs
@@ -2,13 +2,13 @@
 
 public class HttpRequestTimeoutException : HttpRequestException
 {
-    public HttpRequestTimeoutException(HttpRequest request, Exception innerException)
-        : base(CreateMessage(request, innerException), innerException)
+    public HttpRequestTimeoutException(IHttpRequest request, TimeSpan elapsedTime, Exception innerException)
+        : base(request, elapsedTime, innerException)
     {
     }
 
-    private static string CreateMessage(HttpRequest request, Exception innerException)
+    public HttpRequestTimeoutException(IHttpRequest request, IHttpResponse response, Exception innerException)
+        : base(request, response, innerException)
     {
-        return $"Failed request: [{request.ToString()}] [{innerException.Message}]";
     }
 }
diff --git a/PlainHttp/HttpResponse.cs b/PlainHttp/HttpResponse.cs
@@ -58,10 +58,10 @@ private async Task<T> ReadWrapper<T>(Func<TimeSpan, Task<T>> readFunc)
         {
             if (ex is TimeoutException)
             {
-                throw new HttpRequestTimeoutException(this.Request, ex);
+                throw new HttpRequestTimeoutException(this.Request, this, ex);
             }
 
-            throw new HttpRequestException(this.Request, ex);
+            throw new HttpRequestException(this.Request, this, ex);
         }
         finally
         {
@@ -196,7 +196,7 @@ public void EnsureSuccessStatusCode()
         }
         catch (System.Net.Http.HttpRequestException ex)
         {
-            throw new HttpRequestException(this.Request, ex);
+            throw new HttpRequestException(this.Request, this, ex);
         }
     }