Add esql telemetry to stats output

Author: smalyshev

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

@@ -206,6 +206,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INGEST_PIPELINE_CONFIGURATION_AS_MAP = def(8_797_00_0);
     public static final TransportVersion INDEXING_PRESSURE_THROTTLING_STATS = def(8_798_00_0);
     public static final TransportVersion REINDEX_DATA_STREAMS = def(8_799_00_0);
+    public static final TransportVersion ESQL_TELEMETRY_STATS = def(8_800_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,

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

@@ -32,6 +32,7 @@ public class ClusterStatsNodeResponse extends BaseNodeResponse {
     private final SearchUsageStats searchUsageStats;
     private final RepositoryUsageStats repositoryUsageStats;
     private final CCSTelemetrySnapshot ccsMetrics;
+    private final CCSTelemetrySnapshot esqlMetrics;
 
     public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         super(in);
@@ -54,6 +55,11 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         } else {
             ccsMetrics = new CCSTelemetrySnapshot();
         }
+        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_TELEMETRY_STATS)) {
+            esqlMetrics = new CCSTelemetrySnapshot(in);
+        } else {
+            esqlMetrics = new CCSTelemetrySnapshot();
+        }
     }
 
     public ClusterStatsNodeResponse(
@@ -64,7 +70,8 @@ public ClusterStatsNodeResponse(
         ShardStats[] shardsStats,
         SearchUsageStats searchUsageStats,
         RepositoryUsageStats repositoryUsageStats,
-        CCSTelemetrySnapshot ccsTelemetrySnapshot
+        CCSTelemetrySnapshot ccsTelemetrySnapshot,
+        CCSTelemetrySnapshot esqlTelemetrySnapshot
     ) {
         super(node);
         this.nodeInfo = nodeInfo;
@@ -74,6 +81,7 @@ public ClusterStatsNodeResponse(
         this.searchUsageStats = Objects.requireNonNull(searchUsageStats);
         this.repositoryUsageStats = Objects.requireNonNull(repositoryUsageStats);
         this.ccsMetrics = ccsTelemetrySnapshot;
+        this.esqlMetrics = esqlTelemetrySnapshot;
     }
 
     public NodeInfo nodeInfo() {
@@ -107,6 +115,9 @@ public RepositoryUsageStats repositoryUsageStats() {
     public CCSTelemetrySnapshot getCcsMetrics() {
         return ccsMetrics;
     }
+    public CCSTelemetrySnapshot getEsqlMetrics() {
+        return esqlMetrics;
+    }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
@@ -124,6 +135,9 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.CCS_TELEMETRY_STATS)) {
             ccsMetrics.writeTo(out);
         }
+        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_TELEMETRY_STATS)) {
+            esqlMetrics.writeTo(out);
+        }
     }
 
 }

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

@@ -36,11 +36,13 @@ public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResp
     final ClusterSnapshotStats clusterSnapshotStats;
     final RepositoryUsageStats repositoryUsageStats;
     final CCSTelemetrySnapshot ccsMetrics;
+    final CCSTelemetrySnapshot esqlMetrics;
     final long timestamp;
     final String clusterUUID;
     private final Map<String, RemoteClusterStats> remoteClustersStats;
 
     public static final String CCS_TELEMETRY_FIELD_NAME = "_search";
+    public static final String ESQL_TELEMETRY_FIELD_NAME = "_esql";
 
     public ClusterStatsResponse(
         long timestamp,
@@ -60,6 +62,7 @@ public ClusterStatsResponse(
         nodesStats = new ClusterStatsNodes(nodes);
         indicesStats = new ClusterStatsIndices(nodes, mappingStats, analysisStats, versionStats);
         ccsMetrics = new CCSTelemetrySnapshot();
+        esqlMetrics = new CCSTelemetrySnapshot();
         ClusterHealthStatus status = null;
         for (ClusterStatsNodeResponse response : nodes) {
             // only the master node populates the status
@@ -68,7 +71,10 @@ public ClusterStatsResponse(
                 break;
             }
         }
-        nodes.forEach(node -> ccsMetrics.add(node.getCcsMetrics()));
+        nodes.forEach(node -> {
+            ccsMetrics.add(node.getCcsMetrics());
+            esqlMetrics.add(node.getEsqlMetrics());
+        });
         this.status = status;
         this.clusterSnapshotStats = clusterSnapshotStats;
 
@@ -153,6 +159,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         ccsMetrics.toXContent(builder, params);
         builder.endObject();
 
+        if (esqlMetrics.getTotalCount() > 0) {
+            builder.startObject(ESQL_TELEMETRY_FIELD_NAME);
+            esqlMetrics.toXContent(builder, params);
+            builder.endObject();
+        }
+
         builder.endObject();
 
         return builder;

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

@@ -104,6 +104,7 @@ public class TransportClusterStatsAction extends TransportNodesAction<
     private final RepositoriesService repositoriesService;
     private final SearchUsageHolder searchUsageHolder;
     private final CCSUsageTelemetry ccsUsageHolder;
+    private final CCSUsageTelemetry esqlUsageHolder;
 
     private final Executor clusterStateStatsExecutor;
     private final MetadataStatsCache<MappingStats> mappingStatsCache;
@@ -136,6 +137,7 @@ public TransportClusterStatsAction(
         this.repositoriesService = repositoriesService;
         this.searchUsageHolder = usageService.getSearchUsageHolder();
         this.ccsUsageHolder = usageService.getCcsUsageHolder();
+        this.esqlUsageHolder = usageService.getEsqlUsageHolder();
         this.clusterStateStatsExecutor = threadPool.executor(ThreadPool.Names.MANAGEMENT);
         this.mappingStatsCache = new MetadataStatsCache<>(threadPool.getThreadContext(), MappingStats::of);
         this.analysisStatsCache = new MetadataStatsCache<>(threadPool.getThreadContext(), AnalysisStats::of);
@@ -294,6 +296,7 @@ protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeReq
 
         final RepositoryUsageStats repositoryUsageStats = repositoriesService.getUsageStats();
         final CCSTelemetrySnapshot ccsTelemetry = ccsUsageHolder.getCCSTelemetrySnapshot();
+        final CCSTelemetrySnapshot esqlTelemetry = esqlUsageHolder.getCCSTelemetrySnapshot();
 
         return new ClusterStatsNodeResponse(
             nodeInfo.getNode(),
@@ -303,7 +306,8 @@ protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeReq
             shardsStats.toArray(new ShardStats[shardsStats.size()]),
             searchUsageStats,
             repositoryUsageStats,
-            ccsTelemetry
+            ccsTelemetry,
+            esqlTelemetry
         );
     }
 

server/src/test/java/org/elasticsearch/action/admin/cluster/stats/VersionStatsTests.java

@@ -130,6 +130,7 @@ public void testCreation() {
             new ShardStats[] { shardStats },
             new SearchUsageStats(),
             RepositoryUsageStats.EMPTY,
+            null,
             null
         );