Pull feedback

Author: smalyshev

docs/reference/cluster/stats.asciidoc

@@ -1524,7 +1524,7 @@ This may include requests where partial results were returned, but not requests
 
 ======
 `_esql`:::
-(object) Contains the information about the ES|QL <<esql-cross-clusters,cross-cluster queries>> usage in the cluster.
+(object) Contains the information about the ES|QL <<esql-cross-clusters,{ccs}>> usage in the cluster.
 The structure of the object is the same as the `_search` object above.
 
 =====

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -146,7 +146,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ERROR_TRACE_IN_TRANSPORT_HEADER = def(8_811_00_0);
     public static final TransportVersion FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING = def(8_812_00_0);
     public static final TransportVersion SIMULATE_IGNORED_FIELDS = def(8_813_00_0);
-    public static final TransportVersion ESQL_TELEMETRY_STATS = def(8_814_00_0);
+    public static final TransportVersion ESQL_CCS_TELEMETRY_STATS = def(8_814_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshot.java

@@ -65,6 +65,8 @@ public final class CCSTelemetrySnapshot implements Writeable, ToXContentFragment
 
     private final Map<String, Long> clientCounts;
     private final Map<String, PerClusterCCSTelemetry> byRemoteCluster;
+    // Whether we should use per-MRT (minimize roundtrips) metrics.
+    // ES|QL does not have "minimize_roundtrips" option, so we don't collect those metrics for ES|QL usage.
     private boolean useMRT = true;
 
     /**

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSUsage.java

@@ -144,7 +144,8 @@ public static Result getFailureType(Exception e) {
             if (ExceptionsHelper.unwrapCorruption(e) != null) {
                 return Result.CORRUPTION;
             }
-            if (ExceptionsHelper.unwrap(e, ElasticsearchStatusException.class) != null) {
+            ElasticsearchStatusException se = (ElasticsearchStatusException) ExceptionsHelper.unwrap(e, ElasticsearchStatusException.class);
+            if (se != null && se.getDetailedMessage().contains("license")) {
                 return Result.LICENSE;
             }
             // This is kind of last resort check - if we still don't know the reason but all shard failures are remote,

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java

@@ -52,7 +52,7 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
             repositoryUsageStats = RepositoryUsageStats.EMPTY;
             ccsMetrics = new CCSTelemetrySnapshot();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_TELEMETRY_STATS)) {
+        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
             esqlMetrics = new CCSTelemetrySnapshot(in);
         } else {
             esqlMetrics = new CCSTelemetrySnapshot();
@@ -131,7 +131,7 @@ public void writeTo(StreamOutput out) throws IOException {
             repositoryUsageStats.writeTo(out);
             ccsMetrics.writeTo(out);
         } // else just drop these stats, ok for bwc
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_TELEMETRY_STATS)) {
+        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_CCS_TELEMETRY_STATS)) {
             esqlMetrics.writeTo(out);
         }
     }

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

@@ -225,8 +225,8 @@ private void recordCCSTelemetry(Task task, EsqlExecutionInfo executionInfo, Esql
         CCSUsage.Builder usageBuilder = new CCSUsage.Builder();
         usageBuilder.setClientFromTask(task);
         if (exception != null) {
-            if (exception instanceof VerificationException) {
-                CCSUsageTelemetry.Result failureType = classifyVerificationException((VerificationException) exception);
+            if (exception instanceof VerificationException ve) {
+                CCSUsageTelemetry.Result failureType = classifyVerificationException(ve);
                 if (failureType != CCSUsageTelemetry.Result.UNKNOWN) {
                     usageBuilder.setFailure(failureType);
                 } else {
@@ -244,19 +244,19 @@ private void recordCCSTelemetry(Task task, EsqlExecutionInfo executionInfo, Esql
             usageBuilder.setFeature(CCSUsageTelemetry.ASYNC_FEATURE);
         }
 
-        AtomicInteger count = new AtomicInteger();
+        AtomicInteger remotesCount = new AtomicInteger();
         executionInfo.getClusters().forEach((clusterAlias, cluster) -> {
             if (cluster.getStatus() == EsqlExecutionInfo.Cluster.Status.SKIPPED) {
                 usageBuilder.skippedRemote(clusterAlias);
             } else {
                 usageBuilder.perClusterUsage(clusterAlias, cluster.getTook());
             }
             if (clusterAlias.equals(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY) == false) {
-                count.getAndIncrement();
+                remotesCount.getAndIncrement();
             }
         });
-        assert count.get() > 0 : "Got cross-cluster search telemetry without any remote clusters";
-        usageBuilder.setRemotesCount(count.get());
+        assert remotesCount.get() > 0 : "Got cross-cluster search telemetry without any remote clusters";
+        usageBuilder.setRemotesCount(remotesCount.get());
         usageService.getEsqlUsageHolder().updateUsage(usageBuilder.build());
     }
 

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

@@ -328,7 +328,7 @@ public static void checkForCcsLicense(
             if (groupedIndices.size() > 1 || groupedIndices.containsKey(RemoteClusterService.LOCAL_CLUSTER_GROUP_KEY) == false) {
                 if (EsqlLicenseChecker.isCcsAllowed(licenseState) == false) {
                     // initialize the cluster entries in EsqlExecutionInfo before throwing the invalid license error
-                    // so that the CCS telemetry handler can recognize that this error is a CCS-related
+                    // so that the CCS telemetry handler can recognize that this error is CCS-related
                     for (Map.Entry<String, OriginalIndices> entry : groupedIndices.entrySet()) {
                         executionInfo.swapCluster(
                             entry.getKey(),