Skip to content

[ISSUE #3009] Method manually handles closing an auto-closeable resource [MetricsHandler] #3547

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.

Sign up for GitHub

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

Closed
wants to merge 5 commits into from
Closed

[ISSUE #3009] Method manually handles closing an auto-closeable resource [MetricsHandler] #3547

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b8dd05
Added fix for issue apache#3009.
Mar 28, 2023
29b4f37
Added changes for issue#3009.
Mar 29, 2023
1113e77
Added changes for issue#3009.
Apr 1, 2023
f3f1221
Merge branch 'master' into fix-3009
Apr 7, 2023
8035fa4
Added fix for issue #3009
Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions ...mesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ void preflight(HttpExchange httpExchange) throws IOException {
* GET /metrics Return a response that contains a summary of metrics
*/
void get(HttpExchange httpExchange) throws IOException {
OutputStream out = httpExchange.getResponseBody();
httpExchange.getResponseHeaders().add("Content-Type", "application/json");
httpExchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");

try {
try (OutputStream out = httpExchange.getResponseBody()) {
httpExchange.getResponseHeaders().add("Content-Type", "application/json");
httpExchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");
GetMetricsResponse getMetricsResponse = new GetMetricsResponse(
httpSummaryMetrics.maxHTTPTPS(),
httpSummaryMetrics.avgHTTPTPS(),
Expand Down Expand Up @@ -133,16 +131,8 @@ void get(HttpExchange httpExchange) throws IOException {
Error error = new Error(e.toString(), stackTrace);
String result = JsonUtils.toJSONString(error);
byte[] bytes = result.getBytes(Constants.DEFAULT_CHARSET);
httpExchange.sendResponseHeaders(500, bytes.length);
out.write(bytes);
} finally {
if (out != null) {
try {
out.close();
} catch (IOException e) {
log.warn("out close failed...", e);
}
}
httpExchange.sendResponseHeaders(500, 0);
log.error(result, e);
}
}

Expand Down