Add wrappings to capture more errors

Author: smalyshev

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/execution/PlanExecutor.java

@@ -77,15 +77,17 @@ public void esql(
         );
         QueryMetric clientId = QueryMetric.fromString("rest");
         metrics.total(clientId);
-        session.execute(request, executionInfo, planRunner, wrap(x -> {
+
+        ActionListener<Result> executeListener = wrap(x -> {
             planningMetricsManager.publish(planningMetrics, true);
             listener.onResponse(x);
         }, ex -> {
             // TODO when we decide if we will differentiate Kibana from REST, this String value will likely come from the request
             metrics.failed(clientId);
             planningMetricsManager.publish(planningMetrics, false);
             listener.onFailure(ex);
-        }));
+        });
+        ActionListener.run(executeListener, l -> session.execute(request, executionInfo, planRunner, l));
     }
 
     public IndexResolver indexResolver() {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlQueryAction.java

@@ -195,12 +195,12 @@ private void innerExecute(Task task, EsqlQueryRequest request, ActionListener<Es
             executionInfo,
             remoteClusterService,
             planRunner,
-            ActionListener.wrap((result) -> {
+            ActionListener.wrap(result -> {
                 recordCCSTelemetry(task, executionInfo, request, null);
                 listener.onResponse(toResponse(task, request, configuration, result));
-            }, (e) -> {
-                recordCCSTelemetry(task, executionInfo, request, e);
-                listener.onFailure(e);
+            }, ex -> {
+                recordCCSTelemetry(task, executionInfo, request, ex);
+                listener.onFailure(ex);
             })
         );
 
@@ -236,6 +236,7 @@ private void recordCCSTelemetry(Task task, EsqlExecutionInfo executionInfo, Esql
                 count.getAndIncrement();
             }
         });
+        assert count.get() > 0 : "Got cross-cluster search telemetry without any remote clusters";
         usageBuilder.setRemotesCount(count.get());
         usageService.getEsqlUsageHolder().updateUsage(usageBuilder.build());
     }