return just DLS stats

Author: szybia

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/stats/TransportSecurityStatsAction.java

@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.security.action.stats;
 
-import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.nodes.TransportNodesAction;
@@ -27,8 +26,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 public class TransportSecurityStatsAction extends TransportNodesAction<
     GetSecurityStatsNodesRequest,
@@ -80,12 +77,9 @@ protected GetSecurityStatsNodeResponse newNodeResponse(final StreamInput in, fin
 
     @Override
     protected GetSecurityStatsNodeResponse nodeOperation(final GetSecurityStatsNodeRequest request, final Task task) {
-        final CompletableFuture<Map<String, Object>> rolesStatsFuture = new CompletableFuture<>();
-        if (rolesStore == null) {
-            rolesStatsFuture.complete(null);
-        } else {
-            rolesStore.usageStats(ActionListener.wrap(rolesStatsFuture::complete, rolesStatsFuture::completeExceptionally));
-        }
-        return new GetSecurityStatsNodeResponse(clusterService.localNode(), rolesStatsFuture.join());
+        return new GetSecurityStatsNodeResponse(
+            clusterService.localNode(),
+            rolesStore == null ? null : rolesStore.usageStatsWithJustDls()
+        );
     }
 }

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStore.java

@@ -669,6 +669,10 @@ Iterable<ProjectScoped<RoleKey>> cachedRoles() {
         return this.roleCache.keys();
     }
 
+    public Map<String, Object> usageStatsWithJustDls() {
+        return Map.of("dls", Map.of("bit_set_cache", dlsBitsetCache.usageStats()));
+    }
+
     public void usageStats(ActionListener<Map<String, Object>> listener) {
         final Map<String, Object> usage = new HashMap<>();
         usage.put("dls", Map.of("bit_set_cache", dlsBitsetCache.usageStats()));

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/security/stats/20_roles_stats.yml

@@ -1,5 +1,5 @@
 ---
-"Security stats return roles stats":
+"Security stats return just DLS stats":
   - requires:
       cluster_features: [ "security_stats_endpoint" ]
       reason: Introduced in 9.2
@@ -9,6 +9,8 @@
 
   - set:
       nodes._arbitrary_key_: node_id
+  - length: { nodes.$node_id: 1 }
+  - length: { nodes.$node_id.roles: 1 }
+  - length: { nodes.$node_id.roles.dls: 1 }
+  - length: { nodes.$node_id.roles.dls.bit_set_cache: 8 }
   - gte: { nodes.$node_id.roles.dls.bit_set_cache.count: 0 }
-  - gte: { nodes.$node_id.roles.file.size: 0 }
-  - gte: { nodes.$node_id.roles.native.size: 0 }