Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit 316726c

Browse files
authored
Remove request id in logging (#1027)
1 parent 2347a2a commit 316726c

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

legacy/src/main/java/com/amazon/opendistroforelasticsearch/sql/legacy/plugin/RestSQLQueryAction.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,33 @@
1818

1919
import static com.amazon.opendistroforelasticsearch.sql.executor.ExecutionEngine.QueryResponse;
2020
import static com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
21-
import static org.elasticsearch.rest.RestStatus.BAD_REQUEST;
2221
import static org.elasticsearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
2322
import static org.elasticsearch.rest.RestStatus.OK;
24-
import static org.elasticsearch.rest.RestStatus.SERVICE_UNAVAILABLE;
2523

26-
27-
import com.alibaba.druid.sql.parser.ParserException;
2824
import com.amazon.opendistroforelasticsearch.sql.common.antlr.SyntaxCheckException;
2925
import com.amazon.opendistroforelasticsearch.sql.common.response.ResponseListener;
3026
import com.amazon.opendistroforelasticsearch.sql.common.setting.Settings;
3127
import com.amazon.opendistroforelasticsearch.sql.elasticsearch.security.SecurityAccess;
32-
import com.amazon.opendistroforelasticsearch.sql.exception.QueryEngineException;
33-
import com.amazon.opendistroforelasticsearch.sql.exception.SemanticCheckException;
3428
import com.amazon.opendistroforelasticsearch.sql.executor.ExecutionEngine.ExplainResponse;
35-
import com.amazon.opendistroforelasticsearch.sql.legacy.antlr.SqlAnalysisException;
36-
import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SQLFeatureDisabledException;
37-
import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SqlParseException;
38-
import com.amazon.opendistroforelasticsearch.sql.legacy.executor.format.ErrorMessageFactory;
3929
import com.amazon.opendistroforelasticsearch.sql.legacy.metrics.MetricName;
4030
import com.amazon.opendistroforelasticsearch.sql.legacy.metrics.Metrics;
41-
import com.amazon.opendistroforelasticsearch.sql.legacy.rewriter.matchtoterm.VerificationException;
42-
import com.amazon.opendistroforelasticsearch.sql.legacy.utils.LogUtils;
4331
import com.amazon.opendistroforelasticsearch.sql.planner.physical.PhysicalPlan;
4432
import com.amazon.opendistroforelasticsearch.sql.protocol.response.QueryResult;
45-
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JdbcResponseFormatter;
4633
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.CsvResponseFormatter;
4734
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.Format;
35+
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JdbcResponseFormatter;
4836
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JsonResponseFormatter;
4937
import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.ResponseFormatter;
5038
import com.amazon.opendistroforelasticsearch.sql.sql.SQLService;
5139
import com.amazon.opendistroforelasticsearch.sql.sql.config.SQLServiceConfig;
5240
import com.amazon.opendistroforelasticsearch.sql.sql.domain.SQLQueryRequest;
5341
import java.io.IOException;
5442
import java.security.PrivilegedExceptionAction;
55-
import java.sql.SQLFeatureNotSupportedException;
5643
import java.util.List;
5744
import org.apache.logging.log4j.LogManager;
5845
import org.apache.logging.log4j.Logger;
5946
import org.elasticsearch.client.node.NodeClient;
6047
import org.elasticsearch.cluster.service.ClusterService;
61-
import org.elasticsearch.index.IndexNotFoundException;
6248
import org.elasticsearch.rest.BaseRestHandler;
6349
import org.elasticsearch.rest.BytesRestResponse;
6450
import org.elasticsearch.rest.RestChannel;
@@ -214,7 +200,7 @@ private void sendResponse(RestChannel channel, RestStatus status, String content
214200
}
215201

216202
private static void logAndPublishMetrics(Exception e) {
217-
LOG.error(LogUtils.getRequestId() + " Server side error during query execution", e);
203+
LOG.error("Server side error during query execution", e);
218204
Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
219205
}
220206
}

0 commit comments

Comments
 (0)