made caller more accurate

Author: GreemDev

src/Server/Helpers/Http/Client/IHttpClientProxy.cs

@@ -5,7 +5,19 @@ namespace Ryujinx.Systems.Update.Server.Helpers.Http;
 
 public interface IHttpClientProxy
 {
-    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, HttpCompletionOption? option = null, CancellationToken? token = null);
+    /// <summary>
+    /// </summary>
+    /// <param name="actualCaller"></param>
+    /// <param name="request"></param>
+    /// <param name="option"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    /// <remarks>Do no call. Use an overload.</remarks>
+    protected Task<HttpResponseMessage> SendAsync(string actualCaller, HttpRequestMessage request, HttpCompletionOption? option = null, CancellationToken? token = null);
+
+    public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, HttpCompletionOption? option = null,
+        CancellationToken? token = null)
+        => SendAsync(nameof(SendAsync), request, option, token);
 
     #region Convenience overloads for SendAsync
 
@@ -48,31 +60,31 @@ public Task<HttpResponseMessage> DeleteAsync(
     public Task<HttpResponseMessage> GetAsync(
         Uri requestUri,
         HttpCompletionOption? option = null, CancellationToken? token = null
-    ) => SendAsync(CreateRequestMessage(HttpMethod.Get, requestUri), option, token);
+    ) => SendAsync(nameof(GetAsync), CreateRequestMessage(HttpMethod.Get, requestUri), option, token);
 
     public Task<HttpResponseMessage> PostAsync(
         Uri requestUri,
         HttpContent? content = null,
         HttpCompletionOption? option = null, CancellationToken? token = null
-    ) => SendAsync(CreateRequestMessageWithContent(HttpMethod.Post, requestUri, content), option, token);
+    ) => SendAsync(nameof(PostAsync), CreateRequestMessageWithContent(HttpMethod.Post, requestUri, content), option, token);
 
     public Task<HttpResponseMessage> PutAsync(
         Uri requestUri,
         HttpContent? content = null,
         HttpCompletionOption? option = null, CancellationToken? token = null
-    ) => SendAsync(CreateRequestMessageWithContent(HttpMethod.Put, requestUri, content), option, token);
+    ) => SendAsync(nameof(PutAsync), CreateRequestMessageWithContent(HttpMethod.Put, requestUri, content), option, token);
 
     public Task<HttpResponseMessage> PatchAsync(
         Uri requestUri,
         HttpContent? content = null,
         HttpCompletionOption? option = null, CancellationToken? token = null
-    ) => SendAsync(CreateRequestMessageWithContent(HttpMethod.Patch, requestUri, content), option, token);
+    ) => SendAsync(nameof(PatchAsync), CreateRequestMessageWithContent(HttpMethod.Patch, requestUri, content), option, token);
 
     public Task<HttpResponseMessage> DeleteAsync(
         Uri requestUri,
         HttpContent? content = null,
         HttpCompletionOption? option = null, CancellationToken? token = null
-    ) => SendAsync(CreateRequestMessageWithContent(HttpMethod.Delete, requestUri, content), option, token);
+    ) => SendAsync(nameof(DeleteAsync), CreateRequestMessageWithContent(HttpMethod.Delete, requestUri, content), option, token);
 
     #endregion
 

src/Server/Services/DefaultHttpClientProxy.cs

@@ -29,10 +29,10 @@ public DefaultHttpClientProxy(IConfiguration config, ILogger<IHttpClientProxy> l
             DefaultRequestHeaders = { Authorization = AuthenticationHeaderValue.Parse($"Bearer {accessToken}") }
         };
 
-        _callback = (format, formatArgs, _) =>
+        _callback = (format, formatArgs, caller) =>
         {
 #pragma warning disable CA2254
-            logger.LogInformation(format, formatArgs);
+            logger.LogInformation(new EventId(1, caller), format, formatArgs);
 #pragma warning restore CA2254
         };
     }
@@ -43,8 +43,9 @@ public DefaultHttpClientProxy(HttpClient httpClient, LogCallback? logCallback =
         _callback = logCallback;
     }
 
+    /// <inheritdoc />
     [SuppressMessage("ReSharper", "RedundantAssignment", Justification = "ReSharper cannot comprehend the idea of checking all combinations of 2 objects potentially being null.")]
-    public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, HttpCompletionOption? option = null, CancellationToken? token = null)
+    public async Task<HttpResponseMessage> SendAsync(string actualCaller, HttpRequestMessage request, HttpCompletionOption? option = null, CancellationToken? token = null)
     {
         HttpResponseMessage response;
 
@@ -61,7 +62,7 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, Htt
 
         sw.Stop();
 
-        Log("{method} {uri} -> {statusCode} in {elapsed}ms", GetLogArgs(request, response, sw));
+        Log("{method} {uri} -> {statusCode} in {elapsed}ms", GetLogArgs(request, response, sw), actualCaller);
 
         return response;
     }