ESQL: Merge more code into esql-proper (#110432)

This removes the `Graphviz` class which we don't currently use and merges the `LoggingUtils` class into it's single caller, `EsqlResponseListener`.
elastic · Jul 3, 2024 · 1dc7eaf · 1dc7eaf
1 parent f30a6d9
commit 1dc7eaf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 339 deletions.
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/Graphviz.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/Graphviz.java
diff --git a/...k/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/LoggingUtils.java b/...k/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/LoggingUtils.java
diff --git a/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlResponseListener.java b/...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlResponseListener.java
@@ -7,10 +7,12 @@
 
 package org.elasticsearch.xpack.esql.action;
 
+import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.core.Releasable;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.logging.Level;
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.rest.ChunkedRestResponseBodyPart;
@@ -29,7 +31,6 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import static org.elasticsearch.xpack.esql.core.util.LoggingUtils.logOnFailure;
 import static org.elasticsearch.xpack.esql.formatter.TextFormat.CSV;
 import static org.elasticsearch.xpack.esql.formatter.TextFormat.URL_PARAM_DELIMITER;
 
@@ -168,7 +169,7 @@ private RestResponse buildResponse(EsqlQueryResponse esqlResponse) throws IOExce
  */
  public ActionListener<EsqlQueryResponse> wrapWithLogging() {
  ActionListener<EsqlQueryResponse> listener = ActionListener.wrap(this::onResponse, ex -> {
- logOnFailure(LOGGER, ex);
+ logOnFailure(ex);
  onFailure(ex);
  });
  if (LOGGER.isDebugEnabled() == false) {
@@ -190,4 +191,8 @@ public ActionListener<EsqlQueryResponse> wrapWithLogging() {
  });
  }
 
+ static void logOnFailure(Throwable throwable) {
+ RestStatus status = ExceptionsHelper.status(throwable);
+ LOGGER.log(status.getStatus() >= 500 ? Level.WARN : Level.DEBUG, () -> "Request failed with status [" + status + "]: ", throwable);
+ }
 }