-
Notifications
You must be signed in to change notification settings - Fork 129
Convert byte array to string for logging in ProxyResponse #578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+72
−3
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
gateway-ha/src/main/java/io/trino/gateway/ha/config/ProxyResponseConfiguration.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.gateway.ha.config; | ||
|
|
||
| import io.airlift.units.DataSize; | ||
|
|
||
| import static io.airlift.units.DataSize.Unit.MEGABYTE; | ||
|
|
||
| public class ProxyResponseConfiguration | ||
| { | ||
| private DataSize responseSize = DataSize.of(32, MEGABYTE); | ||
|
|
||
| public ProxyResponseConfiguration() {} | ||
|
|
||
| public DataSize getResponseSize() | ||
| { | ||
| return responseSize; | ||
| } | ||
|
|
||
| public void setResponseSize(DataSize responseSize) | ||
| { | ||
| this.responseSize = responseSize; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ | |
| 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 +88,7 @@ public class ProxyRequestHandler | |
| private final List<String> statementPaths; | ||
| private final boolean includeClusterInfoInResponse; | ||
| private final TrinoRequestUser.TrinoRequestUserProvider trinoRequestUserProvider; | ||
| private final ProxyResponseConfiguration proxyResponseConfiguration; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please avoid putting mutable objects in fields. |
||
|
|
||
| @Inject | ||
| public ProxyRequestHandler( | ||
|
|
@@ -104,6 +106,7 @@ public ProxyRequestHandler( | |
| addXForwardedHeaders = haGatewayConfiguration.getRouting().isAddXForwardedHeaders(); | ||
| statementPaths = haGatewayConfiguration.getStatementPaths(); | ||
| this.includeClusterInfoInResponse = haGatewayConfiguration.isIncludeClusterHostInResponse(); | ||
| proxyResponseConfiguration = haGatewayConfiguration.getProxyResponseConfiguration(); | ||
| } | ||
|
|
||
| @PreDestroy | ||
|
|
@@ -245,7 +248,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(proxyResponseConfiguration))); | ||
| } | ||
|
|
||
| private static Response handleProxyException(Request request, ProxyException e) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,15 +18,25 @@ | |
| 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.ha.config.ProxyResponseConfiguration; | ||
| import io.trino.gateway.proxyserver.ProxyResponseHandler.ProxyResponse; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public class ProxyResponseHandler | ||
| implements ResponseHandler<ProxyResponse, RuntimeException> | ||
| { | ||
| private final DataSize responseSize; | ||
|
|
||
| public ProxyResponseHandler(ProxyResponseConfiguration proxyResponseConfiguration) | ||
| { | ||
| this.responseSize = requireNonNull(proxyResponseConfiguration.getResponseSize(), "responseSize is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public ProxyResponse handleException(Request request, Exception exception) | ||
| { | ||
|
|
@@ -37,7 +47,7 @@ public ProxyResponse handleException(Request request, Exception exception) | |
| public ProxyResponse handle(Request request, Response response) | ||
| { | ||
| try { | ||
| return new ProxyResponse(response.getStatusCode(), response.getHeaders(), response.getInputStream().readAllBytes()); | ||
| return new ProxyResponse(response.getStatusCode(), response.getHeaders(), new String(response.getInputStream().readNBytes((int) responseSize.toBytes()), StandardCharsets.UTF_8)); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Static import |
||
| } | ||
| catch (IOException e) { | ||
| throw new ProxyException("Failed reading response from remote Trino server", e); | ||
|
|
@@ -47,7 +57,7 @@ public ProxyResponse handle(Request request, Response response) | |
| public record ProxyResponse( | ||
| int statusCode, | ||
| ListMultimap<HeaderName, String> headers, | ||
| byte[] body) | ||
| String body) | ||
| { | ||
| public ProxyResponse | ||
| { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.