commit 5fb5dcf2f8163eaeafe1444ba4839d8539b2beb2
author Edwin Kempin <ekempin@google.com> Thu Jul 25 09:14:39 2024 +0000
committer Edwin Kempin <ekempin@google.com> Fri Jul 26 10:45:19 2024 +0000
tree cba2cbfff9b7e01caee8cedc9171e0326f08c77e
parent 6b086d1885bd127015d25712da4c079c8cc6e525

RestApiServlet: Remove usage of LazyArgs to log response JSON

Instead check the content length and log the JSON only if it's less than
1 KB.

Release-Notes: skip
Bug: Google b/354875955
Bug: Google b/355393768
Change-Id: I0be4856f4d09696101d80e1471147051baf8151e
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/httpd/restapi/RestApiServlet.java

diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index daa1e9f..41c158f 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -18,7 +18,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.flogger.LazyArgs.lazy;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static java.math.RoundingMode.CEILING;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
@@ -145,7 +144,6 @@
 import com.google.inject.util.Providers;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
 import java.io.FilterOutputStream;
 import java.io.IOException;
@@ -210,6 +208,7 @@
   private static final int HEAP_EST_SIZE = 10 * 8 * 1024; // Presize 10 blocks.
   private static final String PLAIN_TEXT = "text/plain";
   private static final Pattern TYPE_SPLIT_PATTERN = Pattern.compile("[ ,;][ ,;]*");
+  private static final long ONE_KB = 1024;
 
   /**
    * Garbage prefix inserted before JSON output to prevent XSSI.
@@ -1246,22 +1245,12 @@
     w.write('\n');
     w.flush();
 
-    if (allowTracing) {
-      logger.atFinest().log(
-          "JSON response body:\n%s",
-          lazy(
-              () -> {
-                try {
-                  ByteArrayOutputStream debugOut = new ByteArrayOutputStream();
-                  buf.writeTo(debugOut, null);
-                  return debugOut.toString(UTF_8.name());
-                } catch (IOException e) {
-                  return "<JSON formatting failed>";
-                }
-              }));
+    BinaryResult binaryResult = asBinaryResult(buf);
+    if (allowTracing && binaryResult.getContentLength() <= ONE_KB) {
+      logger.atFinest().log("JSON response body:\n%s", binaryResult.asString());
     }
     return replyBinaryResult(
-        req, res, asBinaryResult(buf).setContentType(JSON_TYPE).setCharacterEncoding(UTF_8));
+        req, res, binaryResult.setContentType(JSON_TYPE).setCharacterEncoding(UTF_8));
   }
 
   private static Gson newGson(ListMultimap<String, String> config) {