Convert byte array to string for logging in ProxyResponse

Author: andythsu

docs/installation.md

@@ -212,6 +212,15 @@ serverConfig:
   http-server.process-forwarded: true
 ```
 
+## Configure larger proxy response size
+
+Trino Gateway reads the response from Trino in bytes (up to 32MB by default).
+It can be configured by setting:
+
+```yaml
+maxProxyResponseSize: 50MB
+```
+
 ## Running Trino Gateway
 
 Start Trino Gateway with the following java command in the directory of the

gateway-ha/src/main/java/io/trino/gateway/ha/config/HaGatewayConfiguration.java

@@ -15,12 +15,14 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Streams;
+import io.airlift.units.DataSize;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static io.airlift.units.DataSize.Unit.MEGABYTE;
 import static io.trino.gateway.ha.handler.HttpUtils.V1_STATEMENT_PATH;
 
 public class HaGatewayConfiguration
@@ -42,6 +44,7 @@ public class HaGatewayConfiguration
     private GatewayCookieConfiguration gatewayCookieConfiguration = new GatewayCookieConfiguration();
     private List<String> statementPaths = ImmutableList.of(V1_STATEMENT_PATH);
     private boolean includeClusterHostInResponse;
+    private DataSize maxProxyResponseSize = DataSize.of(32, MEGABYTE);
 
     private RequestAnalyzerConfig requestAnalyzerConfig = new RequestAnalyzerConfig();
 
@@ -255,6 +258,16 @@ public void setIncludeClusterHostInResponse(boolean includeClusterHostInResponse
         this.includeClusterHostInResponse = includeClusterHostInResponse;
     }
 
+    public DataSize getMaxProxyResponseSize()
+    {
+        return this.maxProxyResponseSize;
+    }
+
+    public void setProxyResponseConfiguration(DataSize maxProxyResponseSize)
+    {
+        this.maxProxyResponseSize = maxProxyResponseSize;
+    }
+
     private void validateStatementPath(String statementPath, List<String> statementPaths)
     {
         if (statementPath.startsWith(V1_STATEMENT_PATH) ||

gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyRequestHandler.java

@@ -22,9 +22,11 @@
 import io.airlift.http.client.Request;
 import io.airlift.http.client.StaticBodyGenerator;
 import io.airlift.log.Logger;
+import io.airlift.units.DataSize;
 import io.airlift.units.Duration;
 import io.trino.gateway.ha.config.GatewayCookieConfigurationPropertiesProvider;
 import io.trino.gateway.ha.config.HaGatewayConfiguration;
+import io.trino.gateway.ha.config.ProxyResponseConfiguration;
 import io.trino.gateway.ha.router.GatewayCookie;
 import io.trino.gateway.ha.router.OAuth2GatewayCookie;
 import io.trino.gateway.ha.router.QueryHistoryManager;
@@ -87,6 +89,7 @@ public class ProxyRequestHandler
     private final List<String> statementPaths;
     private final boolean includeClusterInfoInResponse;
     private final TrinoRequestUser.TrinoRequestUserProvider trinoRequestUserProvider;
+    private final DataSize maxProxyResponseSize;
 
     @Inject
     public ProxyRequestHandler(
@@ -104,6 +107,7 @@ public ProxyRequestHandler(
         addXForwardedHeaders = haGatewayConfiguration.getRouting().isAddXForwardedHeaders();
         statementPaths = haGatewayConfiguration.getStatementPaths();
         this.includeClusterInfoInResponse = haGatewayConfiguration.isIncludeClusterHostInResponse();
+        this.maxProxyResponseSize = requireNonNull(haGatewayConfiguration.getMaxProxyResponseSize(), "maxProxyResponseSize is null");
     }
 
     @PreDestroy
@@ -246,7 +250,7 @@ private void setupAsyncResponse(AsyncResponse asyncResponse, ListenableFuture<Re
 
     private FluentFuture<ProxyResponse> executeHttp(Request request)
     {
-        return FluentFuture.from(httpClient.executeAsync(request, new ProxyResponseHandler()));
+        return FluentFuture.from(httpClient.executeAsync(request, new ProxyResponseHandler(maxProxyResponseSize)));
     }
 
     private static Response handleProxyException(Request request, ProxyException e)

gateway-ha/src/main/java/io/trino/gateway/proxyserver/ProxyResponseHandler.java

@@ -18,16 +18,24 @@
 import io.airlift.http.client.Request;
 import io.airlift.http.client.Response;
 import io.airlift.http.client.ResponseHandler;
+import io.airlift.units.DataSize;
 import io.trino.gateway.proxyserver.ProxyResponseHandler.ProxyResponse;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
-import static com.google.common.io.ByteStreams.toByteArray;
 import static java.util.Objects.requireNonNull;
 
 public class ProxyResponseHandler
         implements ResponseHandler<ProxyResponse, RuntimeException>
 {
+    private final DataSize maxProxyResponseSize;
+
+    public ProxyResponseHandler(DataSize maxProxyResponseSize)
+    {
+        this.maxProxyResponseSize = requireNonNull(maxProxyResponseSize, "maxProxyResponseSize is null");
+    }
+
     @Override
     public ProxyResponse handleException(Request request, Exception exception)
     {
@@ -38,7 +46,7 @@ public ProxyResponse handleException(Request request, Exception exception)
     public ProxyResponse handle(Request request, Response response)
     {
         try {
-            return new ProxyResponse(response.getStatusCode(), response.getHeaders(), toByteArray(response.getInputStream()));
+            return new ProxyResponse(response.getStatusCode(), response.getHeaders(), new String(response.getInputStream().readNBytes((int) maxProxyResponseSize.toBytes()), StandardCharsets.UTF_8));
         }
         catch (IOException e) {
             throw new ProxyException("Failed reading response from remote Trino server", e);
@@ -48,7 +56,7 @@ public ProxyResponse handle(Request request, Response response)
     public record ProxyResponse(
             int statusCode,
             ListMultimap<HeaderName, String> headers,
-            byte[] body)
+            String body)
     {
         public ProxyResponse
         {