From 8a360d56477635edc4fe47c21ee0cc4d59ccd29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Spie=C3=9F?= <business@minn.dev>
Date: Sat, 2 Dec 2023 11:35:58 +0100
Subject: [PATCH] Add more logging to request handling (#2589)

---
 src/main/java/net/dv8tion/jda/api/requests/Request.java  | 5 +++++
 src/main/java/net/dv8tion/jda/api/requests/Response.java | 2 ++
 .../net/dv8tion/jda/internal/requests/Requester.java     | 9 +++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/net/dv8tion/jda/api/requests/Request.java b/src/main/java/net/dv8tion/jda/api/requests/Request.java
index 434c608497..468a2df017 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/Request.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/Request.java
@@ -113,11 +113,13 @@ public void onSuccess(T successObj)
             return;
         done = true;
         cleanup();
+        RestActionImpl.LOG.trace("Scheduling success callback for request with route {}/{}", route.getMethod(), route.getCompiledRoute());
         api.getCallbackPool().execute(() ->
         {
             try (ThreadLocalReason.Closable __ = ThreadLocalReason.closable(localReason);
                  CallbackContext ___ = CallbackContext.getInstance())
             {
+                RestActionImpl.LOG.trace("Running success callback for request with route {}/{}", route.getMethod(), route.getCompiledRoute());
                 onSuccess.accept(successObj);
             }
             catch (Throwable t)
@@ -151,11 +153,13 @@ public void onFailure(Throwable failException)
             return;
         done = true;
         cleanup();
+        RestActionImpl.LOG.trace("Scheduling failure callback for request with route {}/{}", route.getMethod(), route.getCompiledRoute());
         api.getCallbackPool().execute(() ->
         {
             try (ThreadLocalReason.Closable __ = ThreadLocalReason.closable(localReason);
                  CallbackContext ___ = CallbackContext.getInstance())
             {
+                RestActionImpl.LOG.trace("Running failure callback for request with route {}/{}", route.getMethod(), route.getCompiledRoute());
                 onFailure.accept(failException);
                 if (failException instanceof Error)
                     api.handleEvent(new ExceptionEvent(api, failException, false));
@@ -285,6 +289,7 @@ public boolean isCancelled()
 
     public void handleResponse(@Nonnull Response response)
     {
+        RestActionImpl.LOG.trace("Handling response for request with route {}/{} and code {}", route.getMethod(), route.getCompiledRoute(), response.code);
         restAction.handleResponse(response, this);
         api.handleEvent(new HttpRequestEvent(this, response));
     }
diff --git a/src/main/java/net/dv8tion/jda/api/requests/Response.java b/src/main/java/net/dv8tion/jda/api/requests/Response.java
index c09486c983..cd3ccfa4fc 100644
--- a/src/main/java/net/dv8tion/jda/api/requests/Response.java
+++ b/src/main/java/net/dv8tion/jda/api/requests/Response.java
@@ -20,6 +20,7 @@
 import net.dv8tion.jda.api.utils.IOFunction;
 import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
+import net.dv8tion.jda.internal.requests.RestActionImpl;
 import net.dv8tion.jda.internal.utils.EntityString;
 import net.dv8tion.jda.internal.utils.IOUtil;
 
@@ -214,6 +215,7 @@ private <T> Optional<T> parseBody(boolean opt, Class<T> clazz, IOFunction<Buffer
             reader.mark(1024);
             T t = parser.apply(reader);
             this.object = t;
+            RestActionImpl.LOG.trace("Parsed response body for response on url {}\n{}", rawResponse.request().url(), this.object);
             return Optional.ofNullable(t);
         }
         catch (final Exception e)
diff --git a/src/main/java/net/dv8tion/jda/internal/requests/Requester.java b/src/main/java/net/dv8tion/jda/internal/requests/Requester.java
index 4e687283b4..ef534fb634 100644
--- a/src/main/java/net/dv8tion/jda/internal/requests/Requester.java
+++ b/src/main/java/net/dv8tion/jda/internal/requests/Requester.java
@@ -292,6 +292,15 @@ private void applyBody(Request<?> apiRequest, okhttp3.Request.Builder builder)
             body = EMPTY_BODY;
 
         builder.method(method, body);
+
+        if (apiRequest.getRawBody() != null)
+        {
+            LOG.trace("Sending request on route {}/{} with body\n{}",
+                method,
+                apiRequest.getRoute().getCompiledRoute(),
+                apiRequest.getRawBody()
+            );
+        }
     }
 
     private void applyHeaders(Request<?> apiRequest, okhttp3.Request.Builder builder)