Skip to content

Publish failure metrics for SQL analytics engine execution path #5487

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

Merged
dai-chen merged 1 commit into from
May 29, 2026
Merged

Publish failure metrics for SQL analytics engine execution path #5487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,14 @@ private void delegateToV2Engine(
handleException(restChannel, e);
}
},
this::handleException)
RestSqlAction::handleException)
.accept(channel);
} catch (Exception e) {
handleException(channel, e);
}
}

private void handleException(RestChannel restChannel, Exception exception) {
public static void handleException(RestChannel restChannel, Exception exception) {
RestStatus status = getRestStatus(exception);
logAndPublishMetrics(status, exception);
reportError(restChannel, exception, status);
Expand Down Expand Up @@ -337,12 +337,13 @@ private static boolean isClientError(Exception e) {
|| e instanceof ExpressionEvaluationException;
}

private void sendResponse(
private static void sendResponse(
final RestChannel channel, final String message, final RestStatus status) {
channel.sendResponse(new BytesRestResponse(status, message));
}

private void reportError(final RestChannel channel, final Exception e, final RestStatus status) {
private static void reportError(
final RestChannel channel, final Exception e, final RestStatus status) {
sendResponse(
channel, ErrorMessageFactory.createErrorMessage(e, status.getStatus()).toString(), status);
}
Expand Down
6 changes: 2 additions & 4 deletions plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ protected Object buildJsonObject(ExplainResponse resp) {

@Override
public void onFailure(Exception e) {
channel.sendResponse(
new BytesRestResponse(RestSqlAction.getRestStatus(e), e.getMessage()));
RestSqlAction.handleException(channel, e);
}
});
} else {
Expand All @@ -282,8 +281,7 @@ public void onResponse(TransportPPLQueryResponse response) {

@Override
public void onFailure(Exception e) {
channel.sendResponse(
new BytesRestResponse(RestSqlAction.getRestStatus(e), e.getMessage()));
RestSqlAction.handleException(channel, e);
}
});
}
Expand Down
Loading